From 08d7b653d858597bb7e4e5e066066263c4ef86d8 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Fri, 29 Jan 2016 22:28:34 +0000 Subject: [PATCH 1/7] Fix parallel build invocations. --- .../base/amd64/kernels/kernel-3.18-x68-64-all/builds/Makefile | 2 +- .../amd64/kernels/kernel-3.2-deb7-x86-64-all/builds/Makefile | 2 +- .../kernels/kernel-3.2-deb7-powerpc-e500v-all/builds/Makefile | 2 +- .../kernels/legacy/kernel-3.8.13-powerpc-e500mc/builds/Makefile | 2 +- .../kernels/legacy/kernel-3.9.6-powerpc-e500v/builds/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/base/amd64/kernels/kernel-3.18-x68-64-all/builds/Makefile b/packages/base/amd64/kernels/kernel-3.18-x68-64-all/builds/Makefile index be55d0e3..e0bc3251 100644 --- a/packages/base/amd64/kernels/kernel-3.18-x68-64-all/builds/Makefile +++ b/packages/base/amd64/kernels/kernel-3.18-x68-64-all/builds/Makefile @@ -13,7 +13,7 @@ THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) include $(ONL)/make/config.mk kernel: - $(MAKE) -C $(ONL)/packages/base/any/kernels/3.18.25/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) -j + $(MAKE) -C $(ONL)/packages/base/any/kernels/3.18.25/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL) clean: rm -rf linux-3.18.25 linux-3.18.25-mbuild diff --git a/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/builds/Makefile b/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/builds/Makefile index 2174869e..61fc5d43 100644 --- a/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/builds/Makefile +++ b/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/builds/Makefile @@ -13,7 +13,7 @@ THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) include $(ONL)/make/config.mk kernel: - $(MAKE) -C $(ONL)/packages/base/any/kernels/3.2.65-1+deb7u2/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) -j + $(MAKE) -C $(ONL)/packages/base/any/kernels/3.2.65-1+deb7u2/configs/x86_64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL) clean: rm -rf linux-3.2.65-1+deb7u2 linux-3.2.65-1+deb7u2-mbuild diff --git a/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/builds/Makefile b/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/builds/Makefile index cf4d94b3..81e28185 100644 --- a/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/builds/Makefile +++ b/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/builds/Makefile @@ -13,7 +13,7 @@ THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) include $(ONL)/make/config.mk kernel: - $(MAKE) -C $(ONL)/packages/base/any/kernels/3.2.65-1+deb7u2/configs/powerpc-e500v-all K_TARGET_DIR=$(THIS_DIR) K_COPY_DST=kernel-3.2-deb7-powerpc-e500v-all.bin.gz + $(MAKE) -C $(ONL)/packages/base/any/kernels/3.2.65-1+deb7u2/configs/powerpc-e500v-all K_TARGET_DIR=$(THIS_DIR) K_COPY_DST=kernel-3.2-deb7-powerpc-e500v-all.bin.gz $(ONL_MAKE_PARALLEL) clean: rm -rf linux-3.2.65-1+deb7u2 linux-3.2.65-1+deb7u2-mbuild linux-3.2.65-1+deb7u2-dtbs diff --git a/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/builds/Makefile b/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/builds/Makefile index 0343af53..007fc38c 100644 --- a/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/builds/Makefile +++ b/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/builds/Makefile @@ -24,7 +24,7 @@ KERNEL_DIR := $(ONL)/packages/base/any/kernels/legacy/linux-3.8.13 $(COMPDIR)/kernel-e500mc: $(KERNEL_DIR)/arch/powerpc/configs/$(DEFCONFIG) mkdir -p $(COMPDIR)/linux-build-e500mc - $(MAKE) -C $(KERNEL_DIR) $(DEFCONFIG) ARCH=powerpc O=$(COMPDIR)/linux-build-e500mc + $(MAKE) -C $(KERNEL_DIR) $(DEFCONFIG) ARCH=powerpc O=$(COMPDIR)/linux-build-e500mc $(ONL_MAKE_PARALLEL) PATH=$$PATH:$(SWITCHLIGHT)/tools $(MAKE) -C $(KERNEL_DIR) uImage ARCH=powerpc O=$(COMPDIR)/linux-build-e500mc powerpc-linux-gnu-strip -o $(COMPDIR)/kernel-e500mc $(COMPDIR)/linux-build-e500mc/vmlinux cp $(COMPDIR)/linux-build-e500mc/vmlinux.bin.gz $(COMPDIR)/kernel-e500mc.bin.gz diff --git a/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/builds/Makefile b/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/builds/Makefile index 18a8659f..ff57b59c 100644 --- a/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/builds/Makefile +++ b/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/builds/Makefile @@ -24,7 +24,7 @@ KERNEL_DIR := $(ONL)/packages/base/any/kernels/legacy/linux-3.9.6 $(BUILD_POWERPC_LINUX_85XX)/kernel-85xx: $(KERNEL_DIR)/arch/powerpc/configs/85xx/onl_mpc85xx_defconfig mkdir -p $(BUILD_POWERPC_LINUX_85XX)/linux-build-85xx - $(MAKE) -C $(KERNEL_DIR) 85xx/onl_mpc85xx_defconfig ARCH=powerpc O=$(BUILD_POWERPC_LINUX_85XX)/linux-build-85xx + $(MAKE) -C $(KERNEL_DIR) 85xx/onl_mpc85xx_defconfig ARCH=powerpc O=$(BUILD_POWERPC_LINUX_85XX)/linux-build-85xx $(ONL_MAKE_PARALLEL) PATH=$$PATH:$(SWITCHLIGHT)/tools $(MAKE) -C $(KERNEL_DIR) uImage ARCH=powerpc O=$(BUILD_POWERPC_LINUX_85XX)/linux-build-85xx powerpc-linux-gnu-strip -o $(BUILD_POWERPC_LINUX_85XX)/kernel-85xx $(BUILD_POWERPC_LINUX_85XX)/linux-build-85xx/vmlinux cp $(BUILD_POWERPC_LINUX_85XX)/linux-build-85xx/vmlinux.bin.gz $(BUILD_POWERPC_LINUX_85XX)/kernel-85xx.bin.gz From b2b66c98857cc1fc107bcabe2e4d4e253b7c21e4 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Fri, 29 Jan 2016 22:28:51 +0000 Subject: [PATCH 2/7] Include parallel make flags. --- tools/onlpm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/onlpm.py b/tools/onlpm.py index d1b5854b..6301a9aa 100755 --- a/tools/onlpm.py +++ b/tools/onlpm.py @@ -506,7 +506,7 @@ class OnlPackageGroup(object): for bp in buildpaths: if os.path.exists(bp): MAKE = os.environ.get('MAKE', "make") - cmd = MAKE + ' -C ' + bp + " " + os.environ.get('ONLPM_MAKE_OPTIONS', "") + target + cmd = MAKE + ' -C ' + bp + " " + os.environ.get('ONLPM_MAKE_OPTIONS', "") + " " + os.environ.get('ONL_MAKE_PARALLEL', "") + " " + target onlu.execute(cmd, ex=OnlPackageError('%s failed.' % operation)) From 2f05cf31b87fbfafef244a09726017aa07fd7dba Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Fri, 29 Jan 2016 22:29:24 +0000 Subject: [PATCH 3/7] Set global parallel make options to -j16 --- setup.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.env b/setup.env index ca010660..bbe964a8 100755 --- a/setup.env +++ b/setup.env @@ -20,7 +20,7 @@ export PATH="$ONL/tools/scripts:$ONL/tools:$PATH" # Parallel Make Jobs # Default parallel build settings -# export MAKEFLAGS="-j64" +export ONL_MAKE_PARALLEL=-j16 # Version files $ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make From 04d8775ee35a6bd8df85f7de5a80ce3261b146d4 Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Fri, 29 Jan 2016 15:11:48 -0800 Subject: [PATCH 4/7] updated buildroot configs to include SquashFS support --- .../initrds/buildroot/builds/buildroot.config-powerpc | 10 +++++++--- .../initrds/buildroot/builds/buildroot.config-x86_64 | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc b/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc index 74334564..a493261a 100644 --- a/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc +++ b/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Buildroot 2013.02-rc2-dirty Configuration +# Buildroot 2013.02-rc2-g5e1a5c1-dirty Configuration # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -85,7 +85,7 @@ BR2_HOST_DIR="$(BASE_DIR)/host" # Mirrors and Download locations # BR2_PRIMARY_SITE="$(BUILDROOTMIRROR)" -BR2_PRIMARY_SITE_ONLY=n +# BR2_PRIMARY_SITE_ONLY is not set BR2_BACKUP_SITE="https://raw.githubusercontent.com/opennetworklinux/buildroot-download-cache/master/dl" BR2_KERNEL_MIRROR="http://www.kernel.org/pub/" BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu" @@ -482,7 +482,11 @@ BR2_PACKAGE_MTD_UBIRMVOL=y BR2_PACKAGE_MTD_UBIUPDATEVOL=y # BR2_PACKAGE_NFS_UTILS is not set # BR2_PACKAGE_NTFS_3G is not set -# BR2_PACKAGE_SQUASHFS is not set +BR2_PACKAGE_SQUASHFS=y +BR2_PACKAGE_SQUASHFS_GZIP=y +# BR2_PACKAGE_SQUASHFS_LZMA is not set +# BR2_PACKAGE_SQUASHFS_LZO is not set +# BR2_PACKAGE_SQUASHFS_XZ is not set # BR2_PACKAGE_SSHFS is not set # BR2_PACKAGE_UNIONFS is not set # BR2_PACKAGE_XFSPROGS is not set diff --git a/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 b/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 index 0f008093..6194cb4a 100644 --- a/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 +++ b/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Buildroot 2013.02-rc2-dirty Configuration +# Buildroot 2013.02-rc2-g5e1a5c1-dirty Configuration # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -456,7 +456,11 @@ BR2_PACKAGE_MTD_UBIRMVOL=y BR2_PACKAGE_MTD_UBIUPDATEVOL=y # BR2_PACKAGE_NFS_UTILS is not set # BR2_PACKAGE_NTFS_3G is not set -# BR2_PACKAGE_SQUASHFS is not set +BR2_PACKAGE_SQUASHFS=y +BR2_PACKAGE_SQUASHFS_GZIP=y +# BR2_PACKAGE_SQUASHFS_LZMA is not set +# BR2_PACKAGE_SQUASHFS_LZO is not set +# BR2_PACKAGE_SQUASHFS_XZ is not set # BR2_PACKAGE_SSHFS is not set # BR2_PACKAGE_UNIONFS is not set # BR2_PACKAGE_XFSPROGS is not set From dd900edaf8cdb79355405616e96a536f8e1af1de Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Fri, 29 Jan 2016 15:13:36 -0800 Subject: [PATCH 5/7] Add 3.18 kernel to installed kernel list --- builds/amd64/installer/legacy/builds/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builds/amd64/installer/legacy/builds/Makefile b/builds/amd64/installer/legacy/builds/Makefile index 2425e304..158cbf6c 100644 --- a/builds/amd64/installer/legacy/builds/Makefile +++ b/builds/amd64/installer/legacy/builds/Makefile @@ -1,7 +1,8 @@ include $(ONL)/make/config.amd64.mk KERNELS := $(shell $(ONLPM) --find-file onl-kernel-3.9.6-x86-64-all:amd64 kernel-3.9.6-x86-64-all) \ - $(shell $(ONLPM) --find-file onl-kernel-3.2-deb7-x86-64-all:amd64 kernel-3.2-deb7-x86_64-all) + $(shell $(ONLPM) --find-file onl-kernel-3.2-deb7-x86-64-all:amd64 kernel-3.2-deb7-x86_64-all) \ + $(shell $(ONLPM) --find-file onl-kernel-3.18-x86-64-all:amd64 kernel-3.18-x86_64-all) INITRD := $(shell $(ONLPM) --find-file onl-loader-initrd:amd64 onl-loader-initrd-amd64.cpio.gz) PLATFORMS := $(shell $(ONLPM) --platform-manifest onl-loader-initrd:amd64) From f6763b2c1660f18cf8495b7d14ed33e391e6c9b4 Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Fri, 29 Jan 2016 15:14:47 -0800 Subject: [PATCH 6/7] Updated 3.18 kernel configuration to include USBNET for Wedge BMC --- .../configs/x86_64-all/x86_64-all.config | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/packages/base/any/kernels/3.18.25/configs/x86_64-all/x86_64-all.config b/packages/base/any/kernels/3.18.25/configs/x86_64-all/x86_64-all.config index 6a45564b..0f87091b 100644 --- a/packages/base/any/kernels/3.18.25/configs/x86_64-all/x86_64-all.config +++ b/packages/base/any/kernels/3.18.25/configs/x86_64-all/x86_64-all.config @@ -1656,8 +1656,39 @@ CONFIG_USB_NET_DRIVERS=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_RTL8152 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +# CONFIG_USB_NET_AX88179_178A is not set +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +CONFIG_USB_NET_CDC_NCM=y +# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set +# CONFIG_USB_NET_CDC_MBIM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SR9700 is not set +# CONFIG_USB_NET_SR9800 is not set +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=y +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +CONFIG_USB_NET_CDC_SUBSET=y +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +# CONFIG_USB_ARMLINUX is not set +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=y +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_KALMIA is not set +# CONFIG_USB_NET_QMI_WWAN is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_USB_VL600 is not set # CONFIG_WLAN is not set # From 668af73f38dc744a37d4edba2c3c833bf7e29a16 Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Mon, 1 Feb 2016 10:20:32 -0800 Subject: [PATCH 7/7] updated buildroot primary mirror to github, set primary mirror only in buildroot configuration files --- .../base/any/initrds/buildroot/builds/buildroot.config-powerpc | 2 +- .../base/any/initrds/buildroot/builds/buildroot.config-x86_64 | 2 +- setup.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc b/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc index a493261a..3d6f2bd3 100644 --- a/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc +++ b/packages/base/any/initrds/buildroot/builds/buildroot.config-powerpc @@ -85,7 +85,7 @@ BR2_HOST_DIR="$(BASE_DIR)/host" # Mirrors and Download locations # BR2_PRIMARY_SITE="$(BUILDROOTMIRROR)" -# BR2_PRIMARY_SITE_ONLY is not set +BR2_PRIMARY_SITE_ONLY=y BR2_BACKUP_SITE="https://raw.githubusercontent.com/opennetworklinux/buildroot-download-cache/master/dl" BR2_KERNEL_MIRROR="http://www.kernel.org/pub/" BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu" diff --git a/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 b/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 index 6194cb4a..4cd85df1 100644 --- a/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 +++ b/packages/base/any/initrds/buildroot/builds/buildroot.config-x86_64 @@ -60,7 +60,7 @@ BR2_HOST_DIR="$(BASE_DIR)/host" # Mirrors and Download locations # BR2_PRIMARY_SITE="$(BUILDROOTMIRROR)" -# BR2_PRIMARY_SITE_ONLY is not set +BR2_PRIMARY_SITE_ONLY=y BR2_BACKUP_SITE="https://raw.githubusercontent.com/opennetworklinux/buildroot-download-cache/master/dl" BR2_KERNEL_MIRROR="http://www.kernel.org/pub/" BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu" diff --git a/setup.env b/setup.env index bbe964a8..57c6aa21 100755 --- a/setup.env +++ b/setup.env @@ -31,7 +31,7 @@ export ONLPM_OPTION_INCLUDE_ENV_JSON="$ONL/make/version-onl.json" # # buildroot download mirror. We suggest you setup a local repository containing these contents for faster local builds. # -export BUILDROOTMIRROR=${BUILDROOTMIRROR:-"http://buildroot.hw.bigswitch.com/dl"} +export BUILDROOTMIRROR=${BUILDROOTMIRROR:-"https://raw.githubusercontent.com/opennetworklinux/buildroot-download-cache/master/dl"} # These submodules are required for almost everything. $ONL/tools/submodules.py $ONL sm/infra