Merge branch 'master' into manager_led

docker/images/builder8/1.7/Dockerfile

@@ -0,0 +1,27 @@
+############################################################
+#
+# Fix broken cross dependencies.
+# Update Packages.
+# Additional build dependencies.
+#
+############################################################
+FROM opennetworklinux/builder8:1.6
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+#ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get install -f && \
+    apt-get update
+
+RUN xapt -a powerpc libsnmp-dev && \
+    xapt -a armel   libsnmp-dev && \
+    xapt -a arm64   libsnmp-dev
+
+RUN apt-get install -f
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install tshark -y
+RUN sudo apt-get install -yq libpcap-dev libxml2-dev python-dev g++ swig tcpreplay libusb-dev
+
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id

docker/images/builder8/1.7/Makefile

@@ -0,0 +1,19 @@
+VERSION=1.7
+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/container-id

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # -*- python -*-
 
 import re

docker/tools/onlbuilder

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import os
 import sys
@@ -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.2"
-g_builder8_image_name="opennetworklinux/builder8:1.6"
+g_builder8_image_name="opennetworklinux/builder8:1.7"
 
 g_default_image_name=g_builder8_image_name
 g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)

packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-x86-64.yml

@@ -19,6 +19,10 @@ default:
     # this is mostly to *reject* invalid disk labels,
     # since we will never create our own
 
+    kernel-3.2: &kernel-3-2
+      =: kernel-3.2-lts-x86_64-all
+      package: onl-kernel-3.2-lts-x86-64-all:amd64
+
     kernel-3.16: &kernel-3-16
       =: kernel-3.16-lts-x86_64-all
       package: onl-kernel-3.16-lts-x86-64-all:amd64

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

@@ -487,6 +487,10 @@ class OnlPlatformPortConfig_48x25_6x100(object):
     PORT_COUNT=54
     PORT_CONFIG="48x25 + 6x100"
 
+class OnlPlatformPortConfig_48x25_8x100(object):
+    PORT_COUNT=56
+    PORT_CONFIG="48x25 + 8x100"
+
 class OnlPlatformPortConfig_32x40(object):
     PORT_COUNT=32
     PORT_CONFIG="32x40"

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/Makefile

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

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/PKG.yml

@@ -0,0 +1,29 @@
+variables:
+  basename: onl-kernel-3.2-lts-x86-64-all
+
+common:
+  arch: amd64
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+  support: opennetworklinux@googlegroups.com
+
+packages:
+  - name: $basename
+    version: 1.0.0
+    summary: Open Network Linux 3.2 LTS Kernel for X86_64 Platforms.
+
+    files:
+      builds/kernel-3.2* : $$PKG_INSTALL/
+      builds/linux-*mbuild   : $$PKG_INSTALL/mbuilds
+
+    changelog:  Change changes changes.,
+
+  - name: $basename-modules
+    version: 1.0.0
+    summary: Open Network Linux 3.2 LTS Kernel Modules for X86_64 Platforms
+
+    files:
+      builds/lib: /lib
+
+    changelog:  Change changes changes.,

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/builds/.gitignore

@@ -0,0 +1,3 @@
+linux-*
+kernel-*
+lib

packages/base/amd64/kernels/kernel-3.2-lts-x86-64-all/builds/Makefile

@@ -0,0 +1,21 @@
+# -*- 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-lts/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
+	rm -rf lib
+	ARCH=x86_64 $(ONL)/tools/scripts/kmodbuild.sh linux-3.2.84-mbuild "$(wildcard $(ONL)/packages/base/any/kernels/modules/*)" onl/onl/common
+
+clean:
+	rm -rf linux-3.2* kernel-3.2*

packages/base/amd64/upgrade/PKG.yml

@@ -1,5 +1,6 @@
 prerequisites:
     packages:
+      - onl-kernel-3.2-lts-x86-64-all:amd64
       - onl-kernel-3.16-lts-x86-64-all:amd64
       - onl-kernel-4.9-lts-x86-64-all:amd64
       - onl-loader-initrd:amd64

packages/base/amd64/upgrade/builds/Makefile

@@ -1,7 +1,8 @@
 include $(ONL)/make/config.amd64.mk
 
 # All amd64 kernels
-KERNELS := $(shell $(ONLPM) --find-file onl-kernel-3.16-lts-x86-64-all:amd64 kernel-3.16-lts-x86_64-all) \
+KERNELS := $(shell $(ONLPM) --find-file onl-kernel-3.2-lts-x86-64-all:amd64 kernel-3.2-lts-x86_64-all) \
+           $(shell $(ONLPM) --find-file onl-kernel-3.16-lts-x86-64-all:amd64 kernel-3.16-lts-x86_64-all) \
 	   $(shell $(ONLPM) --find-file onl-kernel-4.9-lts-x86-64-all:amd64 kernel-4.9-lts-x86_64-all)
 
 

packages/base/any/kernels/3.2-lts/configs/arm-iproc-all/Makefile

@@ -26,6 +26,8 @@ ifndef K_TARGET_DIR
 K_TARGET_DIR := $(THIS_DIR)
 endif
 
+K_PATCH_DIR := $(THIS_DIR)/patches
+
 include ../../kconfig.mk
 K_CONFIG := arm-iproc-all.config
 K_BUILD_TARGET := Image