pcsc-lite - usrmerge usr/sbin

eudev.yaml

@@ -1,10 +1,14 @@
 package:
   name: eudev
   version: 3.2.14
-  epoch: 5
+  epoch: 40
   description: init system agnostic fork of systemd-udev
   copyright:
     - license: GPL-2.0-only
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -37,7 +41,8 @@ pipeline:
         --sysconfdir=/etc \
         --enable-split-usr \
         --enable-manpages \
-        --enable-kmod
+        --enable-kmod \
+        --sbindir=/usr/bin
 
   - uses: autoconf/make
 
@@ -59,6 +64,8 @@ subpackages:
       runtime:
         - eudev
         - eudev-libs
+        - merged-usrsbin
+        - wolfi-baselayout
     description: eudev dev
     test:
       pipeline:
@@ -71,10 +78,17 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: eudev-libs
     dependencies:
       provider-priority: 5
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/usr/lib
@@ -91,11 +105,18 @@ subpackages:
           mv ${{targets.destdir}}/usr/lib/udev/rules.d/80-net-name-slot.rules \
            ${{targets.subpkgdir}}/usr/lib/udev/rules.d/
     description: udev rules for systemd-style interface names
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: eudev-hwids
     dependencies:
       provides:
         - hwids-udev=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/etc/udev/hwdb.d

pcsc-lite.yaml

@@ -1,13 +1,17 @@
 package:
   name: pcsc-lite
   version: "2.3.2"
-  epoch: 0
+  epoch: 40
   description: Middleware to access a smart card using SCard API (PC/SC)
   copyright:
     - license: GPL-3.0-or-later
     - license: MIT
     - license: BSD-3-Clause
     - license: ISC
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -34,6 +38,7 @@ pipeline:
     with:
       opts: |
         -Dpolkit=false \
+        -Dsbindir=/usr/bin \
         -Dlibsystemd=false \
 
   - uses: meson/compile
@@ -45,7 +50,9 @@ subpackages:
     description: "PC/SC Architecture smartcard middleware (development files)"
     dependencies:
       runtime:
+        - merged-usrsbin
         - pcsc-lite
+        - wolfi-baselayout
     pipeline:
       - uses: split/dev
     test:

wolfi-baselayout.yaml

@@ -1,7 +1,7 @@
 package:
   name: wolfi-baselayout
   version: 20230201
-  epoch: 19
+  epoch: 20
   description: "baselayout data for Wolfi"
   copyright:
     - license: MIT
@@ -11,7 +11,7 @@ package:
     provides:
       - merged-sbin
       - merged-bin
-      #- merged-usrsbin
+      - merged-usrsbin
       #- merged-lib
 
 environment:
@@ -50,13 +50,13 @@ pipeline:
       # split-usr
       # mkdir -p ${{targets.destdir}}/sbin
       # mkdir -p ${{targets.destdir}}/bin
-      mkdir -p ${{targets.destdir}}/usr/sbin
+      # mkdir -p ${{targets.destdir}}/usr/sbin
       mkdir -p ${{targets.destdir}}/lib
 
       # usr-merge
       ln -s usr/bin ${{targets.destdir}}/sbin
       ln -s usr/bin ${{targets.destdir}}/bin
-      # ln -s bin ${{targets.destdir}}/usr/sbin
+      ln -s bin ${{targets.destdir}}/usr/sbin
       # ln -s usr/lib ${{targets.destdir}}/usr/lib
 
       for i in lib64 usr/lib64 usr/local/lib64; do