From 8bf92e4e10bf84b9d2b38ca570921401b398483a Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Wed, 6 Mar 2024 16:10:48 +0600 Subject: [PATCH 1/4] chore(20.04): add lint job --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ec2e29756..9187a7ee1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,3 +15,7 @@ jobs: installability-tests: name: Installability tests uses: canonical/chisel-releases/.github/workflows/install-slices.yaml@main + + lint: + name: Lint + uses: canonical/chisel-releases/.github/workflows/lint.yaml@main From 9babed6229eb9bb65bbc4946dcf1c84e5d8b0716 Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Fri, 8 Mar 2024 09:11:01 +0600 Subject: [PATCH 2/4] refactor: re-indent chisel.yaml with 2 spaces --- chisel.yaml | 76 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/chisel.yaml b/chisel.yaml index ad4cd27c8..df582ef4d 100644 --- a/chisel.yaml +++ b/chisel.yaml @@ -1,44 +1,44 @@ format: chisel-v1 archives: - ubuntu: - version: 20.04 - components: [main, universe] - suites: [focal, focal-security, focal-updates] - v1-public-keys: [ubuntu-archive-key-2018] + ubuntu: + version: 20.04 + components: [main, universe] + suites: [focal, focal-security, focal-updates] + v1-public-keys: [ubuntu-archive-key-2018] v1-public-keys: - # Ubuntu Archive Automatic Signing Key (2018) - # rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z - ubuntu-archive-key-2018: - id: "871920D1991BC93C" - armor: | - -----BEGIN PGP PUBLIC KEY BLOCK----- + # Ubuntu Archive Automatic Signing Key (2018) + # rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z + ubuntu-archive-key-2018: + id: "871920D1991BC93C" + armor: | + -----BEGIN PGP PUBLIC KEY BLOCK----- - mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq - dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ - HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq - X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k - KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns - AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta - LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq - VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd - yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv - Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow - DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB - tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm - dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI - AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH - beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG - g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa - Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy - q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF - kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0 - LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr - BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5 - KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA - QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp - SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+ - uOgcXny1UlwtCUzlrSaP - =9AdM - -----END PGP PUBLIC KEY BLOCK----- + mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq + dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ + HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq + X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k + KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns + AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta + LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq + VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd + yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv + Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow + DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB + tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm + dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI + AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH + beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG + g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa + Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy + q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF + kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0 + LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr + BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5 + KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA + QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp + SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+ + uOgcXny1UlwtCUzlrSaP + =9AdM + -----END PGP PUBLIC KEY BLOCK----- From a5279b06a866c7667519f7a659e775d56030e685 Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Fri, 8 Mar 2024 09:16:38 +0600 Subject: [PATCH 3/4] refactor: fix yamllint errors --- slices/base-passwd.yaml | 4 ++-- slices/ca-certificates-java.yaml | 5 ++--- slices/ca-certificates.yaml | 4 +++- slices/fonts-dejavu-core.yaml | 2 +- slices/libpython3.8-stdlib.yaml | 14 +++++++------- slices/openjdk-8-jre-headless.yaml | 20 ++++++++++++-------- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/slices/base-passwd.yaml b/slices/base-passwd.yaml index 0e6d4e3c4..8ce1735f9 100644 --- a/slices/base-passwd.yaml +++ b/slices/base-passwd.yaml @@ -3,9 +3,9 @@ package: base-passwd slices: data: contents: - /usr/share/base-passwd/group.master: {until: mutate} + /usr/share/base-passwd/group.master: {until: mutate} /usr/share/base-passwd/passwd.master: {until: mutate} - /etc/group: {text: FIXME, mutable: true} + /etc/group: {text: FIXME, mutable: true} /etc/passwd: {text: FIXME, mutable: true} mutate: | gr = content.read("/usr/share/base-passwd/group.master") diff --git a/slices/ca-certificates-java.yaml b/slices/ca-certificates-java.yaml index 2480f8d5b..d88290b38 100644 --- a/slices/ca-certificates-java.yaml +++ b/slices/ca-certificates-java.yaml @@ -8,6 +8,5 @@ slices: contents: /etc/default/cacerts: /etc/ssl/certs/java/: - - # we need to run `keytool` in postinst, but we can't yet do - # this from a mutation script + # we need to run `keytool` in postinst, but we can't yet do + # this from a mutation script diff --git a/slices/ca-certificates.yaml b/slices/ca-certificates.yaml index bdd36c7a6..c2e90cb00 100644 --- a/slices/ca-certificates.yaml +++ b/slices/ca-certificates.yaml @@ -8,5 +8,7 @@ slices: /usr/share/ca-certificates/mozilla/*: {until: mutate} mutate: | certs_dir = "/usr/share/ca-certificates/mozilla/" - certs = [content.read(certs_dir + path) for path in content.list(certs_dir)] + certs = [ + content.read(certs_dir + path) for path in content.list(certs_dir) + ] content.write("/etc/ssl/certs/ca-certificates.crt", "".join(certs)) diff --git a/slices/fonts-dejavu-core.yaml b/slices/fonts-dejavu-core.yaml index 7a2e5d2bf..a865ad959 100644 --- a/slices/fonts-dejavu-core.yaml +++ b/slices/fonts-dejavu-core.yaml @@ -9,7 +9,7 @@ slices: /usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf: /usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf: /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf: - + config: contents: /etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf: diff --git a/slices/libpython3.8-stdlib.yaml b/slices/libpython3.8-stdlib.yaml index fc62dc35f..ef04c1b13 100644 --- a/slices/libpython3.8-stdlib.yaml +++ b/slices/libpython3.8-stdlib.yaml @@ -1,12 +1,12 @@ package: libpython3.8-stdlib -# The slices in this package have been grouped with inspiration -# from the Python 3.8 Standard Library (https://docs.python.org/3.8/library/index.html). -# Aside from the "core" slice which contains the minimal libraries that -# should come from this package and the "extra" slice which contains -# miscellaneous libraries, all the other slice definitions are sorted -# by their names. The "core" slice is placed at the very beginning and -# the "extra" slice at the very end. +# The slices in this package have been grouped with inspiration from the Python +# 3.8 Standard Library (https://docs.python.org/3.8/library/index.html). +# Aside from the "core" slice which contains the minimal libraries that should +# come from this package and the "extra" slice which contains miscellaneous +# libraries, all the other slice definitions are sorted by their names. The +# "core" slice is placed at the very beginning and the "extra" slice at the +# very end. slices: # The "core" slice provides a very minimal libpython3.8-stdlib core: diff --git a/slices/openjdk-8-jre-headless.yaml b/slices/openjdk-8-jre-headless.yaml index 317d2d7e9..e31bbec60 100644 --- a/slices/openjdk-8-jre-headless.yaml +++ b/slices/openjdk-8-jre-headless.yaml @@ -132,18 +132,20 @@ slices: contents: /usr/lib/jvm/java-8-openjdk-*/jre/lib/jfr.jar: arch: - - amd64 - - arm64 - - armhf - - ppc64el + - amd64 + - arm64 + - armhf + - ppc64el # Shared libraries for supporting heap profilling. hprof: essential: - openjdk-8-jre-headless_core contents: - /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-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: @@ -152,8 +154,10 @@ slices: essential: - openjdk-8-jre-headless_core contents: - /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-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: From f6c4dc0baab6cde1fd453efa96d7f48890436e19 Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Fri, 8 Mar 2024 09:30:43 +0600 Subject: [PATCH 4/4] refactor: sort 'essential' and 'contents' This commit sorts the .essential list and .content map entries in an ASCENDING order. --- slices/base-files.yaml | 6 +-- slices/base-passwd.yaml | 4 +- slices/bash.yaml | 2 +- slices/libc6.yaml | 6 +-- slices/libfontconfig1.yaml | 2 +- slices/libfreetype6.yaml | 4 +- slices/libglib2.0-0.yaml | 2 +- slices/libmount1.yaml | 2 +- slices/libnss3.yaml | 2 +- slices/libpython3.8-minimal.yaml | 2 +- slices/libpython3.8-stdlib.yaml | 22 ++++----- slices/libreadline8.yaml | 2 +- slices/libunwind8.yaml | 2 +- slices/openjdk-8-jre-headless.yaml | 78 +++++++++++++++--------------- slices/openssl.yaml | 2 +- slices/python3.8-minimal.yaml | 2 +- slices/python3.8.yaml | 14 +++--- 17 files changed, 77 insertions(+), 77 deletions(-) diff --git a/slices/base-files.yaml b/slices/base-files.yaml index 9eb602d56..071de6eb0 100644 --- 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 index 8ce1735f9..cadc1f904 100644 --- 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 index e0f3b4aac..beeba890a 100644 --- 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 index 7d3adc8ec..f5dae1813 100644 --- 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 index dde3a206a..e1385cbd8 100644 --- 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 index bbe0d3ac0..fd46a6aea 100644 --- 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 index 6507f3adc..93dac4e51 100644 --- 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 index 800bed968..1bb632192 100644 --- 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 index f038b2c1e..28cca9719 100644 --- 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 index 33b175f29..177a52118 100644 --- 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 index ef04c1b13..07b41078a 100644 --- 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 index 4a48b67ac..ae5cf2531 100644 --- 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 index 2cae756f7..e1cc21b11 100644 --- 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 index e31bbec60..110e42188 100644 --- 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,18 +74,29 @@ 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: @@ -99,30 +104,25 @@ slices: /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. @@ -142,31 +142,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 index 38f00f7b8..71ddbeb13 100644 --- a/slices/openssl.yaml +++ b/slices/openssl.yaml @@ -3,8 +3,8 @@ package: openssl slices: bins: essential: - - libc6_libs - libc6_config + - libc6_libs - libssl1.1_libs - openssl_config contents: diff --git a/slices/python3.8-minimal.yaml b/slices/python3.8-minimal.yaml index fbb47d8a6..789be5581 100644 --- a/slices/python3.8-minimal.yaml +++ b/slices/python3.8-minimal.yaml @@ -4,8 +4,8 @@ slices: bins: essential: - libc6_libs - - libpython3.8-minimal_libs - libexpat1_libs + - libpython3.8-minimal_libs - zlib1g_libs contents: /usr/bin/python3.8: diff --git a/slices/python3.8.yaml b/slices/python3.8.yaml index 4d60c8534..a568503ad 100644 --- a/slices/python3.8.yaml +++ b/slices/python3.8.yaml @@ -5,24 +5,25 @@ slices: # It includes very few modules from the libpython3.8-stdlib package. core: essential: - - python3.8-minimal_bins - libpython3.8-stdlib_core - mime-support_mime-types + - python3.8-minimal_bins # The "standard" slice extends "core" with all the Python # modules from the libpython3.8-stdlib package. standard: essential: - - python3.8_core - - libpython3.8-stdlib_core - libpython3.8-stdlib_all-os - libpython3.8-stdlib_concurrency + - libpython3.8-stdlib_core - libpython3.8-stdlib_crypto - libpython3.8-stdlib_custom-interpreters + - libpython3.8-stdlib_data-persistence - libpython3.8-stdlib_data-types - libpython3.8-stdlib_debug - libpython3.8-stdlib_development-tools - libpython3.8-stdlib_distribution + - libpython3.8-stdlib_extras - libpython3.8-stdlib_file-formats - libpython3.8-stdlib_filesys - libpython3.8-stdlib_frameworks @@ -35,18 +36,17 @@ slices: - libpython3.8-stdlib_net-data - libpython3.8-stdlib_numeric - libpython3.8-stdlib_osx-support - - libpython3.8-stdlib_data-persistence - libpython3.8-stdlib_pydoc - libpython3.8-stdlib_text - libpython3.8-stdlib_unix - - libpython3.8-stdlib_extras + - python3.8_core # The "utlis" slice extends "core" with various tools. utils: essential: - - python3.8_core - - libpython3.8-stdlib_pydoc - libpython3.8-stdlib_debug + - libpython3.8-stdlib_pydoc + - python3.8_core contents: /usr/bin/pdb3.8: /usr/bin/pydoc3.8: