Fix: usrmerge /usr/sbin packages that had prior merges

busybox.yaml

@@ -1,7 +1,7 @@
 package:
   name: busybox
   version: 1.37.0
-  epoch: 30
+  epoch: 40
   description: "swiss-army knife for embedded systems"
   copyright:
     - license: GPL-2.0-only
@@ -10,6 +10,7 @@ package:
     runtime:
       - merged-bin
       - merged-sbin
+      - merged-usrsbin
       - wolfi-baselayout
   scriptlets:
     trigger:
@@ -62,7 +63,6 @@ pipeline:
 
   - name: Install
     runs: |
-      mkdir -p "${{targets.destdir}}"/usr/sbin
       mkdir -p "${{targets.destdir}}"/usr/bin
       mkdir -p "${{targets.destdir}}"/etc/busybox-paths.d
       install -m755 busybox "${{targets.destdir}}"/usr/bin/busybox
@@ -73,6 +73,8 @@ pipeline:
       sed 's|^sbin|usr/bin|' -i "${{targets.destdir}}"/etc/busybox-paths.d/busybox
       # bin merge
       sed 's|^bin|usr/bin|' -i "${{targets.destdir}}"/etc/busybox-paths.d/busybox
+      # usrsbin merge
+      sed 's|^usr/sbin|usr/bin|' -i "${{targets.destdir}}"/etc/busybox-paths.d/busybox
 
 subpackages:
   - name: busybox-full
@@ -81,8 +83,9 @@ subpackages:
         - busybox=${{package.full-version}}
       provider-priority: 5
       runtime:
-        - merged-sbin
         - merged-bin
+        - merged-sbin
+        - merged-usrsbin
         - wolfi-baselayout
     options:
       no-commands: true
@@ -94,7 +97,6 @@ subpackages:
           make CC="${{host.triplet.gnu}}-gcc" V=1 -j$(nproc)
       - name: Install
         runs: |
-          mkdir -p "${{targets.subpkgdir}}"/usr/sbin
           mkdir -p "${{targets.subpkgdir}}"/usr/bin
           mkdir -p "${{targets.subpkgdir}}"/etc/busybox-paths.d
           install -m755 busybox "${{targets.subpkgdir}}"/usr/bin/busybox
@@ -105,6 +107,8 @@ subpackages:
           sed 's|^sbin|usr/bin|' -i "${{targets.subpkgdir}}"/etc/busybox-paths.d/busybox-full
           # bin merge
           sed 's|^bin|usr/bin|' -i "${{targets.subpkgdir}}"/etc/busybox-paths.d/busybox-full
+          # usrsbin merge
+          sed 's|^usr/sbin|usr/bin|' -i "${{targets.subpkgdir}}"/etc/busybox-paths.d/busybox-full
     scriptlets:
       trigger:
         paths:

cifs-utils.yaml

@@ -1,13 +1,14 @@
 package:
   name: cifs-utils
   version: "7.2"
-  epoch: 20
+  epoch: 40
   description: CIFS filesystem user-space tools
   copyright:
     - license: GPL-3.0-or-later
   dependencies:
     runtime:
       - merged-sbin
+      - merged-usrsbin
       - wolfi-baselayout
 
 environment:
@@ -31,6 +32,8 @@ pipeline:
       uri: https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-${{package.version}}.tar.bz2
 
   - uses: autoconf/configure
+    with:
+      opts: --sbindir=/usr/bin
 
   - uses: autoconf/make
 
@@ -48,6 +51,7 @@ subpackages:
       runtime:
         - cifs-utils
         - merged-sbin
+        - merged-usrsbin
         - wolfi-baselayout
 
   - name: "cifs-utils-doc"
@@ -60,6 +64,7 @@ subpackages:
     dependencies:
       runtime:
         - merged-sbin
+        - merged-usrsbin
         - wolfi-baselayout
 
 update:

coreutils.yaml

@@ -1,7 +1,7 @@
 package:
   name: coreutils
   version: "9.6"
-  epoch: 30
+  epoch: 40
   description: "GNU core utilities"
   copyright:
     - license: GPL-3.0-or-later
@@ -12,6 +12,7 @@ package:
   dependencies:
     runtime:
       - merged-bin
+      - merged-usrsbin
       - wolfi-baselayout
 
 environment:
@@ -57,10 +58,6 @@ pipeline:
       rm -rf usr/lib/charset.alias
       rmdir -p usr/lib 2>/dev/null || true
 
-      # busybox chroot
-      mkdir -p usr/sbin
-      ln -s usr/bin/coreutils usr/sbin/chroot
-
       # shouldn't be here, but you never know...
       rm -f usr/bin/groups
 
@@ -76,6 +73,7 @@ subpackages:
     dependencies:
       runtime:
         - merged-bin
+        - merged-usrsbin
         - wolfi-baselayout
 
   - name: "coreutils-legacy"
@@ -88,6 +86,7 @@ subpackages:
     dependencies:
       runtime:
         - merged-bin
+        - merged-usrsbin
         - wolfi-baselayout
 
 update:

crac-criu.yaml

@@ -1,10 +1,14 @@
 package:
   name: crac-criu
   version: 1.5.0.0.1
-  epoch: 0
+  epoch: 40
   description: A project to implement checkpoint/restore functionality for Linux
   copyright:
     - license: GPL-2.0-only
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 var-transforms:
   - from: ${{package.version}}
@@ -55,6 +59,11 @@ pipeline:
     with:
       opts: PREFIX=/usr
 
+  - runs: |
+      mkdir -p "${{targets.destdir}}"/usr/bin
+      mv "${{targets.destdir}}"/usr/sbin/* "${{targets.destdir}}"/usr/bin
+      rmdir "${{targets.destdir}}"/usr/sbin
+
   - uses: strip
 
 update:
@@ -68,8 +77,8 @@ update:
 test:
   pipeline:
     - runs: |
-        # check at least if the binary is there in usr/sbin/criu
-        if [ ! -f "/usr/sbin/crac-criu" ]; then
+        # check at least if the binary is there in usr/bin/criu
+        if [ ! -f "/usr/bin/crac-criu" ]; then
           echo "criu binary not found"
           exit 1
         fi

dhclient.yaml

@@ -1,7 +1,7 @@
 package:
   name: dhclient
   version: 4.4.3
-  epoch: 20
+  epoch: 40
   description: dhcp client program
   copyright:
     - license: BSD-2-Clause
@@ -10,6 +10,7 @@ package:
       - coreutils
       - iproute2
       - merged-sbin
+      - merged-usrsbin
       - wolfi-baselayout
 
 environment:

icu.yaml

@@ -1,13 +1,15 @@
 package:
   name: icu
   version: "75.1"
-  epoch: 7
+  epoch: 40
   description: "International Components for Unicode library"
   copyright:
     - license: MIT
   dependencies:
     runtime:
       - icu-libs
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -51,7 +53,8 @@ pipeline:
         --with-data-packaging=archive \
         --disable-samples \
         --enable-static \
-        --mandir=/usr/share/man
+        --mandir=/usr/share/man \
+        --sbindir=/usr/bin
 
   - uses: autoconf/make
     with:
@@ -71,6 +74,8 @@ subpackages:
     dependencies:
       runtime:
         - icu
+        - merged-usrsbin
+        - wolfi-baselayout
     test:
       pipeline:
         - runs: |
@@ -92,6 +97,8 @@ subpackages:
     dependencies:
       runtime:
         - icu-data-full
+        - merged-usrsbin
+        - wolfi-baselayout
     test:
       pipeline:
         - uses: test/ldd-check
@@ -104,6 +111,10 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.contextdir}}/usr/share/icu/${{package.version}}
           mv ${{targets.destdir}}/usr/share/icu/${{package.version}}/icudt${{vars.major-version}}l.dat ${{targets.contextdir}}/usr/share/icu/${{package.version}}/
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: icu-doc
     description: icu docs
@@ -112,6 +123,10 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 # switch back to this once the GitHub release stops saying pre-release
 # github:

iputils.yaml

@@ -1,13 +1,14 @@
 package:
   name: iputils
   version: "20240905"
-  epoch: 30
+  epoch: 40
   description: IP Configuration Utilities
   copyright:
     - license: BSD-3-Clause AND GPL-2.0-or-later
   dependencies:
     runtime:
       - merged-bin
+      - merged-usrsbin
       - wolfi-baselayout
 
 environment:

kmod.yaml

@@ -1,10 +1,14 @@
 package:
   name: kmod
   version: "34"
-  epoch: 0
+  epoch: 40
   description: Linux kernel module management utilities
   copyright:
     - license: GPL-2.0-or-later
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -47,17 +51,17 @@ pipeline:
         --with-zlib \
         --with-xz \
         --with-zstd \
-        --with-openssl
+        --with-openssl \
+        --sbindir=/usr/bin
 
   - uses: autoconf/make
 
   - uses: autoconf/make-install
 
   - runs: |
       mkdir -p ${{targets.destdir}}/usr/bin
-      mkdir -p ${{targets.destdir}}/usr/sbin
       for i in lsmod rmmod insmod modinfo modprobe depmod; do
-        ln -sf ../bin/kmod ${{targets.destdir}}/usr/sbin/$i
+        ln -sf kmod ${{targets.destdir}}/usr/bin/$i
       done
 
   - uses: strip
@@ -67,6 +71,10 @@ subpackages:
     pipeline:
       - uses: split/manpages
     description: kmod manpages
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: kmod-libs
     description: kmod libs
@@ -80,13 +88,19 @@ subpackages:
         - uses: test/tw/ldd-check
           with:
             packages: ${{subpkg.name}}
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: kmod-dev
     pipeline:
       - uses: split/dev
     dependencies:
       runtime:
         - kmod-libs
+        - merged-usrsbin
+        - wolfi-baselayout
     description: kmod dev
     test:
       pipeline:
@@ -98,6 +112,10 @@ subpackages:
           mkdir -p ${{targets.subpkgdir}}/usr/share
           mv ${{targets.destdir}}/usr/share/bash-completion ${{targets.subpkgdir}}/usr/share/
     description: kmod bash completion
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 update:
   enabled: true