Skip to content

Commit

Permalink
fix(24.04): fix release errors (#148)
Browse files Browse the repository at this point in the history
* fix(24.04): bash binaries are now in /usr/bin

* fix(24.04): dash binaries are now in /usr/bin

* fix(24.04): libunwind-13 was removed from Noble

* fix(24.04): coreutils binaries moved to /usr/bin

* fix(24.04): fix paths for libbz2-1.0

* fix(24.04): fix paths for libc6

* fix(24.04): fix conflict with libnsl

* fix(24.04): fix symlinks in base-files

* fix(24.04): fix /lib symlink in base-files

* fix(24.04): fix libmvec for arm64 and amd64
  • Loading branch information
cjdcordeiro authored Feb 27, 2024
1 parent f2e0be2 commit 836e616
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 68 deletions.
6 changes: 3 additions & 3 deletions slices/base-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ slices:

bin:
contents:
/bin/:
/sbin/:
/bin:
/sbin:
/usr/bin/:
/usr/sbin/:

lib:
contents:
/lib/:
/lib:
/usr/lib/:

tmp:
Expand Down
4 changes: 2 additions & 2 deletions slices/bash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ slices:
- libtinfo6_libs
contents:
# user should manually link /bin/sh to /bin/bash
/bin/bash:
/bin/rbash:
/usr/bin/bash:
/usr/bin/rbash:
/usr/bin/clear_console:
/usr/bin/bashbug:
56 changes: 28 additions & 28 deletions slices/coreutils.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,53 +19,36 @@ slices:
- libpcre2-8-0_libs
- libselinux1_libs
contents:
/bin/cat:
/bin/chgrp:
/bin/chmod:
/bin/chown:
/bin/cp:
/bin/date:
/bin/dd:
/bin/df:
/bin/dir:
/bin/echo:
/bin/false:
/bin/ln:
/bin/ls:
/bin/mkdir:
/bin/mknod:
/bin/mktemp:
/bin/mv:
/bin/pwd:
/bin/readlink:
/bin/rm:
/bin/rmdir:
/bin/sleep:
/bin/stty:
/bin/sync:
/bin/touch:
/bin/true:
/bin/uname:
/bin/vdir:
/usr/bin/[:
/usr/bin/arch:
/usr/bin/b2sum:
/usr/bin/base32:
/usr/bin/base64:
/usr/bin/basename:
/usr/bin/basenc:
/usr/bin/cat:
/usr/bin/chcon:
/usr/bin/chgrp:
/usr/bin/chmod:
/usr/bin/chown:
/usr/bin/cksum:
/usr/bin/comm:
/usr/bin/cp:
/usr/bin/csplit:
/usr/bin/cut:
/usr/bin/date:
/usr/bin/dd:
/usr/bin/df:
/usr/bin/dir:
/usr/bin/dircolors:
/usr/bin/dirname:
/usr/bin/du:
/usr/bin/echo:
/usr/bin/env:
/usr/bin/expand:
/usr/bin/expr:
/usr/bin/factor:
/usr/bin/false:
/usr/bin/fmt:
/usr/bin/fold:
/usr/bin/groups:
Expand All @@ -75,10 +58,16 @@ slices:
/usr/bin/install:
/usr/bin/join:
/usr/bin/link:
/usr/bin/ln:
/usr/bin/logname:
/usr/bin/ls:
/usr/bin/md5sum:
/usr/bin/md5sum.textutils:
/usr/bin/mkdir:
/usr/bin/mkfifo:
/usr/bin/mknod:
/usr/bin/mktemp:
/usr/bin/mv:
/usr/bin/nice:
/usr/bin/nl:
/usr/bin/nohup:
Expand All @@ -92,7 +81,11 @@ slices:
/usr/bin/printenv:
/usr/bin/printf:
/usr/bin/ptx:
/usr/bin/pwd:
/usr/bin/readlink:
/usr/bin/realpath:
/usr/bin/rm:
/usr/bin/rmdir:
/usr/bin/runcon:
/usr/bin/seq:
/usr/bin/sha1sum:
Expand All @@ -102,24 +95,31 @@ slices:
/usr/bin/sha512sum:
/usr/bin/shred:
/usr/bin/shuf:
/usr/bin/sleep:
/usr/bin/sort:
/usr/bin/split:
/usr/bin/stat:
/usr/bin/stdbuf:
/usr/bin/stty:
/usr/bin/sum:
/usr/bin/sync:
/usr/bin/tac:
/usr/bin/tail:
/usr/bin/tee:
/usr/bin/test:
/usr/bin/timeout:
/usr/bin/touch:
/usr/bin/tr:
/usr/bin/true:
/usr/bin/truncate:
/usr/bin/tsort:
/usr/bin/tty:
/usr/bin/uname:
/usr/bin/unexpand:
/usr/bin/uniq:
/usr/bin/unlink:
/usr/bin/users:
/usr/bin/vdir:
/usr/bin/wc:
/usr/bin/who:
/usr/bin/whoami:
Expand Down
4 changes: 2 additions & 2 deletions slices/dash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ slices:
essential:
- libc6_libs
contents:
/bin/dash:
/bin/sh:
/usr/bin/dash:
/usr/bin/sh:
2 changes: 1 addition & 1 deletion slices/libbz2-1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ slices:
essential:
- libc6_libs
contents:
/lib/*-linux-*/libbz2.so.1*:
/usr/lib/*-linux-*/libbz2.so.1*:
42 changes: 21 additions & 21 deletions slices/libc6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@ slices:

libs:
contents:
/lib/*-linux-*/ld*.so.*:
/lib/*-linux-*/libBrokenLocale.so.*:
/lib/*-linux-*/libanl.so.*:
/lib/*-linux-*/libc.so.*:
/lib/*-linux-*/libc_malloc_debug.so.*:
/lib/*-linux-*/libdl.so.*:
/lib/*-linux-*/libm.so.*:
/lib/*-linux-*/libmemusage.so:
/lib/*-linux-*/libmvec.so.*: {arch: amd64}
/lib/*-linux-*/libnsl.so.*:
/lib/*-linux-*/libnss_compat.so.*:
/lib/*-linux-*/libnss_dns.so.*:
/lib/*-linux-*/libnss_files.so.*:
/lib/*-linux-*/libnss_hesiod.so.*:
/lib/*-linux-*/libpcprofile.so:
/lib/*-linux-*/libpthread.so.*:
/lib/*-linux-*/libresolv.so.*:
/lib/*-linux-*/librt.so.*:
/lib/*-linux-*/libthread_db.so.*:
/lib/*-linux-*/libutil.so.*:
/lib*/ld*.so.*:
/usr/lib/*-linux-*/ld*.so.*:
/usr/lib/*-linux-*/libBrokenLocale.so.*:
/usr/lib/*-linux-*/libanl.so.*:
/usr/lib/*-linux-*/libc.so.*:
/usr/lib/*-linux-*/libc_malloc_debug.so.*:
/usr/lib/*-linux-*/libdl.so.*:
/usr/lib/*-linux-*/libm.so.*:
/usr/lib/*-linux-*/libmemusage.so:
/usr/lib/*-linux-*/libmvec.so.*: {arch: [amd64,arm64]}
/usr/lib/*-linux-*/libnsl.so.1:
/usr/lib/*-linux-*/libnss_compat.so.*:
/usr/lib/*-linux-*/libnss_dns.so.*:
/usr/lib/*-linux-*/libnss_files.so.*:
/usr/lib/*-linux-*/libnss_hesiod.so.*:
/usr/lib/*-linux-*/libpcprofile.so:
/usr/lib/*-linux-*/libpthread.so.*:
/usr/lib/*-linux-*/libresolv.so.*:
/usr/lib/*-linux-*/librt.so.*:
/usr/lib/*-linux-*/libthread_db.so.*:
/usr/lib/*-linux-*/libutil.so.*:
/usr/lib*/ld*.so.*:
11 changes: 0 additions & 11 deletions slices/libunwind-13.yaml

This file was deleted.

0 comments on commit 836e616

Please sign in to comment.