refactor: sort essential and contents in slices

canonical · Mar 6, 2024 · 431a601 · 431a601
1 parent 9804a06
commit 431a601
Show file tree

Hide file tree

Showing 20 changed files with 118 additions and 118 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:
@@ -52,8 +52,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/dotnet-hostfxr-6.0.yaml b/slices/dotnet-hostfxr-6.0.yaml
@@ -2,9 +2,9 @@ package: dotnet-hostfxr-6.0
 slices:
   libs:
     essential:
+      - dotnet-host_bins
       - libc6_libs
       - libgcc-s1_libs
       - libstdc++6_libs
-      - dotnet-host_bins
     contents:
       /usr/lib/dotnet/host/fxr/*/libhostfxr.so:
diff --git a/slices/libasan6.yaml b/slices/libasan6.yaml
@@ -4,8 +4,8 @@ slices:
   libs:
     essential:
       - libc6_libs
-      - libstdc++6_libs
       - libgcc-s1_libs
+      - libstdc++6_libs
       # Although gcc-11-base is a package dependency, it is not needed for this
       # libs slice and is thus omitted.
     contents:

diff --git a/slices/libc6.yaml b/slices/libc6.yaml
@@ -7,6 +7,7 @@ slices:
 
   libs:
     contents:
+      /lib*/ld*.so.*:
       /lib/*-linux-*/ld*.so.*:
       /lib/*-linux-*/libBrokenLocale.so.*:
       /lib/*-linux-*/libanl.so.*:
@@ -27,4 +28,3 @@ slices:
       /lib/*-linux-*/librt.so.*:
       /lib/*-linux-*/libthread_db.so.*:
       /lib/*-linux-*/libutil.so.*:
-      /lib*/ld*.so.*:
diff --git a/slices/libcurl4.yaml b/slices/libcurl4.yaml
@@ -9,12 +9,12 @@ slices:
       - libgssapi-krb5-2_libs
       - libidn2-0_libs
       - libldap-2.5-0_libs
+      - libnghttp2-14_libs
       - libpsl5_libs
+      - librtmp1_libs
       - libssh-4_libs
       - libssl3_libs
-      - libnghttp2-14_libs
       - libzstd1_libs
-      - librtmp1_libs
       - zlib1g_libs
     contents:
       /usr/lib/*-linux-*/libcurl.so.4*:
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
       - libffi8_libs
+      - libglib2.0-0_core
       - libmount1_libs
       - libselinux1_libs
       - zlib1g_libs

diff --git a/slices/libldap-2.5-0.yaml b/slices/libldap-2.5-0.yaml
@@ -7,5 +7,5 @@ slices:
       - libgnutls30_libs
       - libsasl2-2_libs
     contents:
-      /usr/lib/*-linux-*/libldap-2.5.so.0*:
       /usr/lib/*-linux-*/liblber-2.5.so.0*:
+      /usr/lib/*-linux-*/libldap-2.5.so.0*:
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:
       /usr/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.11-stdlib.yaml b/slices/libpython3.11-stdlib.yaml
@@ -172,8 +172,8 @@ slices:
       /usr/lib/python3.11/lib-dynload/_testmultiphase.cpython-311-*-linux-*.so:
       /usr/lib/python3.11/lib-dynload/_xxsubinterpreters.cpython-311-*-linux-*.so:
       /usr/lib/python3.11/lib-dynload/_xxtestfuzz.cpython-311-*-linux-*.so:
-      /usr/lib/python3.11/lib-dynload/xxlimited_35.cpython-311-*-linux-*.so:
       /usr/lib/python3.11/lib-dynload/xxlimited.cpython-311-*-linux-*.so:
+      /usr/lib/python3.11/lib-dynload/xxlimited_35.cpython-311-*-linux-*.so:
       /usr/lib/python3.11/test/**:
       /usr/lib/python3.11/unittest/**:
 
@@ -349,8 +349,8 @@ slices:
     essential:
       - libpython3.11-stdlib_core
     contents:
-      /usr/lib/python3.11/pydoc_data/**:
       /usr/lib/python3.11/pydoc.py:
+      /usr/lib/python3.11/pydoc_data/**:
 
   # Text Processing Services
   # https://docs.python.org/3.11/library/text.html

diff --git a/slices/libunwind-13.yaml b/slices/libunwind-13.yaml
@@ -4,7 +4,7 @@ slices:
     essential:
       - libc6_libs
     contents:
-      /usr/lib/llvm-13/lib/libunwind.so.1.*:
-      /usr/lib/llvm-13/lib/libunwind.so.1:
-      /usr/lib/*-linux-*/libunwind.so.1.*:
       /usr/lib/*-linux-*/libunwind.so.1:
+      /usr/lib/*-linux-*/libunwind.so.1.*:
+      /usr/lib/llvm-13/lib/libunwind.so.1:
+      /usr/lib/llvm-13/lib/libunwind.so.1.*:
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.*:
diff --git a/slices/openjdk-8-jre-headless.yaml b/slices/openjdk-8-jre-headless.yaml
@@ -16,19 +16,17 @@ slices:
       # This security path is also in "core" as it describes permissions for
       # various classes and how they can interact with the system.
       /etc/java-8-openjdk/security/java.policy:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/java.policy:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/meta-index:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/resources.jar:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/rt.jar:
+      /usr/lib/jvm/java-8-openjdk-*/jre/bin/java:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjsig.so: {arch: armhf}
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjvm.so: {arch: armhf}
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/jli/libjli.so:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/jvm.cfg-default:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjava.so:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjsig.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libnet.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libnio.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libverify.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libzip.so:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjsig.so:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjsig.so: {arch: armhf}
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjvm.so: {arch: armhf}
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/server/libjsig.so:
         arch:
           - amd64
@@ -39,15 +37,17 @@ slices:
           - amd64
           - arm64
           - ppc64el
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/hijrah-config-umalqura.properties:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/calendars.properties:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/content-types.properties:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/currency.data:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/hijrah-config-umalqura.properties:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/logging.properties:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/meta-index:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/net.properties:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/jvm.cfg-default:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/currency.data:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/resources.jar:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/rt.jar:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/java.policy:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/tzdb.dat:
-      /usr/lib/jvm/java-8-openjdk-*/jre/bin/java:
 
   locale:
     essential:
@@ -58,18 +58,12 @@ slices:
 
   security:
     essential:
-      - libpcsclite1_libs
       - ca-certificates-java_data
+      - libpcsclite1_libs
       - openjdk-8-jre-headless_core
     contents:
+      /etc/java-8-openjdk/security/blacklisted.certs:
       /etc/java-8-openjdk/security/java.security:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/java.security:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/blacklisted.certs:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/cacerts:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/limited/US_export_policy.jar:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/limited/local_policy.jar:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/unlimited/US_export_policy.jar:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/unlimited/local_policy.jar:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libj2gss.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libj2pcsc.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libj2pkcs11.so:
@@ -80,49 +74,55 @@ slices:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/ext/sunpkcs11.jar:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/jce.jar:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/jsse.jar:
-      /etc/java-8-openjdk/security/blacklisted.certs:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/blacklisted.certs:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/cacerts:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/java.security:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/limited/US_export_policy.jar:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/limited/local_policy.jar:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/unlimited/US_export_policy.jar:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/policy/unlimited/local_policy.jar:
 
   # Abstract Window Toolkit.
   # Classes and components for creating GUI elements (windows, graphics, etc.).
   awt:
     essential:
-      - openjdk-8-jre-headless_core
-      - liblcms2-2_libs
       - libfontconfig1_libs
       - libfreetype6_libs
       - libjpeg-turbo8_libs
+      - liblcms2-2_libs
+      - openjdk-8-jre-headless_core
     contents:
+      /etc/java-8-openjdk/flavormap.properties:
+      /etc/java-8-openjdk/images/cursors/cursors.properties:
+      /etc/java-8-openjdk/psfont.properties.ja:
+      /etc/java-8-openjdk/psfontj2d.properties:
+      /etc/java-8-openjdk/swing.properties:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libawt.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libawt_headless.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libfontmanager.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjavajpeg.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjavalcms.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libmlib_image.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/charsets.jar:
-      /etc/java-8-openjdk/flavormap.properties:
-      /etc/java-8-openjdk/images/cursors/cursors.properties:
-      /etc/java-8-openjdk/swing.properties:
-      /etc/java-8-openjdk/psfont.properties.ja:
-      /etc/java-8-openjdk/psfontj2d.properties:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/images/cursors/cursors.properties:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/flavormap.properties:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/swing.properties:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/psfontj2d.properties:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/psfont.properties.ja:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/cmm/CIEXYZ.pf:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/cmm/GRAY.pf:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/cmm/LINEAR_RGB.pf:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/cmm/PYCC.pf:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/cmm/sRGB.pf:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/flavormap.properties:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/images/cursors/cursors.properties:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/psfont.properties.ja:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/psfontj2d.properties:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/swing.properties:
 
   # Enabled management and monitoring capabilities for Java apps.
   management:
     essential:
       - openjdk-8-jre-headless_core
     contents:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/management-agent.jar:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libmanagement.so:
       /etc/java-8-openjdk/management/management.properties:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libmanagement.so:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/management-agent.jar:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/management/management.properties:
 
   # Java Flight Recorder - API for collecting diagnostic and profilling data.
@@ -138,31 +138,31 @@ slices:
     essential:
       - openjdk-8-jre-headless_core
     contents:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libhprof.so:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjava_crw_demo.so:
       /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/libnpt.so:
         arch: amd64
       /usr/lib/jvm/java-8-openjdk-arm64/jre/lib/aarch64/libnpt.so:
         arch: arm64
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libhprof.so:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjava_crw_demo.so:
 
   # Shared libraries for supporting debugging capabilities.
   debug:
     essential:
       - openjdk-8-jre-headless_core
     contents:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libdt_socket.so:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjdwp.so:
       /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/libnpt.so:
         arch: amd64
       /usr/lib/jvm/java-8-openjdk-arm64/jre/lib/aarch64/libnpt.so:
         arch: arm64
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjdwp.so:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libdt_socket.so:
 
   tools:
     essential:
       - openjdk-8-jre-headless_core
     contents:
-      /usr/lib/jvm/java-8-openjdk-*/jre/bin/keytool:
       /usr/lib/jvm/java-8-openjdk-*/bin/keytool:
+      /usr/lib/jvm/java-8-openjdk-*/jre/bin/keytool:
 
   # Java Programming Language Instrumentation Services interface.
   jplis:

diff --git a/slices/openssl.yaml b/slices/openssl.yaml
@@ -3,8 +3,8 @@ package: openssl
 slices:
   bins:
     essential:
-      - libc6_libs
       - libc6_config
+      - libc6_libs
       - libssl3_libs
       - openssl_config
     contents:

diff --git a/slices/python3.11.yaml b/slices/python3.11.yaml
@@ -5,9 +5,9 @@ slices:
   # It includes very few modules from the libpython3.11-stdlib package.
   core:
     essential:
-      - python3.11-minimal_bins
       - libpython3.11-stdlib_core
       - media-types_data
+      - python3.11-minimal_bins
 
   # The "standard" slice extends "core" with all the Python
   # modules from the libpython3.11-stdlib package.