From 40b656fe4b13504ae1d281e8e98f1f47869683c4 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 15 Dec 2015 12:24:19 -0800
Subject: [PATCH] Move to wheezy.

---
 builds/any/rootfs/standard/standard.yml       | 96 -------------------
 .../{ => wheezy}/common/amd64-packages.yml    |  0
 .../{ => wheezy}/common/common-packages.yml   |  0
 .../{ => wheezy}/common/overlay/etc/adjtime   |  0
 .../common/overlay/etc/filesystems            |  0
 .../common/overlay/etc/inetd.conf             |  0
 .../common/overlay/etc/init.d/initdev         |  0
 .../etc/profile.d/onl-platform-current.sh     |  0
 .../{ => wheezy}/common/overlay/etc/rssh.conf |  0
 .../overlay/etc/udev/rules.d/60-block.rules   |  0
 .../overlay/etc/udev/rules.d/60-net.rules     |  0
 .../common/overlay/sbin/initblockdev          |  0
 .../{ => wheezy}/common/overlay/sbin/pgetty   |  0
 .../{ => wheezy}/common/overlay/sbin/watchdir |  0
 .../{ => wheezy}/common/powerpc-packages.yml  |  0
 15 files changed, 96 deletions(-)
 delete mode 100644 builds/any/rootfs/standard/standard.yml
 rename builds/any/rootfs/{ => wheezy}/common/amd64-packages.yml (100%)
 rename builds/any/rootfs/{ => wheezy}/common/common-packages.yml (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/adjtime (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/filesystems (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/inetd.conf (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/init.d/initdev (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/profile.d/onl-platform-current.sh (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/rssh.conf (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/udev/rules.d/60-block.rules (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/etc/udev/rules.d/60-net.rules (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/sbin/initblockdev (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/sbin/pgetty (100%)
 rename builds/any/rootfs/{ => wheezy}/common/overlay/sbin/watchdir (100%)
 rename builds/any/rootfs/{ => wheezy}/common/powerpc-packages.yml (100%)

diff --git a/builds/any/rootfs/standard/standard.yml b/builds/any/rootfs/standard/standard.yml
deleted file mode 100644
index 9b99f2ce..00000000
--- a/builds/any/rootfs/standard/standard.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-############################################################
-#
-# Standard ONL Root Filesystem Configuration.
-#
-# Requires:
-#     ARCH, PLATFORM_LIST
-#
-#
-############################################################
-Packages: &Packages
-  - !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:
-  General:
-    arch: ${ARCH}
-    cleanup: true
-    noauth: true
-    explicitsuite: false
-    unpack: true
-    debootstrap: Debian-Local Local-All Local-Arch ONL
-    aptsources: Debian ONL
-
-  Debian:
-    packages: *Packages
-    source: http://${DEBIAN_MIRROR}
-    suite: ${DEBIAN_SUITE}
-    keyring: debian-archive-keyring
-    omitdebsrc: true
-
-  Debian-Local:
-    packages: *Packages
-    source: http://${APT_CACHE}${DEBIAN_MIRROR}
-    suite: ${DEBIAN_SUITE}
-    keyring: debian-archive-keyring
-    omitdebsrc: true
-
-  ONL:
-    packages: *Packages
-    source: http://apt.opennetlinux.org/debian
-    suite: unstable
-    omitdebsrc: true
-
-  Local-All:
-    source: ${ONL}/REPO/${DEBIAN_SUITE}/packages/all
-    omitdebsrc: true
-
-  Local-Arch:
-    source: ${ONL}/REPO/${DEBIAN_SUITE}/packages/${ARCH}
-    omitdebsrc: true
-
-Configure:
-  overlays:
-    - ${ONL}/builds/any/rootfs/common/overlay
-
-  update-rc.d:
-    - 'initdev defaults'
-    - 'onl-platform-baseconf defaults'
-    - 'faultd defaults'
-    - 'snmpd remove'
-    - 'ssh defaults'
-    - 'openbsd-inetd remove'
-    - 'ntp remove'
-    - 'nfs-common remove'
-    - 'rpcbind remove'
-    - 'motd remove'
-    - 'kexec remove'
-    - 'kexec-load remove'
-    - 'mountall-bootclean.sh remove'
-    - 'mountall.sh remove'
-    - 'checkfs.sh remove'
-    - 'mtab.sh remove'
-    - 'checkroot-bootclean.sh remove'
-    - 'checkroot.sh remove'
-    - 'mountnfs-bootclean.sh remove'
-    - 'mountnfs.sh remove'
-    - 'lm-sensors remove'
-    - 'netplug defaults'
-    - 'watchdog defaults'
-    - 'wd_keepalive remove'
-
-  options:
-    clean: True
-    securetty: False
-    ttys: False
-    console: True
-
-  users:
-    root:
-      password: onl
-
-  manifest:
-    version: $ONL/make/version-onl.json
-    platforms: $PLATFORM_LIST
-
diff --git a/builds/any/rootfs/common/amd64-packages.yml b/builds/any/rootfs/wheezy/common/amd64-packages.yml
similarity index 100%
rename from builds/any/rootfs/common/amd64-packages.yml
rename to builds/any/rootfs/wheezy/common/amd64-packages.yml
diff --git a/builds/any/rootfs/common/common-packages.yml b/builds/any/rootfs/wheezy/common/common-packages.yml
similarity index 100%
rename from builds/any/rootfs/common/common-packages.yml
rename to builds/any/rootfs/wheezy/common/common-packages.yml
diff --git a/builds/any/rootfs/common/overlay/etc/adjtime b/builds/any/rootfs/wheezy/common/overlay/etc/adjtime
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/adjtime
rename to builds/any/rootfs/wheezy/common/overlay/etc/adjtime
diff --git a/builds/any/rootfs/common/overlay/etc/filesystems b/builds/any/rootfs/wheezy/common/overlay/etc/filesystems
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/filesystems
rename to builds/any/rootfs/wheezy/common/overlay/etc/filesystems
diff --git a/builds/any/rootfs/common/overlay/etc/inetd.conf b/builds/any/rootfs/wheezy/common/overlay/etc/inetd.conf
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/inetd.conf
rename to builds/any/rootfs/wheezy/common/overlay/etc/inetd.conf
diff --git a/builds/any/rootfs/common/overlay/etc/init.d/initdev b/builds/any/rootfs/wheezy/common/overlay/etc/init.d/initdev
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/init.d/initdev
rename to builds/any/rootfs/wheezy/common/overlay/etc/init.d/initdev
diff --git a/builds/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh b/builds/any/rootfs/wheezy/common/overlay/etc/profile.d/onl-platform-current.sh
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/profile.d/onl-platform-current.sh
rename to builds/any/rootfs/wheezy/common/overlay/etc/profile.d/onl-platform-current.sh
diff --git a/builds/any/rootfs/common/overlay/etc/rssh.conf b/builds/any/rootfs/wheezy/common/overlay/etc/rssh.conf
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/rssh.conf
rename to builds/any/rootfs/wheezy/common/overlay/etc/rssh.conf
diff --git a/builds/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules b/builds/any/rootfs/wheezy/common/overlay/etc/udev/rules.d/60-block.rules
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/udev/rules.d/60-block.rules
rename to builds/any/rootfs/wheezy/common/overlay/etc/udev/rules.d/60-block.rules
diff --git a/builds/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules b/builds/any/rootfs/wheezy/common/overlay/etc/udev/rules.d/60-net.rules
similarity index 100%
rename from builds/any/rootfs/common/overlay/etc/udev/rules.d/60-net.rules
rename to builds/any/rootfs/wheezy/common/overlay/etc/udev/rules.d/60-net.rules
diff --git a/builds/any/rootfs/common/overlay/sbin/initblockdev b/builds/any/rootfs/wheezy/common/overlay/sbin/initblockdev
similarity index 100%
rename from builds/any/rootfs/common/overlay/sbin/initblockdev
rename to builds/any/rootfs/wheezy/common/overlay/sbin/initblockdev
diff --git a/builds/any/rootfs/common/overlay/sbin/pgetty b/builds/any/rootfs/wheezy/common/overlay/sbin/pgetty
similarity index 100%
rename from builds/any/rootfs/common/overlay/sbin/pgetty
rename to builds/any/rootfs/wheezy/common/overlay/sbin/pgetty
diff --git a/builds/any/rootfs/common/overlay/sbin/watchdir b/builds/any/rootfs/wheezy/common/overlay/sbin/watchdir
similarity index 100%
rename from builds/any/rootfs/common/overlay/sbin/watchdir
rename to builds/any/rootfs/wheezy/common/overlay/sbin/watchdir
diff --git a/builds/any/rootfs/common/powerpc-packages.yml b/builds/any/rootfs/wheezy/common/powerpc-packages.yml
similarity index 100%
rename from builds/any/rootfs/common/powerpc-packages.yml
rename to builds/any/rootfs/wheezy/common/powerpc-packages.yml