refactor: sort 'essential' and 'contents'

This commit sorts the <slice>.essential list and <slice>.content map entries in an ASCENDING order.
canonical · Mar 8, 2024 · 7a005ce · 7a005ce
1 parent 21fda84
commit 7a005ce
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 77 deletions.
diff --git a/slices/base-files.yaml b/slices/base-files.yaml
@@ -3,12 +3,12 @@ package: base-files
 slices:
   base:
     essential:
-      - base-files_etc
       - base-files_bin
+      - base-files_etc
+      - base-files_home
       - base-files_lib
       - base-files_tmp
       - base-files_var
-      - base-files_home
 
   etc:
     contents:
@@ -51,8 +51,8 @@ slices:
     contents:
       /etc/debian_version:
       /etc/dpkg/origins/debian:
-      /etc/dpkg/origins/ubuntu:
       /etc/dpkg/origins/default: {symlink: /etc/dpkg/origins/ubuntu}
+      /etc/dpkg/origins/ubuntu:
       /etc/host.conf:
       /etc/issue:
       /etc/issue.net:

diff --git a/slices/base-passwd.yaml b/slices/base-passwd.yaml
@@ -3,10 +3,10 @@ package: base-passwd
 slices:
   data:
     contents:
-      /usr/share/base-passwd/group.master: {until: mutate}
-      /usr/share/base-passwd/passwd.master: {until: mutate}
       /etc/group: {text: FIXME, mutable: true}
       /etc/passwd: {text: FIXME, mutable: true}
+      /usr/share/base-passwd/group.master: {until: mutate}
+      /usr/share/base-passwd/passwd.master: {until: mutate}
     mutate: |
       gr = content.read("/usr/share/base-passwd/group.master")
       content.write("/etc/group", gr)

diff --git a/slices/bash.yaml b/slices/bash.yaml
@@ -17,5 +17,5 @@ slices:
       # user should manually link /bin/sh to /bin/bash
       /bin/bash:
       /bin/rbash:
-      /usr/bin/clear_console:
       /usr/bin/bashbug:
+      /usr/bin/clear_console:
diff --git a/slices/libc6.yaml b/slices/libc6.yaml
@@ -7,8 +7,9 @@ slices:
 
   libs:
     contents:
-      /lib/*-linux-*/ld-*.*.so:
+      /lib*/ld*.so.*:
       /lib/*-linux-*/ld*.so.*:
+      /lib/*-linux-*/ld-*.*.so:
       /lib/*-linux-*/libBrokenLocale-*.*.so:
       /lib/*-linux-*/libBrokenLocale.so.*:
       /lib/*-linux-*/libSegFault.so:
@@ -44,8 +45,7 @@ slices:
       /lib/*-linux-*/libresolv.so.*:
       /lib/*-linux-*/librt-*.*.so:
       /lib/*-linux-*/librt.so.*:
-      /lib/*-linux-*/libthread_db-*.*.so:
       /lib/*-linux-*/libthread_db*.so.*:
+      /lib/*-linux-*/libthread_db-*.*.so:
       /lib/*-linux-*/libutil-*.*.so:
       /lib/*-linux-*/libutil.so.*:
-      /lib*/ld*.so.*:
diff --git a/slices/libfontconfig1.yaml b/slices/libfontconfig1.yaml
@@ -3,10 +3,10 @@ package: libfontconfig1
 slices:
   libs:
     essential:
+      - fontconfig-config_config
       - libc6_libs
       - libexpat1_libs
       - libfreetype6_libs
       - libuuid1_libs
-      - fontconfig-config_config
     contents:
       /usr/lib/*-linux-*/libfontconfig.so.1*:
diff --git a/slices/libfreetype6.yaml b/slices/libfreetype6.yaml
@@ -3,9 +3,9 @@ package: libfreetype6
 slices:
   libs:
     essential:
-      - libc6_libs
-      - zlib1g_libs
       - libbrotli1_libs
+      - libc6_libs
       - libpng16-16_libs
+      - zlib1g_libs
     contents:
       /usr/lib/*-linux-*/libfreetype.so.6*:
diff --git a/slices/libglib2.0-0.yaml b/slices/libglib2.0-0.yaml
@@ -10,8 +10,8 @@ slices:
 
   libs:
     essential:
-      - libglib2.0-0_core
       - libffi7_libs
+      - libglib2.0-0_core
       - libmount1_libs
       - libselinux1_libs
       - zlib1g_libs

diff --git a/slices/libmount1.yaml b/slices/libmount1.yaml
@@ -3,8 +3,8 @@ package: libmount1
 slices:
   libs:
     essential:
+      - libblkid1_libs
       - libc6_libs
       - libselinux1_libs
-      - libblkid1_libs
     contents:
       /lib/*-linux-*/libmount.so.1*:
diff --git a/slices/libnss3.yaml b/slices/libnss3.yaml
@@ -7,5 +7,5 @@ slices:
       - libnspr4_libs
       - libsqlite3-0_libs
     contents:
-      /usr/lib/*-linux-*/libnssutil3.so:
       /usr/lib/*-linux-*/libnss3.so:
+      /usr/lib/*-linux-*/libnssutil3.so:
diff --git a/slices/libpython3.8-minimal.yaml b/slices/libpython3.8-minimal.yaml
@@ -16,8 +16,8 @@ slices:
   libs:
     essential:
       - libc6_libs
-      - libssl1.1_libs
       - libpython3.8-minimal_config
+      - libssl1.1_libs
     contents:
       /usr/lib/python3.8/__future__.py:
       /usr/lib/python3.8/_bootlocale.py:

diff --git a/slices/libpython3.8-stdlib.yaml b/slices/libpython3.8-stdlib.yaml
@@ -11,10 +11,10 @@ slices:
   # The "core" slice provides a very minimal libpython3.8-stdlib
   core:
     essential:
-      - libpython3.8-minimal_libs
-      - libc6_libs
       - libbz2-1.0_libs
+      - libc6_libs
       - liblzma5_libs
+      - libpython3.8-minimal_libs
       - mime-support_mime-types
     contents:
       /usr/lib/python3.8/_compression.py:
@@ -45,10 +45,10 @@ slices:
   # https://docs.python.org/3.8/library/allos.html
   all-os:
     essential:
+      - libffi7_libs
+      - libncursesw6_libs
       - libpython3.8-stdlib_core
       - libpython3.8-stdlib_unix
-      - libncursesw6_libs
-      - libffi7_libs
       - libtinfo6_libs
     contents:
       /usr/lib/python3.8/_pyio.py:
@@ -62,9 +62,9 @@ slices:
   # https://docs.python.org/3.8/library/concurrency.html
   concurrency:
     essential:
+      - libpython3.8-stdlib_all-os
       - libpython3.8-stdlib_core
       - libpython3.8-stdlib_crypto
-      - libpython3.8-stdlib_all-os
     contents:
       /usr/lib/python3.8/_dummy_thread.py:
       /usr/lib/python3.8/concurrent/**:
@@ -124,9 +124,9 @@ slices:
   # https://docs.python.org/3.8/library/development.html
   development-tools:
     essential:
-      - libpython3.8-stdlib_core
       - libpython3.8-stdlib_all-os
       - libpython3.8-stdlib_concurrency
+      - libpython3.8-stdlib_core
       - libpython3.8-stdlib_data-types
       - libpython3.8-stdlib_debug
       - libpython3.8-stdlib_distribution
@@ -239,8 +239,8 @@ slices:
   # https://docs.python.org/3.8/library/ipc.html
   ipc:
     essential:
-      - libpython3.8-stdlib_core
       - libpython3.8-stdlib_concurrency
+      - libpython3.8-stdlib_core
     contents:
       /usr/lib/python3.8/asynchat.py:
       /usr/lib/python3.8/asyncio/**:
@@ -302,8 +302,8 @@ slices:
   # https://docs.python.org/3.8/library/numeric.html
   numeric:
     essential:
-      - libpython3.8-stdlib_core
       - libmpdec2_libs
+      - libpython3.8-stdlib_core
     contents:
       /usr/lib/python3.8/_pydecimal.py:
       /usr/lib/python3.8/decimal.py:
@@ -323,8 +323,8 @@ slices:
   # https://docs.python.org/3.8/library/persistence.html
   data-persistence:
     essential:
-      - libpython3.8-stdlib_core
       - libdb5.3_libs
+      - libpython3.8-stdlib_core
       - libsqlite3-0_libs
     contents:
       /usr/lib/python3.8/dbm/**:
@@ -339,8 +339,8 @@ slices:
     essential:
       - libpython3.8-stdlib_core
     contents:
-      /usr/lib/python3.8/pydoc_data/**:
       /usr/lib/python3.8/pydoc.py:
+      /usr/lib/python3.8/pydoc_data/**:
 
   # Text Processing Services
   # https://docs.python.org/3.8/library/text.html
@@ -358,9 +358,9 @@ slices:
   # https://docs.python.org/3.8/library/unix.html
   unix:
     essential:
+      - libcrypt1_libs
       - libpython3.8-stdlib_core
       - libpython3.8-stdlib_frameworks
-      - libcrypt1_libs
     contents:
       /usr/lib/python3.8/crypt.py:
       /usr/lib/python3.8/lib-dynload/_crypt.cpython-38-*-linux-*.so:

diff --git a/slices/libreadline8.yaml b/slices/libreadline8.yaml
@@ -7,5 +7,5 @@ slices:
       - libtinfo6_libs
       - readline-common_config
     contents:
-      /lib/*-linux-*/libreadline.so.8*:
       /lib/*-linux-*/libhistory.so.8*:
+      /lib/*-linux-*/libreadline.so.8*:
diff --git a/slices/libunwind8.yaml b/slices/libunwind8.yaml
@@ -6,5 +6,5 @@ slices:
       - liblzma5_libs
     contents:
       /usr/lib/*-linux-*/libunwind-*.so.*:
-      /usr/lib/*-linux-*/libunwind.so.8.*:
       /usr/lib/*-linux-*/libunwind.so.8:
+      /usr/lib/*-linux-*/libunwind.so.8.*: