Clarify transitional FreeBSD base package boundary

modules/fruix/packages/freebsd.scm

@@ -28,6 +28,12 @@
             freebsd-zlib
             freebsd-sh
             freebsd-bash
+            freebsd-host-staged-package?
+            %freebsd-host-staged-all-packages
+            %freebsd-host-staged-core-packages
+            %freebsd-host-staged-development-profile-packages
+            %freebsd-host-staged-system-packages
+            %freebsd-host-staged-replacement-order
             %freebsd-core-packages
             %freebsd-development-profile-packages
             %freebsd-system-packages))
@@ -455,7 +461,12 @@ library for profile experiments."
    #:install-plan
    '((file "/lib/libz.so.6" "lib/libz.so.6"))))
 
-(define %freebsd-core-packages
+;; Transitional boundary: the FreeBSD base layer below is still staged by
+;; copying selected artifacts from the builder host.  Plan 3 keeps these
+;; package sets explicit so they can be replaced incrementally by native
+;; FreeBSD world/kernel build outputs in /frx/store.
+
+(define %freebsd-host-staged-core-packages
   (list freebsd-kernel
         freebsd-kernel-headers
         freebsd-libc
@@ -468,7 +479,7 @@ library for profile experiments."
         freebsd-sh
         freebsd-bash))
 
-(define %freebsd-development-profile-packages
+(define %freebsd-host-staged-development-profile-packages
   (list freebsd-kernel
         freebsd-kernel-headers
         freebsd-libc
@@ -481,7 +492,7 @@ library for profile experiments."
         freebsd-sh
         freebsd-bash))
 
-(define %freebsd-system-packages
+(define %freebsd-host-staged-system-packages
   (list freebsd-kernel
         freebsd-bootloader
         freebsd-libc
@@ -492,3 +503,26 @@ library for profile experiments."
         freebsd-userland
         freebsd-sh
         freebsd-bash))
+
+(define %freebsd-host-staged-all-packages
+  (delete-duplicates
+   (append %freebsd-host-staged-core-packages
+           %freebsd-host-staged-development-profile-packages
+           %freebsd-host-staged-system-packages)))
+
+(define (freebsd-host-staged-package? package)
+  (any (lambda (candidate)
+         (string=? (freebsd-package-name candidate)
+                   (freebsd-package-name package)))
+       %freebsd-host-staged-all-packages))
+
+(define %freebsd-host-staged-replacement-order
+  '((first-wave . (freebsd-kernel freebsd-bootloader))
+    (second-wave . (freebsd-runtime freebsd-libc freebsd-userland freebsd-rc-scripts))
+    (third-wave . (freebsd-networking freebsd-openssh))
+    (fourth-wave . (freebsd-kernel-headers freebsd-clang-toolchain))
+    (fifth-wave . (freebsd-gmake freebsd-autotools freebsd-openssl freebsd-zlib freebsd-sh freebsd-bash))))
+
+(define %freebsd-core-packages %freebsd-host-staged-core-packages)
+(define %freebsd-development-profile-packages %freebsd-host-staged-development-profile-packages)
+(define %freebsd-system-packages %freebsd-host-staged-system-packages)

modules/fruix/system/freebsd.scm

@@ -1105,6 +1105,7 @@
                    (host-base-stores . ,host-base-stores)
                    (fruix-runtime-store-count . ,(length fruix-runtime-stores))
                    (fruix-runtime-stores . ,fruix-runtime-stores)
+                   (host-base-replacement-order . ,%freebsd-host-staged-replacement-order)
                    (init-mode . ,(operating-system-init-mode os)))))))
          (generated-files (append (operating-system-generated-files os
                                                                     #:guile-store guile-store