Merge branch 'ubuntu-24.04' into slices/dosfs

chisel.yaml

@@ -2,6 +2,7 @@ format: v1
 
 archives:
   ubuntu:
+    default: true
     version: 24.04
     components: [main, universe]
     suites: [noble, noble-security, noble-updates]

slices/base-files.yaml

@@ -66,6 +66,13 @@ slices:
       /etc/os-release:
       /usr/lib/os-release:
 
+  # Dedicated slice for generating the Chisel manifest.
+  chisel:
+    essential:
+      - base-files_var
+    contents:
+      /var/lib/chisel/**: {generate: manifest}
+
   copyright:
     contents:
       /usr/share/doc/base-files/copyright:

slices/ca-certificates-java.yaml

@@ -0,0 +1,39 @@
+package: ca-certificates-java
+
+essential:
+  - ca-certificates-java_copyright
+
+slices:
+  bins:
+    essential:
+      - ca-certificates-java_data-with-certs
+      - ca-certificates_bins
+      # chisel tool does not allow per-architecture packages
+      # openjdk-8 is not published for RISCV in the archive
+      # - openjdk-8-jre-headless_security
+    contents:
+      # In order to generate Java keystore in a chiselled chroot
+      # execute following commands, assuming that 'rootfs' is the
+      # output directory and openjdk-8-jre-headless_security is
+      # also installed.
+      # cd rootfs
+      # sudo chroot . /bin/bash /usr/sbin/update-ca-certificates
+      # sudo chroot . find /etc/ssl/certs/ -name *.pem -exec echo +{} \; > certs
+      # `mkdir proc && mount -t proc /proc proc/` or
+      # `chroot . ln -s /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java proc/self/exe`
+      # sudo chroot . /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
+      #    -jar /usr/share/ca-certificates-java/ca-certificates-java.jar < certs
+      # rm certs
+      # See tests/spread/integration/ca-certificates-java/task.yaml
+      /etc/ssl/certs/java/:
+      /usr/share/ca-certificates-java/ca-certificates-java.jar:
+
+  data-with-certs:
+    essential:
+      - ca-certificates_data-with-certs
+    contents:
+      /etc/ssl/certs/java/:
+
+  copyright:
+    contents:
+      /usr/share/doc/ca-certificates-java/copyright:

slices/coreutils.yaml

@@ -12,7 +12,9 @@ slices:
 
   bins:
     essential:
+      - coreutils_expr
       - coreutils_libs
+      - coreutils_mkdir
       - libacl1_libs
       - libattr1_libs
       - libc6_libs
@@ -49,7 +51,6 @@ slices:
       /usr/bin/echo:
       /usr/bin/env:
       /usr/bin/expand:
-      /usr/bin/expr:
       /usr/bin/factor:
       /usr/bin/false:
       /usr/bin/fmt:
@@ -66,7 +67,6 @@ slices:
       /usr/bin/ls:
       /usr/bin/md5sum:
       /usr/bin/md5sum.textutils:
-      /usr/bin/mkdir:
       /usr/bin/mkfifo:
       /usr/bin/mknod:
       /usr/bin/mktemp:
@@ -129,6 +129,21 @@ slices:
       /usr/bin/yes:
       /usr/sbin/chroot:
 
+  expr:
+    essential:
+      - libc6_libs
+      - libgmp10_libs
+    contents:
+      /usr/bin/expr:
+
+  mkdir:
+    essential:
+      - libc6_libs
+      - libpcre2-8-0_libs
+      - libselinux1_libs
+    contents:
+      /usr/bin/mkdir:
+
   copyright:
     contents:
       /usr/share/doc/coreutils/copyright:

slices/crun.yaml

@@ -0,0 +1,21 @@
+package: crun
+
+essential:
+  - crun_copyright
+
+slices:
+  bins:
+    essential:
+      - libc6_libs
+      - libcap2_libs
+      - libseccomp2_libs
+      - libsystemd0_libs
+      - libyajl2_libs
+    contents:
+      /usr/bin/crun:
+  libs:
+    contents:
+      /usr/lib/*-linux-*/libcrun.a:
+  copyright:
+    contents:
+      /usr/share/doc/crun/copyright:

slices/diffutils.yaml

@@ -0,0 +1,18 @@
+package: diffutils
+
+essential:
+  - diffutils_copyright
+
+slices:
+  bins:
+    essential:
+      - libc6_libs
+    contents:
+      /usr/bin/cmp:
+      /usr/bin/diff:
+      /usr/bin/diff3:
+      /usr/bin/sdiff:
+
+  copyright:
+    contents:
+      /usr/share/doc/diffutils/copyright:

slices/distro-info-data.yaml

@@ -0,0 +1,14 @@
+package: distro-info-data
+
+essential:
+  - distro-info-data_copyright
+
+slices:
+  data:
+    contents:
+      /usr/share/distro-info/debian.csv:
+      /usr/share/distro-info/ubuntu.csv:
+
+  copyright:
+    contents:
+      /usr/share/doc/distro-info-data/copyright:

slices/dpkg.yaml

@@ -0,0 +1,59 @@
+package: dpkg
+
+essential:
+  - dpkg_copyright
+
+slices:
+  bins:
+    essential:
+      - dpkg_config
+      - dpkg_var
+      - libbz2-1.0_libs
+      - libc-bin_ldconfig
+      - libc6_libs
+      - liblzma5_libs
+      - libmd0_libs
+      - libselinux1_libs
+      - libzstd1_libs
+      - tar_tar
+      - zlib1g_libs
+    contents:
+      /usr/bin/dpkg:
+      /usr/bin/dpkg-deb:
+      /usr/bin/dpkg-divert:
+      /usr/bin/dpkg-maintscript-helper:
+      /usr/bin/dpkg-query:
+      /usr/bin/dpkg-realpath:
+      /usr/bin/dpkg-split:
+      /usr/bin/dpkg-statoverride:
+      /usr/bin/dpkg-trigger:
+      /usr/bin/update-alternatives:
+      /usr/libexec/dpkg/*:
+      /usr/sbin/start-stop-daemon:
+
+  copyright:
+    contents:
+      /usr/share/doc/dpkg/copyright:
+
+  config:
+    contents:
+      /etc/dpkg/dpkg.cfg:
+      /etc/dpkg/dpkg.cfg.d/:
+
+  locales:
+    essential:
+      - dpkg_bins
+    contents:
+      /usr/share/locale/**/dpkg.mo:
+
+  tables:
+    contents:
+      /usr/share/dpkg/*table:
+
+  var:
+    # Directories that are included in the tarball because they need to exist in /var
+    contents:
+      /var/lib/dpkg/alternatives/:
+      /var/lib/dpkg/info/:
+      /var/lib/dpkg/parts/:
+      /var/lib/dpkg/updates/:

slices/fontconfig-config.yaml

@@ -0,0 +1,60 @@
+package: fontconfig-config
+
+essential:
+  - fontconfig-config_copyright
+
+slices:
+  config:
+    essential:
+      - fonts-dejavu-core_config
+    contents:
+      /etc/fonts/conf.d/10-hinting-slight.conf:
+      /etc/fonts/conf.d/10-scale-bitmap-fonts.conf:
+      /etc/fonts/conf.d/10-sub-pixel-rgb.conf:
+      /etc/fonts/conf.d/10-yes-antialias.conf:
+      /etc/fonts/conf.d/11-lcdfilter-default.conf:
+      /etc/fonts/conf.d/20-unhint-small-vera.conf:
+      /etc/fonts/conf.d/30-metric-aliases.conf:
+      /etc/fonts/conf.d/40-nonlatin.conf:
+      /etc/fonts/conf.d/45-generic.conf:
+      /etc/fonts/conf.d/45-latin.conf:
+      /etc/fonts/conf.d/48-spacing.conf:
+      /etc/fonts/conf.d/49-sansserif.conf:
+      /etc/fonts/conf.d/50-user.conf:
+      /etc/fonts/conf.d/51-local.conf:
+      /etc/fonts/conf.d/60-generic.conf:
+      /etc/fonts/conf.d/60-latin.conf:
+      /etc/fonts/conf.d/65-fonts-persian.conf:
+      /etc/fonts/conf.d/65-nonlatin.conf:
+      /etc/fonts/conf.d/69-unifont.conf:
+      /etc/fonts/conf.d/70-no-bitmaps-except-emoji.conf:
+      /etc/fonts/conf.d/80-delicious.conf:
+      /etc/fonts/conf.d/90-synthetic.conf:
+      /etc/fonts/fonts.conf:
+      /usr/share/fontconfig/conf.avail/10-hinting-slight.conf:
+      /usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf:
+      /usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf:
+      /usr/share/fontconfig/conf.avail/10-yes-antialias.conf:
+      /usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf:
+      /usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf:
+      /usr/share/fontconfig/conf.avail/30-metric-aliases.conf:
+      /usr/share/fontconfig/conf.avail/40-nonlatin.conf:
+      /usr/share/fontconfig/conf.avail/45-generic.conf:
+      /usr/share/fontconfig/conf.avail/45-latin.conf:
+      /usr/share/fontconfig/conf.avail/48-spacing.conf:
+      /usr/share/fontconfig/conf.avail/49-sansserif.conf:
+      /usr/share/fontconfig/conf.avail/50-user.conf:
+      /usr/share/fontconfig/conf.avail/51-local.conf:
+      /usr/share/fontconfig/conf.avail/60-generic.conf:
+      /usr/share/fontconfig/conf.avail/60-latin.conf:
+      /usr/share/fontconfig/conf.avail/65-fonts-persian.conf:
+      /usr/share/fontconfig/conf.avail/65-nonlatin.conf:
+      /usr/share/fontconfig/conf.avail/69-unifont.conf:
+      /usr/share/fontconfig/conf.avail/70-no-bitmaps-except-emoji.conf:
+      /usr/share/fontconfig/conf.avail/80-delicious.conf:
+      /usr/share/fontconfig/conf.avail/90-synthetic.conf:
+      /usr/share/xml/fontconfig/fonts.dtd:
+
+  copyright:
+    contents:
+      /usr/share/doc/fontconfig-config/copyright:

slices/fontconfig.yaml

@@ -0,0 +1,33 @@
+package: fontconfig
+
+essential:
+  - fontconfig_copyright
+
+slices:
+  bins:
+    essential:
+      - fontconfig-config_config
+      - fontconfig_cache
+      - libc6_libs
+      - libfontconfig1_libs
+      - libfreetype6_libs
+    contents:
+      /usr/bin/fc-cache:
+      /usr/bin/fc-cat:
+      /usr/bin/fc-conflist:
+      /usr/bin/fc-list:
+      /usr/bin/fc-match:
+      /usr/bin/fc-pattern:
+      /usr/bin/fc-query:
+      /usr/bin/fc-scan:
+      /usr/bin/fc-validate:
+
+  cache:
+    contents:
+      # The postinst script runs fc-cache to regenerate
+      # the fonts cache and populate that directory
+      /var/cache/fontconfig/: {make: true}
+
+  copyright:
+    contents:
+      /usr/share/doc/fontconfig/copyright:

slices/fonts-dejavu-core.yaml

@@ -0,0 +1,38 @@
+package: fonts-dejavu-core
+
+essential:
+  - fonts-dejavu-core_copyright
+
+slices:
+  fonts:
+    contents:
+      /usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf:
+      /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf:
+      /usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf:
+      /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf:
+
+  config:
+    essential:
+      - fonts-dejavu-core_fonts
+      - fonts-dejavu-mono_config
+    contents:
+      /etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf:
+      /etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-serif.conf:
+      /etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf:
+      /etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf:
+      /etc/fonts/conf.avail/57-dejavu-sans.conf:
+      /etc/fonts/conf.avail/57-dejavu-serif.conf:
+      /etc/fonts/conf.avail/58-dejavu-lgc-sans.conf:
+      /etc/fonts/conf.avail/58-dejavu-lgc-serif.conf:
+      /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf:
+      /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf:
+      /etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf:
+      /etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf:
+      /etc/fonts/conf.d/57-dejavu-sans.conf:
+      /etc/fonts/conf.d/57-dejavu-serif.conf:
+      /etc/fonts/conf.d/58-dejavu-lgc-sans.conf:
+      /etc/fonts/conf.d/58-dejavu-lgc-serif.conf:
+
+  copyright:
+    contents:
+      /usr/share/doc/fonts-dejavu-core/copyright:

slices/fonts-dejavu-mono.yaml

@@ -0,0 +1,29 @@
+package: fonts-dejavu-mono
+
+essential:
+  - fonts-dejavu-mono_copyright
+
+slices:
+  fonts:
+    contents:
+      /usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf:
+      /usr/share/fonts/truetype/dejavu/DejaVuSansMono-BoldOblique.ttf:
+      /usr/share/fonts/truetype/dejavu/DejaVuSansMono-Oblique.ttf:
+      /usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf:
+
+  config:
+    essential:
+      - fonts-dejavu-mono_fonts
+    contents:
+      /etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf:
+      /etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf:
+      /etc/fonts/conf.avail/57-dejavu-sans-mono.conf:
+      /etc/fonts/conf.avail/58-dejavu-lgc-sans-mono.conf:
+      /etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf:
+      /etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf:
+      /etc/fonts/conf.d/57-dejavu-sans-mono.conf:
+      /etc/fonts/conf.d/58-dejavu-lgc-sans-mono.conf:
+
+  copyright:
+    contents:
+      /usr/share/doc/fonts-dejavu-mono/copyright: