Finalize move of rootfs and swi packages to /builds

2025-12-25 01:07:01 +00:00 · 2015-12-01 18:48:57 +00:00
parent 86c261dd80
commit 2aee55b496
19 changed files with 7 additions and 5 deletions
--- a/builds/amd64/Makefile
+++ b/builds/amd64/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
--- a/builds/amd64/rootfs/builds/Makefile
+++ b/builds/amd64/rootfs/builds/Makefile
@@ -6,7 +6,7 @@ include $(ONL)/make/config.amd64.mk
 #
 export PLATFORM_LIST=$(shell onlpm --list-platforms --arch amd64 --csv )

-RFS_CONFIG := $(ONL)/packages/base/any/rootfs/standard/standard.yml
+RFS_CONFIG := $(ONL)/builds/any/rootfs/standard/standard.yml
 RFS_DIR := rootfs-amd64.d
 RFS_CPIO := rootfs-amd64.cpio.gz
 RFS_SQUASH := rootfs-amd64.sqsh
--- a/packages/base/any/rootfs/common/amd64-packages.yml
+++ b/packages/base/any/rootfs/common/amd64-packages.yml
--- a/packages/base/any/rootfs/common/common-packages.yml
+++ b/packages/base/any/rootfs/common/common-packages.yml
--- a/packages/base/any/rootfs/common/overlay/etc/adjtime
+++ b/packages/base/any/rootfs/common/overlay/etc/adjtime
--- a/packages/base/any/rootfs/common/overlay/etc/filesystems
+++ b/packages/base/any/rootfs/common/overlay/etc/filesystems
--- a/packages/base/any/rootfs/common/overlay/etc/inetd.conf
+++ b/packages/base/any/rootfs/common/overlay/etc/inetd.conf
--- a/packages/base/any/rootfs/common/overlay/etc/init.d/initdev
+++ b/packages/base/any/rootfs/common/overlay/etc/init.d/initdev
--- a/packages/base/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh
+++ b/packages/base/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh
--- a/packages/base/any/rootfs/common/overlay/etc/rssh.conf
+++ b/packages/base/any/rootfs/common/overlay/etc/rssh.conf
--- a/packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules
+++ b/packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules
--- a/packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules
+++ b/packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules
--- a/packages/base/any/rootfs/common/overlay/sbin/initblockdev
+++ b/packages/base/any/rootfs/common/overlay/sbin/initblockdev
--- a/packages/base/any/rootfs/common/overlay/sbin/pgetty
+++ b/packages/base/any/rootfs/common/overlay/sbin/pgetty
--- a/packages/base/any/rootfs/common/overlay/sbin/watchdir
+++ b/packages/base/any/rootfs/common/overlay/sbin/watchdir
--- a/packages/base/any/rootfs/common/powerpc-packages.yml
+++ b/packages/base/any/rootfs/common/powerpc-packages.yml
--- a/packages/base/any/rootfs/standard/standard.yml
+++ b/packages/base/any/rootfs/standard/standard.yml
@@ -8,8 +8,8 @@
 #
 ############################################################
 Packages: &Packages
-  - !include $ONL/packages/base/any/rootfs/common/common-packages.yml
-  - !include $ONL/packages/base/any/rootfs/common/${ARCH}-packages.yml
+  - !include $ONL/builds/any/rootfs/common/common-packages.yml
+  - !include $ONL/builds/any/rootfs/common/${ARCH}-packages.yml
  - !script  $ONL/tools/onl-platform-pkgs.py ${PLATFORM_LIST}

 Multistrap:
@@ -39,7 +39,7 @@ Multistrap:

 Configure:
  overlays:
-    - ${ONL}/packages/base/any/rootfs/common/overlay
+    - ${ONL}/builds/any/rootfs/common/overlay

  update-rc.d:
    - 'initdev defaults'
--- a/builds/powerpc/Makefile
+++ b/builds/powerpc/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
--- a/builds/powerpc/rootfs/builds/Makefile
+++ b/builds/powerpc/rootfs/builds/Makefile
@@ -6,7 +6,7 @@ include $(ONL)/make/config.powerpc.mk
 #
 export PLATFORM_LIST=$(shell onlpm --list-platforms --arch powerpc --csv )

-RFS_CONFIG := $(ONL)/packages/base/any/rootfs/standard/standard.yml
+RFS_CONFIG := $(ONL)/builds/any/rootfs/standard/standard.yml
 RFS_DIR := rootfs-powerpc.d
 RFS_CPIO := rootfs-powerpc.cpio.gz
 RFS_SQUASH := rootfs-powerpc.sqsh