baselayout: /usr merge /bin and /sbin paths

**Summary**
- Symlink {/bin,/sbin} to {/usr/bin,/usr/sbin}
- Any existing binaries in /bin or /sbin will be seemlessly moved over.

**Packager's Notes**
- Note that /lib(64) will be merged to /usr in a follow up PR to
  complete the /usr merge transition.

Part of #293.

packages/b/baselayout/package.yml

@@ -1,6 +1,6 @@
 name       : baselayout
 version    : 1.9.0
-release    : 76
+release    : 77
 source     :
     - https://github.com/getsolus/baselayout/releases/download/v1.9.0/baselayout-1.9.0.tar.gz : a2a3e4fdb6349b479a16d9ffcf2335fb0f4d75d2cdd1cdbb80cb6c02652f37de
 homepage   : https://github.com/getsolus/baselayout
@@ -15,6 +15,8 @@ install    : |
     install -dm00755 %installroot%/usr
     install -dm00755 %installroot%/lib64
     install -dm00755 %installroot%/usr/lib64
+    install -dm00755 %installroot%/usr/bin
+    install -dm00755 %installroot%/usr/sbin
     install -dm00755 %installroot%/etc
     install -dm00755 %installroot%/boot
     install -dm00755 %installroot%/dev
@@ -38,6 +40,10 @@ install    : |
 
     ln -sv /proc/self/mounts %installroot%/etc/mtab
 
+    # /usr merge
+    ln -srv %installroot%/usr/bin %installroot%/bin
+    ln -srv %installroot%/usr/sbin %installroot%/sbin
+
     # Install our files
     cp -a $workdir/* $installdir/
     chmod 00600 $installdir/usr/share/baselayout/shadow
@@ -58,7 +64,9 @@ install    : |
 # Mark as permanent so eopkg doesn't nuke it.
 permanent  :
     - /usr
+    - /usr/bin
     - /usr/lib*
+    - /usr/sbin
     - /tmp
     - /etc
     - /dev/

packages/b/baselayout/pspec_x86_64.xml

@@ -20,6 +20,7 @@
 </Description>
         <PartOf>system.base</PartOf>
         <Files>
+            <Path fileType="executable">/bin</Path>
             <Path fileType="data">/boot</Path>
             <Path fileType="data">/dev</Path>
             <Path fileType="config">/etc/filesystems</Path>
@@ -41,11 +42,14 @@
             <Path fileType="data">/proc</Path>
             <Path fileType="data">/root</Path>
             <Path fileType="data">/run/lock</Path>
+            <Path fileType="executable">/sbin</Path>
             <Path fileType="data">/sys</Path>
             <Path fileType="data">/tmp</Path>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="library">/usr/lib64/os-release</Path>
             <Path fileType="library">/usr/lib64/tmpfiles.d/etc-nsswitch-conf.conf</Path>
+            <Path fileType="executable">/usr/sbin</Path>
             <Path fileType="data">/usr/share/baselayout/fstab</Path>
             <Path fileType="data">/usr/share/baselayout/group</Path>
             <Path fileType="data">/usr/share/baselayout/group-</Path>
@@ -66,8 +70,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="76">
-            <Date>2024-04-08</Date>
+        <Update release="77">
+            <Date>2024-04-29</Date>
             <Version>1.9.0</Version>
             <Comment>Packaging update</Comment>
             <Name>Joey Riches</Name>