refactor: sort 'essential' and 'contents'

canonical · Mar 7, 2024 · 14459bb · 14459bb
1 parent fc56024
commit 14459bb
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 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:
@@ -24,8 +24,8 @@ slices:
   lib:
     contents:
       /lib:
-      /usr/lib/:
       /lib64: {arch: [amd64, ppc64el]}
+      /usr/lib/:
       /usr/lib64/: {arch: [amd64, ppc64el]}
 
   tmp:
@@ -54,8 +54,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
@@ -16,6 +16,6 @@ slices:
     contents:
       # user should manually link /bin/sh to /bin/bash
       /usr/bin/bash:
-      /usr/bin/rbash:
-      /usr/bin/clear_console:
       /usr/bin/bashbug:
+      /usr/bin/clear_console:
+      /usr/bin/rbash:
diff --git a/slices/libc6.yaml b/slices/libc6.yaml
@@ -7,6 +7,7 @@ slices:
 
   libs:
     contents:
+      /usr/lib*/ld*.so.*:
       /usr/lib/*-linux-*/ld*.so.*:
       /usr/lib/*-linux-*/libBrokenLocale.so.*:
       /usr/lib/*-linux-*/libanl.so.*:
@@ -27,4 +28,3 @@ slices:
       /usr/lib/*-linux-*/librt.so.*:
       /usr/lib/*-linux-*/libthread_db.so.*:
       /usr/lib/*-linux-*/libutil.so.*:
-      /usr/lib*/ld*.so.*:
diff --git a/slices/libpython3.11-stdlib.yaml b/slices/libpython3.11-stdlib.yaml
@@ -174,8 +174,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/**:
 
@@ -350,8 +350,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/libtinfo6.yaml b/slices/libtinfo6.yaml
@@ -5,5 +5,5 @@ slices:
     essential:
       - libc6_libs
     contents:
-      /usr/lib/*-linux-*/libtinfo.so.6*:
       /usr/lib/*-linux-*/libtic.so.6*:
+      /usr/lib/*-linux-*/libtinfo.so.6*:
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/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
       - openssl_data

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.

diff --git a/slices/tzdata.yaml b/slices/tzdata.yaml
@@ -14,16 +14,16 @@ slices:
       /usr/share/zoneinfo/EST5EDT:
       /usr/share/zoneinfo/Factory:
       /usr/share/zoneinfo/HST:
-      /usr/share/zoneinfo/iso3166.tab:
-      /usr/share/zoneinfo/leap-seconds.list:
-      /usr/share/zoneinfo/leapseconds:
-      /usr/share/zoneinfo/localtime:
       /usr/share/zoneinfo/MET:
       /usr/share/zoneinfo/MST:
       /usr/share/zoneinfo/MST7MDT:
       /usr/share/zoneinfo/PST8PDT:
-      /usr/share/zoneinfo/tzdata.zi:
       /usr/share/zoneinfo/WET:
+      /usr/share/zoneinfo/iso3166.tab:
+      /usr/share/zoneinfo/leap-seconds.list:
+      /usr/share/zoneinfo/leapseconds:
+      /usr/share/zoneinfo/localtime:
+      /usr/share/zoneinfo/tzdata.zi:
 
   africa:
     essential: