From 2aee55b496347e25f6dcdd59ec8599028d7673e6 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 1 Dec 2015 18:48:57 +0000
Subject: [PATCH] Finalize move of rootfs and swi packages to /builds

---
 builds/amd64/Makefile                                       | 1 +
 builds/amd64/rootfs/builds/Makefile                         | 2 +-
 .../base => builds}/any/rootfs/common/amd64-packages.yml    | 0
 .../base => builds}/any/rootfs/common/common-packages.yml   | 0
 .../base => builds}/any/rootfs/common/overlay/etc/adjtime   | 0
 .../any/rootfs/common/overlay/etc/filesystems               | 0
 .../any/rootfs/common/overlay/etc/inetd.conf                | 0
 .../any/rootfs/common/overlay/etc/init.d/initdev            | 0
 .../common/overlay/etc/profile.d/onl-platform-current.sh    | 0
 .../base => builds}/any/rootfs/common/overlay/etc/rssh.conf | 0
 .../rootfs/common/overlay/etc/udev/rules.d/60-block.rules   | 0
 .../any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules | 0
 .../any/rootfs/common/overlay/sbin/initblockdev             | 0
 .../base => builds}/any/rootfs/common/overlay/sbin/pgetty   | 0
 .../base => builds}/any/rootfs/common/overlay/sbin/watchdir | 0
 .../base => builds}/any/rootfs/common/powerpc-packages.yml  | 0
 {packages/base => builds}/any/rootfs/standard/standard.yml  | 6 +++---
 builds/powerpc/Makefile                                     | 1 +
 builds/powerpc/rootfs/builds/Makefile                       | 2 +-
 19 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 builds/amd64/Makefile
 rename {packages/base => builds}/any/rootfs/common/amd64-packages.yml (100%)
 rename {packages/base => builds}/any/rootfs/common/common-packages.yml (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/adjtime (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/filesystems (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/inetd.conf (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/init.d/initdev (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/rssh.conf (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/sbin/initblockdev (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/sbin/pgetty (100%)
 rename {packages/base => builds}/any/rootfs/common/overlay/sbin/watchdir (100%)
 rename {packages/base => builds}/any/rootfs/common/powerpc-packages.yml (100%)
 rename {packages/base => builds}/any/rootfs/standard/standard.yml (89%)
 create mode 100644 builds/powerpc/Makefile

diff --git a/builds/amd64/Makefile b/builds/amd64/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/amd64/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/amd64/rootfs/builds/Makefile b/builds/amd64/rootfs/builds/Makefile
index aa896dda..c4dbc057 100644
--- 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
diff --git a/packages/base/any/rootfs/common/amd64-packages.yml b/builds/any/rootfs/common/amd64-packages.yml
similarity index 100%
rename from packages/base/any/rootfs/common/amd64-packages.yml
rename to builds/any/rootfs/common/amd64-packages.yml
diff --git a/packages/base/any/rootfs/common/common-packages.yml b/builds/any/rootfs/common/common-packages.yml
similarity index 100%
rename from packages/base/any/rootfs/common/common-packages.yml
rename to builds/any/rootfs/common/common-packages.yml
diff --git a/packages/base/any/rootfs/common/overlay/etc/adjtime b/builds/any/rootfs/common/overlay/etc/adjtime
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/adjtime
rename to builds/any/rootfs/common/overlay/etc/adjtime
diff --git a/packages/base/any/rootfs/common/overlay/etc/filesystems b/builds/any/rootfs/common/overlay/etc/filesystems
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/filesystems
rename to builds/any/rootfs/common/overlay/etc/filesystems
diff --git a/packages/base/any/rootfs/common/overlay/etc/inetd.conf b/builds/any/rootfs/common/overlay/etc/inetd.conf
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/inetd.conf
rename to builds/any/rootfs/common/overlay/etc/inetd.conf
diff --git a/packages/base/any/rootfs/common/overlay/etc/init.d/initdev b/builds/any/rootfs/common/overlay/etc/init.d/initdev
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/init.d/initdev
rename to builds/any/rootfs/common/overlay/etc/init.d/initdev
diff --git a/packages/base/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh b/builds/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh
rename to builds/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh
diff --git a/packages/base/any/rootfs/common/overlay/etc/rssh.conf b/builds/any/rootfs/common/overlay/etc/rssh.conf
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/rssh.conf
rename to builds/any/rootfs/common/overlay/etc/rssh.conf
diff --git a/packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules b/builds/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules
rename to builds/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules
diff --git a/packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules b/builds/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules
rename to builds/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules
diff --git a/packages/base/any/rootfs/common/overlay/sbin/initblockdev b/builds/any/rootfs/common/overlay/sbin/initblockdev
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/sbin/initblockdev
rename to builds/any/rootfs/common/overlay/sbin/initblockdev
diff --git a/packages/base/any/rootfs/common/overlay/sbin/pgetty b/builds/any/rootfs/common/overlay/sbin/pgetty
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/sbin/pgetty
rename to builds/any/rootfs/common/overlay/sbin/pgetty
diff --git a/packages/base/any/rootfs/common/overlay/sbin/watchdir b/builds/any/rootfs/common/overlay/sbin/watchdir
similarity index 100%
rename from packages/base/any/rootfs/common/overlay/sbin/watchdir
rename to builds/any/rootfs/common/overlay/sbin/watchdir
diff --git a/packages/base/any/rootfs/common/powerpc-packages.yml b/builds/any/rootfs/common/powerpc-packages.yml
similarity index 100%
rename from packages/base/any/rootfs/common/powerpc-packages.yml
rename to builds/any/rootfs/common/powerpc-packages.yml
diff --git a/packages/base/any/rootfs/standard/standard.yml b/builds/any/rootfs/standard/standard.yml
similarity index 89%
rename from packages/base/any/rootfs/standard/standard.yml
rename to builds/any/rootfs/standard/standard.yml
index d8e550b8..a8f185c7 100644
--- a/packages/base/any/rootfs/standard/standard.yml
+++ b/builds/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'
diff --git a/builds/powerpc/Makefile b/builds/powerpc/Makefile
new file mode 100644
index 00000000..003238cf
--- /dev/null
+++ b/builds/powerpc/Makefile
@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk
\ No newline at end of file
diff --git a/builds/powerpc/rootfs/builds/Makefile b/builds/powerpc/rootfs/builds/Makefile
index 77e9b471..db5e6ad8 100644
--- 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