Merge branch 'ubuntu-24.04' into slices/util-linux

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/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/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/dosfstools.yaml

@@ -0,0 +1,24 @@
+package: dosfstools
+
+essential:
+  - dosfstools_copyright
+
+slices:
+  bins:
+    essential:
+      - libc6_libs
+    contents:
+      /usr/sbin/dosfsck:
+      /usr/sbin/dosfslabel:
+      /usr/sbin/fatlabel:
+      /usr/sbin/fsck.fat:
+      /usr/sbin/fsck.msdos:
+      /usr/sbin/fsck.vfat:
+      /usr/sbin/mkdosfs:
+      /usr/sbin/mkfs.fat:
+      /usr/sbin/mkfs.msdos:
+      /usr/sbin/mkfs.vfat:
+
+  copyright:
+    contents:
+      /usr/share/doc/dosfstools/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.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-ubuntu.yaml

@@ -0,0 +1,55 @@
+package: fonts-ubuntu
+
+essential:
+  - fonts-ubuntu_copyright
+
+slices:
+  all:
+    essential:
+      - fonts-ubuntu_ubuntu
+      - fonts-ubuntu_ubuntu-mono
+      - fonts-ubuntu_ubuntu-sans
+      - fonts-ubuntu_ubuntu-sans-mono
+
+  config:
+    contents:
+      /etc/fonts/conf.d/71-ubuntulegacy.conf:
+      /usr/share/fontconfig/conf.avail/71-ubuntulegacy.conf:
+
+  ubuntu:
+    contents:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-B.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-BI.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-C.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-Italic[wdth,wght].ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-L.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-LI.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-M.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-MI.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-R.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-RI.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu-Th.ttf:
+      /usr/share/fonts/truetype/ubuntu/Ubuntu[wdth,wght].ttf:
+
+  ubuntu-mono:
+    contents:
+      /usr/share/fonts/truetype/ubuntu/UbuntuMono-B.ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuMono-BI.ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuMono-Italic[wght].ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuMono-R.ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuMono-RI.ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuMono[wght].ttf:
+
+  ubuntu-sans:
+    contents:
+      /usr/share/fonts/truetype/ubuntu/UbuntuSans-Italic[wdth,wght].ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuSans[wdth,wght].ttf:
+
+  ubuntu-sans-mono:
+    contents:
+      /usr/share/fonts/truetype/ubuntu/UbuntuSansMono-Italic[wght].ttf:
+      /usr/share/fonts/truetype/ubuntu/UbuntuSansMono[wght].ttf:
+
+  copyright:
+    contents:
+      /usr/share/doc/fonts-ubuntu/copyright:

slices/gpg.yaml

@@ -0,0 +1,24 @@
+package: gpg
+
+essential:
+  - gpg_copyright
+
+slices:
+  bins:
+    essential:
+      # gpgconf is not included here as some gpg tasks work without it.
+      - libassuan0_libs
+      - libbz2-1.0_libs
+      - libc6_libs
+      - libgcrypt20_libs
+      - libgpg-error0_libs
+      - libnpth0t64_libs
+      - libreadline8t64_libs
+      - libsqlite3-0_libs
+      - zlib1g_libs
+    contents:
+      /usr/bin/gpg:
+
+  copyright:
+    contents:
+      /usr/share/doc/gpg/copyright:

slices/gpgconf.yaml

@@ -0,0 +1,32 @@
+package: gpgconf
+
+essential:
+  - gpgconf_copyright
+
+slices:
+  bins:
+    essential:
+      - gpgconf_gpg-connect-agent
+      - gpgconf_gpgconf
+
+  gpg-connect-agent:
+    essential:
+      - libassuan0_libs
+      - libc6_libs
+      - libgcrypt20_libs
+      - libgpg-error0_libs
+      - libreadline8t64_libs
+    contents:
+      /usr/bin/gpg-connect-agent:
+
+  gpgconf:
+    essential:
+      - libc6_libs
+      - libgcrypt20_libs
+      - libgpg-error0_libs
+    contents:
+      /usr/bin/gpgconf:
+
+  copyright:
+    contents:
+      /usr/share/doc/gpgconf/copyright:

slices/libassuan0.yaml

@@ -0,0 +1,16 @@
+package: libassuan0
+
+essential:
+  - libassuan0_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+      - libgpg-error0_libs
+    contents:
+      /usr/lib/*-linux-*/libassuan.so.0*:
+
+  copyright:
+    contents:
+      /usr/share/doc/libassuan0/copyright:

slices/libbluray2.yaml

@@ -0,0 +1,19 @@
+package: libbluray2
+
+essential:
+  - libbluray2_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+      - libfontconfig1_libs
+      - libfreetype6_libs
+      - libudfread0_libs
+      - libxml2_libs
+    contents:
+      /usr/lib/*-linux-*/libbluray.so.2*:
+
+  copyright:
+    contents:
+      /usr/share/doc/libbluray2/copyright:

slices/libc-bin.yaml

@@ -8,6 +8,13 @@ slices:
     contents:
       /etc/nsswitch.conf: {copy: /usr/share/libc-bin/nsswitch.conf}
 
+  ldconfig:
+    essential:
+      - dash_bins
+    contents:
+      /usr/sbin/ldconfig:
+      /usr/sbin/ldconfig.real:
+
   locale:
     contents:
       /usr/lib/locale/C.utf8/LC_ADDRESS: