Merge pull request #3 from opencomputeproject/master

merge from OCP/ONL to my local forked branch

.gitignore

@@ -10,8 +10,7 @@ dependmodules.x
 
 # Package cache and lock files
 .lock
-.PKGs.cache
-.PKGs.cache.lock
+.PKGs.cache*
 
 # Local module manifest.
 .manifest.mk

Makefile

@@ -1,4 +1,4 @@
-############################################################
+###########################################################
 #
 # Work in progress.
 #
@@ -12,7 +12,7 @@ endif
 
 include $(ONL)/make/config.mk
 
-all: amd64 ppc
+all: amd64 ppc arm
 	$(MAKE) -C REPO build-clean
 
 onl-amd64 onl-x86 x86 x86_64 amd64: packages_base_all
@@ -36,6 +36,30 @@ onl-ppc ppc: packages_base_all
 	$(MAKE) -C builds/powerpc/swi
 	$(MAKE) -C builds/powerpc/installer/legacy
 
+
+ifdef ONL_DEBIAN_SUITE_jessie
+
+arm_toolchain_check:
+	@which arm-linux-gnueabi-gcc || (/bin/echo -e "*\n* ERROR\n*\n* This container does not support building for the ARM architecture.\n* Please use opennetworklinux/onlbuilder8:1.2 later.\n*" && exit 1)
+
+onl-arm arm: arm_toolchain_check packages_base_all
+	$(MAKE) -C packages/base/armel/kernels
+	$(MAKE) -C packages/base/armel/initrds
+	$(MAKE) -C packages/base/armel/onlp
+	$(MAKE) -C packages/base/armel/onlp-snmpd
+	$(MAKE) -C packages/base/armel/faultd
+	$(MAKE) -C packages/base/armel/fit
+	$(MAKE) -C builds/armel/rootfs
+	$(MAKE) -C builds/armel/swi
+	$(MAKE) -C builds/armel/installer/legacy
+else
+
+onl-arm arm:
+	@/bin/echo -e "*\n* Warning\n*\n* ARM Architecture support is only available in Jessie builds. Please use onbuilder -8.\n*"
+
+endif
+
+
 packages_base_all:
 	$(MAKE) -C packages/base/all
 
@@ -66,3 +90,5 @@ docker-debug: docker_check
 versions:
 	$(ONL)/tools/make-versions.py --import-file=$(ONL)/tools/onlvi --class-name=OnlVersionImplementation --output-dir $(ONL)/make --force
 
+relclean:
+	@find $(ONL)/RELEASE -name "ONL-*" -delete

REPO/jessie/packages/armel/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/repo.mk

builds/any/installer/legacy/fit/builds/Makefile

@@ -0,0 +1,43 @@
+ifndef ARCH
+$(error $$ARCH not set)
+endif
+
+THISDIR := $(dir $(lastword $(MAKEFILE_LIST)))
+
+# Hardcoded to match ONL File naming conventions.
+include $(ONL)/make/version-onl.mk
+INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
+
+FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb)
+
+# Fixme -- should come from the FIT manifest, not the initrd manifest
+PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:$(ARCH))
+
+MKSHAR = $(ONL)/tools/mkshar
+MKSHAR_OPTS = --lazy --unzip-pad
+MKSHAR_PERMS = autoperms.sh
+
+__installer:
+	$(ONL_V_at)rm -rf *INSTALLER* *.md5sum
+	$(ONL_V_at)cp $(FIT_IMAGE_ALL) .
+	$(foreach p,$(PLATFORMS), $(ONLPM) --extract-dir onl-platform-config-$(p):$(ARCH) .;)
+	# Fixme
+ifndef NO_SWI
+	$(ONLPM) --extract-dir onl-swi:$(ARCH) .
+	mv ./usr/share/onl/packages/$(ARCH)/onl-swi/*.swi .
+endif
+	rm -rf ./usr
+	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
+	$(ONL_V_at) cp $(ONL)/make/version-onl.sh .
+	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
+	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
+	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
+	$(ONL_V_at)sed s/@@IARCH@@/$(ARCH)/g $(THISDIR)/fit-installer.sh > fit-installer.sh
+	$(ONL_V_at)sed s/@@IARCH@@/$(ARCH)/g $(THISDIR)/fit-install-lib > fit-install-lib
+	$(ONL_V_at)cp $(THISDIR)/boot-config .
+	$(MKSHAR) $(MKSHAR_OPTS) "$(INSTALLER_NAME)" $(ONL)/tools/scripts/sfx.sh.in fit-installer.sh fit-install-lib *.itb lib *.swi version-onl.sh boot-config
+	$(ONL_V_at)rm -rf ./lib *.swi version-onl.sh autoperms.sh *.itb
+	md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
+
+
+shar installer: __installer

builds/any/installer/legacy/fit/builds/fit-installer.sh

@@ -1,6 +1,19 @@
 #!/bin/sh
 
-IARCH="ppc"
+IARCH=@@IARCH@@
+
+# Convert build architecture to local architecture
+case $IARCH in
+    powerpc)
+        IARCH=ppc
+        ;;
+    armel)
+        IARCH=armv7l
+        ;;
+    *)
+        ;;
+esac
+
 ARCH=`uname -m`
 if [ "$ARCH" != "$IARCH" ]; then
     echo
@@ -69,7 +82,7 @@ fi
 
 installer_say "Detected platform: ${installer_platform}"
 
-. "${installer_dir}/ppc-install-lib"
+. "${installer_dir}/fit-install-lib"
 
 # Look for the platform installer directory.
 installer_platform_dir="${installer_dir}/lib/platform-config/${installer_platform}"

builds/any/rootfs/jessie/common/armel-packages.yml

@@ -0,0 +1,2 @@
+- u-boot-tools
+- onl-loader-fit

builds/armel/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

builds/armel/installer/legacy/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

builds/armel/installer/legacy/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/builds/any/installer/legacy/APKG.yml ARCH=armel

builds/armel/installer/legacy/builds/.gitignore

@@ -0,0 +1,3 @@
+*INSTALLER
+fit-install*
+boot-config

builds/armel/installer/legacy/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/builds/any/installer/legacy/fit/builds/Makefile

builds/armel/rootfs/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

builds/armel/rootfs/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/builds/any/rootfs/APKG.yml ARCH=armel

builds/armel/rootfs/builds/.gitignore

@@ -0,0 +1,2 @@
+*.d/
+manifest.json

builds/armel/rootfs/builds/Makefile

@@ -0,0 +1,14 @@
+include $(ONL)/make/config.armel.mk
+
+#
+# Default to include all available powerpc platforms.
+# You override this with you own list or yaml file.
+#
+export PLATFORM_LIST=$(shell onlpm --list-platforms --arch armel --csv )
+
+RFS_CONFIG := $(ONL)/builds/any/rootfs/$(ONL_DEBIAN_SUITE)/standard/standard.yml
+RFS_DIR := rootfs-armel.d
+RFS_CPIO := rootfs-armel.cpio.gz
+RFS_SQUASH := rootfs-armel.sqsh
+
+include $(ONL)/make/rfs.mk

builds/armel/swi/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

builds/armel/swi/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/builds/any/swi/APKG.yml ARCH=armel

builds/armel/swi/builds/.gitignore

@@ -0,0 +1 @@
+manifest.json

builds/armel/swi/builds/Makefile

@@ -0,0 +1,3 @@
+ROOTFS_PACKAGE := onl-rootfs
+include $(ONL)/make/config.armel.mk
+include $(ONL)/make/swi.mk

builds/powerpc/installer/legacy/builds/.gitignore

@@ -1 +1,3 @@
 *INSTALLER
+fit-install*
+boot-config

builds/powerpc/installer/legacy/builds/Makefile

@@ -1,37 +1,2 @@
 include $(ONL)/make/config.powerpc.mk
-
-# Hardcoded to match ONL File naming conventions.
-include $(ONL)/make/version-onl.mk
-INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER
-
-FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:powerpc onl-loader-fit.itb)
-
-# Fixme -- should come from the FIT manifest, not the initrd manifest
-PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:powerpc)
-
-MKSHAR = $(ONL)/tools/mkshar
-MKSHAR_OPTS = --lazy --unzip-pad
-MKSHAR_PERMS = autoperms.sh
-
-__installer:
-	$(ONL_V_at)rm -rf *INSTALLER* *.md5sum
-	$(ONL_V_at)cp $(FIT_IMAGE_ALL) .
-	$(foreach p,$(PLATFORMS), $(ONLPM) --extract-dir onl-platform-config-$(p):powerpc .;)
-	# Fixme
-ifndef NO_SWI
-	$(ONLPM) --extract-dir onl-swi:powerpc .
-	mv ./usr/share/onl/packages/powerpc/onl-swi/*.swi .
-endif
-	rm -rf ./usr
-	$(ONL_V_at)cp /dev/null $(MKSHAR_PERMS)
-	$(ONL_V_at) cp $(ONL)/make/version-onl.sh .
-	$(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS)
-	$(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS)
-	$(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS)
-	$(MKSHAR) $(MKSHAR_OPTS) "$(INSTALLER_NAME)" $(ONL)/tools/scripts/sfx.sh.in ppc-installer.sh ppc-install-lib *.itb lib *.swi version-onl.sh boot-config
-	$(ONL_V_at)rm -rf ./lib *.swi version-onl.sh autoperms.sh *.itb
-	md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"
-
-
-shar installer: __installer
-
+include $(ONL)/builds/any/installer/legacy/fit/builds/Makefile

docker/images/builder8/1.2/Dockerfile

@@ -0,0 +1,16 @@
+FROM opennetworklinux/builder8:1.1
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN dpkg --add-architecture armel
+
+RUN apt-get update && apt-get install -y \
+    crossbuild-essential-armel \
+    gcc-arm-linux-gnueabi
+
+RUN xapt -a armel libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
+
+#
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id

docker/images/builder8/1.2/Makefile

@@ -0,0 +1,19 @@
+VERSION=1.2
+USER=opennetworklinux
+REPO=builder8
+
+TOOLS=../../../tools/docker_shell ../../../tools/container-id
+
+build: check_version
+	cp $(TOOLS) .
+	docker build -t $(USER)/$(REPO):$(VERSION) .
+	rm -rf $(notdir $(TOOLS))
+
+#
+# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
+# when a new image is built but the VERSION variable is not updated.
+#
+check_version:
+
+push:
+	docker push $(USER)/$(REPO):$(VERSION)

docker/tools/onlbuilder

@@ -18,7 +18,7 @@ g_current_uid  = os.getuid()
 g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
 
 g_builder7_image_name="opennetworklinux/builder7:1.1"
-g_builder8_image_name="opennetworklinux/builder8:1.1"
+g_builder8_image_name="opennetworklinux/builder8:1.2"
 
 g_default_image_name=g_builder7_image_name
 g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)

make/config.armel.mk

@@ -0,0 +1,9 @@
+############################################################
+#
+# Open Network Linux
+#
+############################################################
+include $(ONL)/make/config.mk
+export TOOLCHAIN := arm-linux-gnueabi
+export ARCH := armel
+export UARCH := ARMEL

make/config.mk

@@ -22,6 +22,7 @@ endif
 ifndef ONL_DEBIAN_SUITE
 $(error "The $$ONL_DEBIAN_SUITE value is not set. Please source $$ONL/setup.env")
 endif
+export ONL_DEBIAN_SUITE_$(ONL_DEBIAN_SUITE)=1
 
 export BUILD_DIR_BASE=BUILD/$(ONL_DEBIAN_SUITE)
 

make/kbuild.mk

@@ -144,9 +144,13 @@ build: setup
 	+$(K_MAKE) $(K_BUILD_TARGET)
 ifdef K_COPY_SRC
 ifdef K_COPY_DST
+ifdef K_COPY_GZIP
+	gzip -c $(K_SOURCE_DIR)/$(K_COPY_SRC) > $(K_TARGET_DIR)/$(K_COPY_DST)
+else
 	cp $(K_SOURCE_DIR)/$(K_COPY_SRC) $(K_TARGET_DIR)/$(K_COPY_DST)
 endif
 endif
+endif
 
 
 MODSYNCLIST := .config Module.symvers Makefile include scripts arch/x86/include arch/x86/Makefile arch/powerpc/include arch/powerpc/Makefile arch/powerpc/lib

make/pkg.mk

@@ -14,7 +14,7 @@ include $(ONL)/make/config.mk
 # directory tree.
 #
 ifndef ARCHES
-ARCHES := amd64 powerpc all
+ARCHES := amd64 powerpc armel all
 endif
 
 pkgall:

packages/base/all/initrds/loader-initrd-files/src/lib/boot1

@@ -41,20 +41,25 @@ else
     rm -f /tmp/rootfs
     uarch=`uname -m`
 
+    ARCH_LIST=
+    case $uarch in
+        ppc)
+            ARCH_LIST="ppc powerpc"
+            ;;
+        x86_64)
+            ARCH_LIST="x86_64 amd64"
+            ;;
+        armv7l)
+            ARCH_LIST="armel"
+            ;;
+        *)
+            ;;
+    esac
 
-    if [ "$uarch" == "ppc" ]; then
-        # Try both rootfs-ppc and rootfs-powerpc
-        for arch in ppc powerpc; do
-            unzip -pq "${swipath}" "rootfs-$arch.sqsh" >/tmp/rootfs
-            [ ! -s /tmp/rootfs  ] || break
-        done
-    elif [ "$uarch" == "x86_64" ]; then
-        # Try both rootfs-amd64 and rootfs-x86_64
-        for arch in x86_64 amd64; do
-            unzip -pq "${swipath}" "rootfs-$arch.sqsh" >/tmp/rootfs
-            [ ! -s /tmp/rootfs  ] || break
-        done
-    fi
+    for arch in $ARCH_LIST; do
+        unzip -pq "${swipath}" "rootfs-$arch.sqsh" >/tmp/rootfs
+        [ ! -s /tmp/rootfs  ] || break
+    done
 
     if [ ! -s /tmp/rootfs ]; then
         echo "${swipath} does not contain a rootfs image for the current architecture ($uarch). Booting cannot continue."

packages/base/all/vendor-config-onl/src/boot.d/62.upgrade-loader

@@ -5,6 +5,7 @@
 #
 ############################################################
 import os
+import sys
 import fnmatch
 from onl.upgrade import ubase
 
@@ -25,7 +26,7 @@ class Loader_Upgrade(ubase.BaseUpgrade):
         ETC_LOADER_VERSIONS_JSON = "/etc/onl/loader/versions.json"
 
         # Upgrade Loader Version file.
-        NEXT_LOADER_VERSIONS_JSON = "/etc/onl/upgrade/%s/manifest.json" % self.arch
+        NEXT_LOADER_VERSIONS_JSON = "/etc/onl/upgrade/%s/manifest.json" % self.parch
 
         self.current_version = self.load_json(ETC_LOADER_VERSIONS_JSON,
                                               "RELEASE_ID",
@@ -45,26 +46,23 @@ class Loader_Upgrade(ubase.BaseUpgrade):
     * A single reboot will be required to complete this upgrade.
 """
 
-class Loader_Upgrade_ppc(Loader_Upgrade):
+
+class Loader_Upgrade_FIT(Loader_Upgrade):
 
     def do_upgrade(self, forced=False):
 
-        PPC_FIT_UPGRADE_IMAGE_PLATFORM="/etc/onl/upgrade/ppc/%s.itb" % self.platform.platform()
-        PPC_FIT_UPGRADE_IMAGE_ALL="/etc/onl/upgrade/ppc/onl-loader-fit.itb"
-        PPC_FIT_LOADER_IMAGE_NAME="%s.itb" % self.platform.platform()
+        FIT_UPGRADE_IMAGE_PLATFORM="/etc/onl/upgrade/%s/%s.itb" % (self.parch, self.platform.platform())
+        FIT_UPGRADE_IMAGE_ALL="/etc/onl/upgrade/%s/onl-loader-fit.itb" % (self.parch)
+        FIT_LOADER_IMAGE_NAME="%s.itb" % self.platform.platform()
 
-        #
-        # The upgrade/ppc directory must have a FIT image called $PPC_FIT_UPGRADE_IMAGE (see constants above)
-        # This is obviously a little janky.
-        #
         fit_image = None
 
-        if os.path.exists(PPC_FIT_UPGRADE_IMAGE_PLATFORM):
-            fit_image = PPC_FIT_UPGRADE_IMAGE_PLATFORM
-        elif os.path.exists(PPC_FIT_UPGRADE_IMAGE_ALL):
-            fit_image = PPC_FIT_UPGRADE_IMAGE_ALL
+        if os.path.exists(FIT_UPGRADE_IMAGE_PLATFORM):
+            fit_image = FIT_UPGRADE_IMAGE_PLATFORM
+        elif os.path.exists(FIT_UPGRADE_IMAGE_ALL):
+            fit_image = FIT_UPGRADE_IMAGE_ALL
         else:
-            self.abort("The PPC Upgrade FIT image is missing. Upgrade cannot continue.")
+            self.abort("The FIT upgrade image is missing. Upgrade cannot continue.")
 
         #
         # The platform configuration file will describe which partition
@@ -100,29 +98,29 @@ class Loader_Upgrade_ppc(Loader_Upgrade):
             #
             mdir="/mnt/upgrade/loader"
             self.mount(mdir, partition=partition)
-            self.copyfile(fit_image, os.path.join(mdir, PPC_FIT_LOADER_IMAGE_NAME))
+            self.copyfile(fit_image, os.path.join(mdir, FIT_LOADER_IMAGE_NAME))
             self.umount(mdir)
 
         self.reboot()
 
 
-
 class Loader_Upgrade_x86_64(Loader_Upgrade):
 
-    X86_64_UPGRADE_DIR="/etc/onl/upgrade/x86_64/"
-    X86_64_UPGRADE_PATTERNS = [ "kernel-*", "initrd-*" ]
-
     def do_upgrade(self, forced=False):
+
+        X86_64_UPGRADE_DIR="/etc/onl/upgrade/%s/" % (self.parch)
+        X86_64_UPGRADE_PATTERNS = [ "kernel-*", "initrd-*" ]
+
         #
         # Mount the ONL-BOOT partition
         #
         mdir="/mnt/onl-boot"
         self.mount(mdir, label="ONL-BOOT")
 
-        for f in os.listdir(self.X86_64_UPGRADE_DIR):
-            for pattern in self.X86_64_UPGRADE_PATTERNS:
+        for f in os.listdir(X86_64_UPGRADE_DIR):
+            for pattern in X86_64_UPGRADE_PATTERNS:
                 if fnmatch.fnmatch(f, pattern):
-                    self.copyfile(os.path.join(self.X86_64_UPGRADE_DIR, f), os.path.join(mdir, f))
+                    self.copyfile(os.path.join(X86_64_UPGRADE_DIR, f), os.path.join(mdir, f))
 
         src = "/lib/platform-config/current/onl/boot/grub.cfg"
         dst = os.path.join(mdir, "grub/grub.cfg")
@@ -142,12 +140,12 @@ if __name__ == '__main__':
     arch = platform.machine()
     klass = None
 
-    if arch =='ppc':
-        klass = Loader_Upgrade_ppc
+    if arch in [ 'ppc', 'armv7l' ]:
+        klass = Loader_Upgrade_FIT
     elif arch == 'x86_64':
         klass = Loader_Upgrade_x86_64
     else:
-        raise Exception("The current architecture (%s) is not supported for upgrade." % arch)
-
-    klass().main()
+        sys.stderr.write("Loader Upgrade: The current architecture (%s) is not supported for upgrade.\n" % arch)
 
+    if klass:
+        klass().main()

packages/base/all/vendor-config-onl/src/python/onl/platform/baseconfig.py

@@ -31,7 +31,9 @@ def baseconfig():
     HOST_TYPES = [ 'powerpc-linux-gnu',
                    'i486-linux-gnu',
                    'i386-linux-gnu',
-                   'x86_64-linux-gnu' ]
+                   'x86_64-linux-gnu',
+                   'arm-linux-gnueabi',
+                   ]
 
     for ht in HOST_TYPES:
         if os.path.exists('/lib/%s' % ht):
@@ -68,6 +70,3 @@ def baseconfig():
 
     msg("Setting up base platform configuration for %s: done\n" %
         platform.platform())
-
-
-

packages/base/all/vendor-config-onl/src/python/onl/upgrade/ubase.py

@@ -34,6 +34,7 @@ class BaseUpgrade(object):
         self.init_argparser()
         self.load_config()
         self.arch = pp.machine()
+        self.parch = dict(ppc='powerpc', x86_64='amd64', armv7l='armel')[self.arch]
         self.platform = OnlPlatform()
 
     #

packages/base/amd64/upgrade/PKG.yml

@@ -17,10 +17,6 @@ packages:
     summary: Open Network Linux Upgrade package for AMD64 platforms.
 
     files:
-      builds/files : /etc/onl/upgrade/x86_64
+      builds/files : /etc/onl/upgrade/amd64
 
     changelog:  Change changes changes.,
-
-
-
-

packages/base/any/faultd/src/module/src/faultd_main.c

@@ -1,22 +1,22 @@
 /**************************************************************************//**
  *
  * <bsn.cl fy=2013 v=onl>
- * 
- *        Copyright 2013, 2014 BigSwitch Networks, Inc.        
- * 
+ *
+ *        Copyright 2013, 2014 BigSwitch Networks, Inc.
+ *
  * Licensed under the Eclipse Public License, Version 1.0 (the
  * "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
- * 
+ *
  *        http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific
  * language governing permissions and limitations under the
  * License.
- * 
+ *
  * </bsn.cl>
  *
  *****************************************************************************/
@@ -150,7 +150,7 @@ faultd_main(int argc, char* argv[])
         aim_daemon_config_t config;
 
         memset(&config, 0, sizeof(config));
-        aim_daemon_restart_config_init(&rconfig, 1, 1);
+        aim_daemon_restart_config_init(&rconfig, 1, 1, argv);
         AIM_BITMAP_CLR(&rconfig.signal_restarts, SIGTERM);
         AIM_BITMAP_CLR(&rconfig.signal_restarts, SIGKILL);
         rconfig.maximum_restarts=0;

packages/base/any/fit/buildroot/APKG.yml

@@ -0,0 +1,19 @@
+prerequisites:
+  packages:
+    - onl-buildroot-initrd:$ARCH
+
+common:
+  arch: $ARCH
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+
+packages:
+  - name: onl-buildroot-fit
+    version: 1.0.0
+    summary: Open Network Linux FIT Buildroot Image for $ARCH
+
+    files:
+      builds/onl-buildroot-fit.itb : $$PKG_INSTALL/
+
+    changelog:  Change changes changes.,

packages/base/any/fit/buildroot/builds/Makefile

@@ -0,0 +1,13 @@
+ifndef ARCH
+$(error $$ARCH not set)
+endif
+
+.PHONY: onl-buildroot-fit.itb onl-buildroot-fit.its
+
+onl-buildroot-fit.itb:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:$(ARCH),onl-buildroot-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform all --itb $@
+
+onl-buildroot-fit.its:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:$(ARCH),onl-buildroot-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform all --its $@
+
+its: onl-buildroot-fit.its

packages/base/any/fit/loader/APKG.yml

@@ -0,0 +1,20 @@
+prerequisites:
+  packages:
+    - onl-loader-initrd:$ARCH
+
+common:
+  arch: $ARCH
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+
+packages:
+  - name: onl-loader-fit
+    version: 1.0.0
+    summary: Open Network Linux FIT Loader Image for $ARCH
+
+    files:
+      builds/onl-loader-fit.itb : /etc/onl/upgrade/$ARCH/
+      builds/manifest.json      : /etc/onl/upgrade/$ARCH/
+
+    changelog:  Change changes changes.,

packages/base/any/fit/loader/builds/Makefile

@@ -0,0 +1,14 @@
+ifndef ARCH
+$(error $$ARCH must be set)
+endif
+
+.PHONY: onl-loader-fit.itb onl-loader-fit.its
+
+onl-loader-fit.itb:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:$(ARCH),onl-loader-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform initrd --itb $@
+	$(ONLPM) --copy-file onl-loader-initrd:$(ARCH) manifest.json .
+
+onl-loader-fit.its:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:$(ARCH),onl-loader-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform initrd --its $@
+
+its: onl-loader-fit.its

packages/base/any/initrds/buildroot/builds/.gitignore

@@ -1,3 +1,4 @@
 .setup.done
 buildroot-powerpc
 buildroot-x86_64
+buildroot-arm

packages/base/any/initrds/buildroot/builds/Makefile

@@ -16,7 +16,7 @@ include $(ONL)/make/config.mk
 #
 # We build for these architectures
 #
-ARCHS := powerpc x86_64
+ARCHS := powerpc x86_64 arm
 BUILDROOT_ARCHDIRS := $(foreach a,$(ARCHS),buildroot-$(a))
 BUILDROOT_SOURCE := buildroot-mirror
 

packages/base/any/initrds/buildroot/builds/busybox.config

@@ -551,7 +551,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y
 # CONFIG_FEATURE_GPT_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
+CONFIG_FLOCK=y
 CONFIG_FREERAMDISK=y
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_EXT2 is not set

packages/base/any/kernels/3.2.71-1+deb7/configs/arm-iproc-all/.gitignore

@@ -0,0 +1,2 @@
+linux-3.2.71*
+kernel-3.2*

packages/base/any/kernels/3.2.71-1+deb7/configs/arm-iproc-all/Makefile

@@ -0,0 +1,41 @@
+############################################################
+# <bsn.cl fy=2015 v=onl>
+#
+#           Copyright 2015 Big Switch Networks, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+include $(ONL)/make/config.mk
+
+ifndef K_TARGET_DIR
+K_TARGET_DIR := $(THIS_DIR)
+endif
+
+include ../../kconfig.mk
+K_CONFIG := arm-iproc-all.config
+K_BUILD_TARGET := Image
+K_COPY_SRC := arch/arm/boot/Image
+K_COPY_GZIP := 1
+ifndef K_COPY_DST
+K_COPY_DST := kernel-3.2-deb7-arm-iproc-all.bin.gz
+endif
+
+export ARCH=arm
+DTS_LIST := accton_as4610_54
+
+include $(ONL)/make/kbuild.mk

packages/base/any/kernels/3.2.71-1+deb7/kconfig.mk

@@ -0,0 +1,27 @@
+############################################################
+# <bsn.cl fy=2015 v=onl>
+#
+#           Copyright 2015 Big Switch Networks, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+K_MAJOR_VERSION := 3
+K_PATCH_LEVEL := 2
+K_SUB_LEVEL := 71
+K_SUFFIX :=
+K_PATCH_DIR := $(THIS_DIR)/patches

packages/base/any/kernels/3.2.71-1+deb7/patches/prepare.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+rm "${1}/drivers/staging/ft1000/ft1000-pcmcia/ft1000.img"
+rm "${1}/drivers/staging/ft1000/ft1000-usb/ft3000.img"

packages/base/any/kernels/3.2.71-1+deb7/patches/series

@@ -0,0 +1,2 @@
+prepare.sh
+kernel-3.2.71.patch

packages/base/any/onlp/src/onlp/module/src/onlp_main.c

@@ -31,7 +31,7 @@
 #include <AIM/aim_log_handler.h>
 #include <syslog.h>
 
-static void platform_manager_daemon__(const char* pidfile);
+static void platform_manager_daemon__(const char* pidfile, char** argv);
 
 /**
  * Human-readable SFP inventory.
@@ -246,7 +246,7 @@ onlpdump_main(int argc, char* argv[])
     onlp_init();
 
     if(M) {
-        platform_manager_daemon__(pidfile);
+        platform_manager_daemon__(pidfile, argv);
         exit(0);
     }
 
@@ -361,14 +361,14 @@ sighandler__(int signal)
 }
 
 static void
-platform_manager_daemon__(const char* pidfile)
+platform_manager_daemon__(const char* pidfile, char** argv)
 {
     aim_pvs_t* aim_pvs_syslog = NULL;
     aim_daemon_restart_config_t rconfig;
     aim_daemon_config_t config;
 
     memset(&config, 0, sizeof(config));
-    aim_daemon_restart_config_init(&rconfig, 1, 1);
+    aim_daemon_restart_config_init(&rconfig, 1, 1, argv);
     AIM_BITMAP_CLR(&rconfig.signal_restarts, SIGTERM);
     AIM_BITMAP_CLR(&rconfig.exit_restarts, 0);
     rconfig.maximum_restarts=50;
@@ -412,9 +412,9 @@ platform_manager_daemon__(const char* pidfile)
 
 #else
 static void
-platform_manager_daemon__(const char* pidfile)
+platform_manager_daemon__(const char* pidfile, char** argv)
 {
-    fprintf(stderr, "Daemon mode not supported in this build.");
+    fprintf(stderr, "Daemon mode not supported in this build.\n");
     exit(1);
 }
 #endif

packages/base/armel/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/faultd/.gitignore

@@ -0,0 +1 @@
+

packages/base/armel/faultd/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/faultd/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/faultd/APKG.yml ARCH=armel TOOLCHAIN=arm-linux-gnueabi

packages/base/armel/faultd/builds/.gitignore

@@ -0,0 +1,2 @@
+faultd.mk
+faultd-module.mk

packages/base/armel/faultd/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/faultd/builds/Makefile

packages/base/armel/fit/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/fit/buildroot/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/fit/buildroot/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/fit/buildroot/APKG.yml ARCH=armel

packages/base/armel/fit/buildroot/builds/.gitignore

@@ -0,0 +1,4 @@
+kernel-*
+*.itb
+*.its
+loader-initrd-armel

packages/base/armel/fit/buildroot/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/fit/buildroot/builds/Makefile

packages/base/armel/fit/loader/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/fit/loader/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/fit/loader/APKG.yml ARCH=armel

packages/base/armel/fit/loader/builds/.gitignore

@@ -0,0 +1,5 @@
+kernel-*
+*.itb
+*.its
+loader-initrd-armel
+manifest.json

packages/base/armel/fit/loader/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/fit/loader/builds/Makefile

packages/base/armel/initrds/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/initrds/buildroot/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/initrds/buildroot/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/initrds/buildroot/APKG.yml ARCH=armel

packages/base/armel/initrds/buildroot/builds/.gitignore

@@ -0,0 +1 @@
+makedevs

packages/base/armel/initrds/buildroot/builds/Makefile

@@ -0,0 +1,27 @@
+# -*- Makefile -*-
+############################################################
+# <bsn.cl fy=2013 v=onl>
+#
+#        Copyright 2013, 2014 Big Switch Networks, Inc.
+#
+# Licensed under the Eclipse Public License, Version 1.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#        http://www.eclipse.org/legal/epl-v10.html
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific
+# language governing permissions and limitations under the
+# License.
+#
+# </bsn.cl>
+############################################################
+#
+#
+############################################################
+include $(ONL)/make/config.armel.mk
+export BUILDROOT_ARCH := arm
+include $(ONL)/packages/base/any/initrds/buildroot/Makefile.any

packages/base/armel/initrds/loader/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/initrds/loader/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/initrds/loader/APKG.yml ARCH=armel

packages/base/armel/initrds/loader/builds/.gitignore

@@ -0,0 +1,3 @@
+loader-rootfs
+buildroot-makedevs
+manifest.json

packages/base/armel/initrds/loader/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/initrds/loader/builds/Makefile

packages/base/armel/kernels/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/PKG.yml

@@ -0,0 +1,18 @@
+
+common:
+  arch: armel
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+
+packages:
+  - name: onl-kernel-3.2-deb7-arm-iproc-all
+    version: 1.0.0
+    summary: Open Network Linux Kernel 3.2-deb7 for ARM Integrated Processor Platforms.
+
+    files:
+      builds/kernel-3.2-deb7-arm-iproc-all.bin.gz : $$PKG_INSTALL/
+      builds/linux-3.2.71-mbuild : $$PKG_INSTALL/mbuilds
+      builds/linux-3.2.71-dtbs : $$PKG_INSTALL/dtbs
+
+    changelog:  Change changes changes.,

packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/builds/.gitignore

@@ -0,0 +1,2 @@
+linux-3.2.71*
+kernel-3.2-*

packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/builds/Makefile

@@ -0,0 +1,19 @@
+# -*- Makefile -*-
+############################################################
+# <bsn.cl fy=2013 v=none>
+#
+#        Copyright 2013, 2014 BigSwitch Networks, Inc.
+#
+#
+#
+# </bsn.cl>
+############################################################
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+include $(ONL)/make/config.mk
+
+kernel:
+	$(MAKE) -C $(ONL)/packages/base/any/kernels/3.2.71-1+deb7/configs/arm-iproc-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
+
+clean:
+	rm -rf linux-3.2.71-1*

packages/base/armel/onlp-snmpd/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/onlp-snmpd/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/onlp-snmpd/APKG.yml ARCH=armel TOOLCHAIN=arm-linux-gnueabi

packages/base/armel/onlp-snmpd/builds/.gitignore

@@ -0,0 +1 @@
+onlp-snmpd.mk

packages/base/armel/onlp-snmpd/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/onlp-snmpd/builds/Makefile

packages/base/armel/onlp/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/onlp/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/onlp/APKG.yml ARCH=armel TOOLCHAIN=arm-linux-gnueabi

packages/base/armel/onlp/builds/.gitignore

@@ -0,0 +1 @@
+libonlp-module.mk

packages/base/armel/onlp/builds/Makefile

@@ -0,0 +1,3 @@
+DIRECTORIES := onlp-platform-defaults onlp-platform onlp onlpd
+include $(ONL)/make/subdirs.mk
+

packages/base/armel/onlp/builds/onlp-platform-defaults/.gitignore

@@ -0,0 +1 @@
+libonlp-platform-defaults-module.mk

packages/base/armel/onlp/builds/onlp-platform-defaults/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/onlp/builds/onlp-platform-defaults/Makefile

packages/base/armel/onlp/builds/onlp-platform/.gitignore

@@ -0,0 +1 @@
+libonlp-platform-module.mk

packages/base/armel/onlp/builds/onlp-platform/Makefile

@@ -0,0 +1,3 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/onlp/builds/onlp-platform/Makefile
+

packages/base/armel/onlp/builds/onlp/Makefile

@@ -0,0 +1,3 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/onlp/builds/onlp/Makefile
+

packages/base/armel/onlp/builds/onlpd/.gitignore

@@ -0,0 +1 @@
+onlpd-module.mk

packages/base/armel/onlp/builds/onlpd/Makefile

@@ -0,0 +1,3 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/onlp/builds/onlpd/Makefile
+

packages/base/armel/oom-shim/Makefile

@@ -0,0 +1 @@
+include $(ONL)/make/pkg.mk

packages/base/armel/oom-shim/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/oom-shim/APKG.yml ARCH=armel TOOLCHAIN=arm-linux-gnueabi

packages/base/armel/oom-shim/builds/Makefile

@@ -0,0 +1,2 @@
+include $(ONL)/make/config.armel.mk
+include $(ONL)/packages/base/any/oom-shim/builds/Makefile

packages/base/armel/oom-shim/builds/oom_shim.mk

@@ -0,0 +1,10 @@
+
+###############################################################################
+#
+# Inclusive Makefile for the oom_shim module.
+#
+# Autogenerated 2016-02-16 14:17:39.946619
+#
+###############################################################################
+oom_shim_BASEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+