Merge branch 'master' of github.com:opencomputeproject/OpenNetworkLinux

make/kbuild.mk

@@ -103,7 +103,7 @@ K_ARCHIVE_NAME := $(K_NAME).$(K_ARCHIVE_EXT)
 endif
 K_ARCHIVE_PATH := $(ONL_KERNELS)/archives/$(K_ARCHIVE_NAME)
 ifndef K_ARCHIVE_URL
-K_ARCHIVE_URL := https://www.kernel.org/pub/linux/kernel/v3.x/$(K_ARCHIVE_NAME)
+K_ARCHIVE_URL := https://www.kernel.org/pub/linux/kernel/v$(K_MAJOR_VERSION).x/$(K_ARCHIVE_NAME)
 endif
 K_SOURCE_DIR := $(K_TARGET_DIR)/$(K_NAME)
 K_MBUILD_DIR := $(K_SOURCE_DIR)-mbuild

packages/base/all/initrds/loader-initrd-files/src/bin/swiprep

@@ -149,8 +149,11 @@ esac
 
 if test "${mode_install}${mode_overlay}"; then
   for arch in $ARCH_LIST; do
-    unzip -pq "$swipath" "rootfs-${arch}.sqsh" > "$workdir/rootfs.sqsh"
-    if test -s "$workdir/rootfs.sqsh"; then break; fi
+    unzip -q "$swipath" "rootfs-${arch}.sqsh" -d "$workdir"
+    if test -s "$workdir/rootfs-${arch}.sqsh"; then
+      mv "$workdir/rootfs-${arch}.sqsh" "$workdir/rootfs.sqsh"
+      break;
+    fi
   done
   if test ! -s "$workdir/rootfs.sqsh"; then
     echo "*** cannot find a valid rootfs" 1>&2

packages/base/all/initrds/loader-initrd-files/src/bootmodes/swi

@@ -19,7 +19,7 @@ fi
 #
 for url in $SWI; do
     msg_info "Trying ${url}..."
-    timeout -t 60 boot "${url}" && exit 0
+    timeout -t 180 boot "${url}" && exit 0
 done
 
 exit 1

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

@@ -23,6 +23,10 @@ default:
       =: kernel-3.16-lts-x86_64-all
       package: onl-kernel-3.16-lts-x86-64-all:amd64
 
+    kernel-4.9: &kernel-4-9
+      =: kernel-4.9-lts-x86_64-all
+      package: onl-kernel-4.9-lts-x86-64-all:amd64
+
     # pick one of the above kernels
     kernel:
       <<: *kernel-3-16

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

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

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

@@ -0,0 +1,29 @@
+variables:
+  basename: onl-kernel-4.9-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 4.9 LTS Kernel for X86_64 Platforms.
+
+    files:
+      builds/kernel-4.9* : $$PKG_INSTALL/
+      builds/linux-*mbuild   : $$PKG_INSTALL/mbuilds
+
+    changelog:  Change changes changes.,
+
+  - name: $basename-modules
+    version: 1.0.0
+    summary: Open Network Linux 4.9 LTS Kernel Modules for X86_64 Platforms
+
+    files:
+      builds/lib: /lib
+
+    changelog:  Change changes changes.,

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

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

packages/base/amd64/kernels/kernel-4.9-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/4.9-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-4.9.30-mbuild "$(wildcard $(ONL)/packages/base/any/kernels/modules/*)" onl/onl/common
+
+clean:
+	rm -rf linux-4.9* kernel-4.9*

packages/base/amd64/upgrade/PKG.yml

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

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.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)
 
 
 # Loader initrd

packages/base/any/kernels/4.9-lts/configs/x86_64-all/.gitignore

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

packages/base/any/kernels/4.9-lts/configs/x86_64-all/Makefile

@@ -0,0 +1,37 @@
+############################################################
+# <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
+
+export ARCH := x86_64
+ifndef K_TARGET_DIR
+K_TARGET_DIR := $(THIS_DIR)
+endif
+
+include ../../kconfig.mk
+K_CONFIG := x86_64-all.config
+K_BUILD_TARGET := bzImage
+K_COPY_SRC := arch/x86/boot/bzImage
+ifndef K_COPY_DST
+K_COPY_DST := kernel-4.9-lts-x86_64-all
+endif
+
+include $(ONL)/make/kbuild.mk

packages/base/any/kernels/4.9-lts/kconfig.mk

@@ -0,0 +1,30 @@
+############################################################
+# <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>
+############################################################
+#
+# 4.9  Kernel Builds
+#
+############################################################
+THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+K_MAJOR_VERSION := 4
+K_PATCH_LEVEL := 9
+K_SUB_LEVEL := 30
+K_SUFFIX :=
+K_PATCH_DIR := $(THIS_DIR)/patches

packages/base/any/kernels/4.9-lts/patches/series

@@ -0,0 +1 @@
+

packages/platforms/dellemc/Makefile

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

packages/platforms/dellemc/vendor-config/Makefile

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

packages/platforms/dellemc/vendor-config/PKG.yml

@@ -0,0 +1 @@
+!include $ONL/packages/base/any/templates/platform-config-vendor.yml VENDOR=dellemc Vendor=DellEMC

packages/platforms/dellemc/vendor-config/src/python/dellemc/__init__.py

@@ -0,0 +1,7 @@
+#!/usr/bin/python
+
+from onl.platform.base import *
+
+class OnlPlatformDellEMC(OnlPlatformBase):
+    MANUFACTURER='DellEMC'
+    PRIVATE_ENTERPRISE_NUMBER=674