From 54e4c572a09b570793329d2a889e09fc68a26dfa Mon Sep 17 00:00:00 2001 From: "Sung-Kuang (Max) Chung" Date: Wed, 7 Dec 2016 17:21:30 -0800 Subject: [PATCH 1/6] Added community support email opennetworklinux@googlegroups.com, as support@bigswitch.com "is a support line for commercial Big Switch products for customer with paid licenses." --- builds/any/installer/APKG.yml | 1 + builds/any/rootfs/APKG.yml | 1 + builds/any/swi/APKG.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/builds/any/installer/APKG.yml b/builds/any/installer/APKG.yml index 3ac280ff..1c9c8247 100644 --- a/builds/any/installer/APKG.yml +++ b/builds/any/installer/APKG.yml @@ -10,6 +10,7 @@ common: version: 0.$FNAME_RELEASE_ID copyright: Copyright 2016 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-installer-$BOOTMODE diff --git a/builds/any/rootfs/APKG.yml b/builds/any/rootfs/APKG.yml index d83a385f..e8143127 100644 --- a/builds/any/rootfs/APKG.yml +++ b/builds/any/rootfs/APKG.yml @@ -9,6 +9,7 @@ common: version: 0.$FNAME_RELEASE_ID copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-rootfs diff --git a/builds/any/swi/APKG.yml b/builds/any/swi/APKG.yml index 3614408b..48b81df0 100644 --- a/builds/any/swi/APKG.yml +++ b/builds/any/swi/APKG.yml @@ -10,6 +10,7 @@ common: version: 0.$FNAME_RELEASE_ID copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-swi From 1a90e3c514d1ab6252f136b2875e3cd03ad2d0fa Mon Sep 17 00:00:00 2001 From: "Sung-Kuang (Max) Chung" Date: Wed, 7 Dec 2016 21:56:03 -0800 Subject: [PATCH 2/6] Added community support email opennetworklinux@googlegroups.com, as support@bigswitch.com "is a support line for commercial Big Switch products for customer with paid licenses." --- docker/tools/PKG.yml | 1 + packages/base/all/boot.d/PKG.yml | 1 + packages/base/all/initrds/loader-initrd-files/PKG.yml | 1 + packages/base/all/onl-mibs/PKG.yml | 1 + packages/base/all/vendor-config-onl/PKG.yml | 1 + packages/base/amd64/kernels/kernel-3.16+deb8-x86-64-all/PKG.yml | 1 + packages/base/amd64/kernels/kernel-3.18-x68-64-all/PKG.yml | 1 + packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/PKG.yml | 1 + .../base/amd64/kernels/legacy/kernel-3.9.6-x86-64-all/PKG.yml | 1 + packages/base/amd64/upgrade/PKG.yml | 1 + packages/base/any/faultd/APKG.yml | 1 + packages/base/any/fit/buildroot/APKG.yml | 1 + packages/base/any/fit/loader/APKG.yml | 1 + packages/base/any/initrds/buildroot/APKG.yml | 1 + packages/base/any/initrds/loader/APKG.yml | 1 + packages/base/any/onlp-snmpd/APKG.yml | 1 + packages/base/any/onlp/APKG.yml | 1 + packages/base/any/oom-shim/APKG.yml | 1 + packages/base/any/templates/onlp-platform-any.yml | 1 + packages/base/any/templates/platform-config-platform.yml | 1 + packages/base/any/templates/platform-config-vendor.yml | 1 + packages/base/arm64/kernels/kernel-3.18.25-arm64-all/PKG.yml | 1 + .../base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/PKG.yml | 1 + .../powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/PKG.yml | 1 + .../powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/PKG.yml | 1 + .../powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/PKG.yml | 1 + .../accton/powerpc/powerpc-accton-as5710-54x/onlp/PKG.yml | 1 + .../accton/powerpc/powerpc-accton-as6700-32x/onlp/PKG.yml | 1 + .../platforms/accton/x86-64/x86-64-accton-wedge-16x/onlp/PKG.yml | 1 + .../accton/x86-64/x86-64-facebook-wedge100/onlp/PKG.yml | 1 + .../platforms/agema/x86-64/x86-64-agema-agc7648/onlp/PKG.yml | 1 + 31 files changed, 31 insertions(+) diff --git a/docker/tools/PKG.yml b/docker/tools/PKG.yml index 1c6f35a8..9a7db5b2 100644 --- a/docker/tools/PKG.yml +++ b/docker/tools/PKG.yml @@ -3,6 +3,7 @@ common: version: 1.1.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-docker-tools diff --git a/packages/base/all/boot.d/PKG.yml b/packages/base/all/boot.d/PKG.yml index c785401e..f27fae45 100644 --- a/packages/base/all/boot.d/PKG.yml +++ b/packages/base/all/boot.d/PKG.yml @@ -3,6 +3,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-bootd diff --git a/packages/base/all/initrds/loader-initrd-files/PKG.yml b/packages/base/all/initrds/loader-initrd-files/PKG.yml index 989e15e0..bb05f8a1 100644 --- a/packages/base/all/initrds/loader-initrd-files/PKG.yml +++ b/packages/base/all/initrds/loader-initrd-files/PKG.yml @@ -3,6 +3,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-loader-initrd-files diff --git a/packages/base/all/onl-mibs/PKG.yml b/packages/base/all/onl-mibs/PKG.yml index 4838838a..d29037ff 100644 --- a/packages/base/all/onl-mibs/PKG.yml +++ b/packages/base/all/onl-mibs/PKG.yml @@ -3,6 +3,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-mibs diff --git a/packages/base/all/vendor-config-onl/PKG.yml b/packages/base/all/vendor-config-onl/PKG.yml index 80116b56..1429953f 100644 --- a/packages/base/all/vendor-config-onl/PKG.yml +++ b/packages/base/all/vendor-config-onl/PKG.yml @@ -8,6 +8,7 @@ packages: arch: all copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com summary: ONL Base Configuration Package files: diff --git a/packages/base/amd64/kernels/kernel-3.16+deb8-x86-64-all/PKG.yml b/packages/base/amd64/kernels/kernel-3.16+deb8-x86-64-all/PKG.yml index 92dca0b4..cf68e414 100644 --- a/packages/base/amd64/kernels/kernel-3.16+deb8-x86-64-all/PKG.yml +++ b/packages/base/amd64/kernels/kernel-3.16+deb8-x86-64-all/PKG.yml @@ -4,6 +4,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.16+deb8-x86-64-all diff --git a/packages/base/amd64/kernels/kernel-3.18-x68-64-all/PKG.yml b/packages/base/amd64/kernels/kernel-3.18-x68-64-all/PKG.yml index 04b5fbac..c42a515c 100644 --- a/packages/base/amd64/kernels/kernel-3.18-x68-64-all/PKG.yml +++ b/packages/base/amd64/kernels/kernel-3.18-x68-64-all/PKG.yml @@ -4,6 +4,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.18-x86-64-all diff --git a/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/PKG.yml b/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/PKG.yml index 7ef66fe0..5fc62c40 100644 --- a/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/PKG.yml +++ b/packages/base/amd64/kernels/kernel-3.2-deb7-x86-64-all/PKG.yml @@ -4,6 +4,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.2-deb7-x86-64-all diff --git a/packages/base/amd64/kernels/legacy/kernel-3.9.6-x86-64-all/PKG.yml b/packages/base/amd64/kernels/legacy/kernel-3.9.6-x86-64-all/PKG.yml index 16ccb0f1..d226cf57 100644 --- a/packages/base/amd64/kernels/legacy/kernel-3.9.6-x86-64-all/PKG.yml +++ b/packages/base/amd64/kernels/legacy/kernel-3.9.6-x86-64-all/PKG.yml @@ -7,6 +7,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.9.6-x86-64-all diff --git a/packages/base/amd64/upgrade/PKG.yml b/packages/base/amd64/upgrade/PKG.yml index fe994816..213c0b3b 100644 --- a/packages/base/amd64/upgrade/PKG.yml +++ b/packages/base/amd64/upgrade/PKG.yml @@ -11,6 +11,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-upgrade diff --git a/packages/base/any/faultd/APKG.yml b/packages/base/any/faultd/APKG.yml index 8a3aecd3..6eb1b970 100644 --- a/packages/base/any/faultd/APKG.yml +++ b/packages/base/any/faultd/APKG.yml @@ -3,6 +3,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com depends: base-files packages: - name: onl-faultd diff --git a/packages/base/any/fit/buildroot/APKG.yml b/packages/base/any/fit/buildroot/APKG.yml index 0eb35982..61eb087d 100644 --- a/packages/base/any/fit/buildroot/APKG.yml +++ b/packages/base/any/fit/buildroot/APKG.yml @@ -7,6 +7,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-buildroot-fit diff --git a/packages/base/any/fit/loader/APKG.yml b/packages/base/any/fit/loader/APKG.yml index f50de736..eed7c9a9 100644 --- a/packages/base/any/fit/loader/APKG.yml +++ b/packages/base/any/fit/loader/APKG.yml @@ -7,6 +7,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-loader-fit diff --git a/packages/base/any/initrds/buildroot/APKG.yml b/packages/base/any/initrds/buildroot/APKG.yml index c59cf6cd..b4362069 100644 --- a/packages/base/any/initrds/buildroot/APKG.yml +++ b/packages/base/any/initrds/buildroot/APKG.yml @@ -14,6 +14,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-buildroot-initrd diff --git a/packages/base/any/initrds/loader/APKG.yml b/packages/base/any/initrds/loader/APKG.yml index bb3b8793..8fe5304e 100644 --- a/packages/base/any/initrds/loader/APKG.yml +++ b/packages/base/any/initrds/loader/APKG.yml @@ -13,6 +13,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-loader-initrd diff --git a/packages/base/any/onlp-snmpd/APKG.yml b/packages/base/any/onlp-snmpd/APKG.yml index f25d43fd..76214600 100644 --- a/packages/base/any/onlp-snmpd/APKG.yml +++ b/packages/base/any/onlp-snmpd/APKG.yml @@ -6,6 +6,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onlp-snmpd diff --git a/packages/base/any/onlp/APKG.yml b/packages/base/any/onlp/APKG.yml index b0d91c6a..a245d8ec 100644 --- a/packages/base/any/onlp/APKG.yml +++ b/packages/base/any/onlp/APKG.yml @@ -14,6 +14,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onlp diff --git a/packages/base/any/oom-shim/APKG.yml b/packages/base/any/oom-shim/APKG.yml index 6a54841f..19ccd4c3 100644 --- a/packages/base/any/oom-shim/APKG.yml +++ b/packages/base/any/oom-shim/APKG.yml @@ -13,6 +13,7 @@ common: version: 1.0.0 copyright: Copyright 2016 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com diff --git a/packages/base/any/templates/onlp-platform-any.yml b/packages/base/any/templates/onlp-platform-any.yml index 4217f793..e9580aae 100644 --- a/packages/base/any/templates/onlp-platform-any.yml +++ b/packages/base/any/templates/onlp-platform-any.yml @@ -15,6 +15,7 @@ common: arch: $ARCH copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onlp-${PLATFORM}-r0 diff --git a/packages/base/any/templates/platform-config-platform.yml b/packages/base/any/templates/platform-config-platform.yml index 22630018..0eb1edc0 100644 --- a/packages/base/any/templates/platform-config-platform.yml +++ b/packages/base/any/templates/platform-config-platform.yml @@ -13,6 +13,7 @@ packages: arch: $ARCH copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com summary: ONL Platform Configuration Package for the ${PLATFORM} files: diff --git a/packages/base/any/templates/platform-config-vendor.yml b/packages/base/any/templates/platform-config-vendor.yml index ad783f77..e89538fb 100644 --- a/packages/base/any/templates/platform-config-vendor.yml +++ b/packages/base/any/templates/platform-config-vendor.yml @@ -8,6 +8,7 @@ packages: arch: all copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com summary: ONL Configuration Package for ${Vendor} Platforms files: diff --git a/packages/base/arm64/kernels/kernel-3.18.25-arm64-all/PKG.yml b/packages/base/arm64/kernels/kernel-3.18.25-arm64-all/PKG.yml index 19302944..73ccabb3 100644 --- a/packages/base/arm64/kernels/kernel-3.18.25-arm64-all/PKG.yml +++ b/packages/base/arm64/kernels/kernel-3.18.25-arm64-all/PKG.yml @@ -4,6 +4,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.18.25-arm64-all diff --git a/packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/PKG.yml b/packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/PKG.yml index 74b43f08..68212ba9 100644 --- a/packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/PKG.yml +++ b/packages/base/armel/kernels/kernel-3.2-deb7-arm-iproc-all/PKG.yml @@ -4,6 +4,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.2-deb7-arm-iproc-all diff --git a/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/PKG.yml b/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/PKG.yml index 8ee6ee59..92613de7 100644 --- a/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/PKG.yml +++ b/packages/base/powerpc/kernels/kernel-3.2-deb7-powerpc-e500v-all/PKG.yml @@ -3,6 +3,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.2-deb7-powerpc-e500v-all diff --git a/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/PKG.yml b/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/PKG.yml index 5c8e3021..b82c53e9 100644 --- a/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/PKG.yml +++ b/packages/base/powerpc/kernels/legacy/kernel-3.8.13-powerpc-e500mc/PKG.yml @@ -7,6 +7,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.8.13-powerpc-e500mc diff --git a/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/PKG.yml b/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/PKG.yml index db9b6a3e..77254c81 100644 --- a/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/PKG.yml +++ b/packages/base/powerpc/kernels/legacy/kernel-3.9.6-powerpc-e500v/PKG.yml @@ -7,6 +7,7 @@ common: version: 1.0.0 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onl-kernel-3.9.6-powerpc-e500v diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/onlp/PKG.yml b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/onlp/PKG.yml index 5fa1f690..33609f93 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/onlp/PKG.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as5710-54x/onlp/PKG.yml @@ -12,6 +12,7 @@ common: arch: powerpc copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com packages: - name: onlp-${r0_platform}-r0 diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/onlp/PKG.yml b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/onlp/PKG.yml index d136d719..a6e6ef18 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/onlp/PKG.yml +++ b/packages/platforms/accton/powerpc/powerpc-accton-as6700-32x/onlp/PKG.yml @@ -8,6 +8,7 @@ common: arch: powerpc copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com changelog: Change changes changes., diff --git a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/onlp/PKG.yml b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/onlp/PKG.yml index c4d50cf4..537216ac 100644 --- a/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/onlp/PKG.yml +++ b/packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/onlp/PKG.yml @@ -7,6 +7,7 @@ common: arch: amd64 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com comment: dummy package for ONLP on Wedge packages: - name: onlp-${platform} diff --git a/packages/platforms/accton/x86-64/x86-64-facebook-wedge100/onlp/PKG.yml b/packages/platforms/accton/x86-64/x86-64-facebook-wedge100/onlp/PKG.yml index 10caa7f6..cd4f59d4 100644 --- a/packages/platforms/accton/x86-64/x86-64-facebook-wedge100/onlp/PKG.yml +++ b/packages/platforms/accton/x86-64/x86-64-facebook-wedge100/onlp/PKG.yml @@ -7,6 +7,7 @@ common: arch: amd64 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com comment: dummy package for ONLP on Wedge packages: - name: onlp-${platform} diff --git a/packages/platforms/agema/x86-64/x86-64-agema-agc7648/onlp/PKG.yml b/packages/platforms/agema/x86-64/x86-64-agema-agc7648/onlp/PKG.yml index 46f47033..0d5a8293 100644 --- a/packages/platforms/agema/x86-64/x86-64-agema-agc7648/onlp/PKG.yml +++ b/packages/platforms/agema/x86-64/x86-64-agema-agc7648/onlp/PKG.yml @@ -7,6 +7,7 @@ common: arch: amd64 copyright: Copyright 2013, 2014, 2015 Big Switch Networks maintainer: support@bigswitch.com + support: opennetworklinux@googlegroups.com comment: dummy package for ONLP on Wedge packages: - name: onlp-${platform} From b8c67183eab1c45c5a173451d226dd0aad39cf24 Mon Sep 17 00:00:00 2001 From: brandonchuang Date: Fri, 9 Dec 2016 17:28:10 +0800 Subject: [PATCH 3/6] Fix FAN1 and FAN2 id reversed issue --- .../onlp/builds/src/module/src/fani.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/onlp/builds/src/module/src/fani.c b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/onlp/builds/src/module/src/fani.c index 5544c9f8..c3e4abf9 100644 --- a/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/accton/powerpc/powerpc-accton-as4600-54t/onlp/builds/src/module/src/fani.c @@ -37,10 +37,10 @@ /* FAN status mask */ -#define CPLD_FAN_1_PRESENT_BIT_MASK 0x80 -#define CPLD_FAN_2_PRESENT_BIT_MASK 0x40 -#define CPLD_FAN_1_DIRECTION_BIT_MASK 0x20 -#define CPLD_FAN_2_DIRECTION_BIT_MASK 0x10 +#define CPLD_FAN_1_PRESENT_BIT_MASK 0x40 +#define CPLD_FAN_2_PRESENT_BIT_MASK 0x80 +#define CPLD_FAN_1_DIRECTION_BIT_MASK 0x10 +#define CPLD_FAN_2_DIRECTION_BIT_MASK 0x20 #define CPLD_PSU_FAN_STATUS_BIT_MASK 0x8 #define CPLD_PSU_POWER_GOOD_MASK 0x10 #define CPLD_PSU_PRESENT_BIT_MASK 0x80 @@ -52,13 +52,13 @@ /* FAN status register in the ADT7473 */ -#define I2C_FAN_1_STATUS_REG_TACH_1_LOW 0x28 -#define I2C_FAN_1_STATUS_REG_TACH_1_HIGH 0x29 -#define I2C_FAN_2_STATUS_REG_TACH_3_LOW 0x2C -#define I2C_FAN_2_STATUS_REG_TACH_3_HIGH 0x2D +#define I2C_FAN_1_STATUS_REG_TACH_1_LOW 0x2C +#define I2C_FAN_1_STATUS_REG_TACH_1_HIGH 0x2D +#define I2C_FAN_2_STATUS_REG_TACH_3_LOW 0x28 +#define I2C_FAN_2_STATUS_REG_TACH_3_HIGH 0x29 -#define I2C_FAN_1_DUTY_CYCLE_REG_PWM_1 0x30 -#define I2C_FAN_2_DUTY_CYCLE_REG_PWM_3 0x32 +#define I2C_FAN_1_DUTY_CYCLE_REG_PWM_1 0x32 +#define I2C_FAN_2_DUTY_CYCLE_REG_PWM_3 0x30 #define I2C_AC_PSU_CHICONY_REG_FAN_SPEED 0x90 #define I2C_AC_PSU_CHICONY_REG_FAN_COMMAND 0x3B From aada217a4c7698f227f1abc384f935f6dc5b28fb Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 13 Dec 2016 21:31:41 +0000 Subject: [PATCH 4/6] Use /bin/sh instead of /bin/bash (for execution under the loader). --- packages/base/all/vendor-config-onl/src/bin/onlswi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/base/all/vendor-config-onl/src/bin/onlswi b/packages/base/all/vendor-config-onl/src/bin/onlswi index e228dc40..c57d2c7b 100755 --- a/packages/base/all/vendor-config-onl/src/bin/onlswi +++ b/packages/base/all/vendor-config-onl/src/bin/onlswi @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################################################ onlfs mount images --rw (cd /mnt/onl/images && rm -f *.swi && wget $1) From 201832017430b427d11090a8037df48baa9a04f7 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 13 Dec 2016 21:32:08 +0000 Subject: [PATCH 5/6] Except only if required. --- .../all/vendor-config-onl/src/python/onl/platform/base.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py b/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py index 5d43ce15..68e7d0d9 100644 --- a/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py +++ b/packages/base/all/vendor-config-onl/src/python/onl/platform/base.py @@ -158,8 +158,12 @@ class OnlPlatformBase(object): def add_info_json(self, name, f, klass=None, required=True): if os.path.exists(f): - d = json.load(file(f)) - self.add_info_dict(name, d, klass) + try: + d = json.load(file(f)) + self.add_info_dict(name, d, klass) + except ValueError, e: + if required: + raise e elif required: raise RuntimeError("A required system file (%s) is missing." % f) From e458a648b5a3f98a46c74100d323d879116f7943 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Tue, 13 Dec 2016 22:01:37 +0000 Subject: [PATCH 6/6] latest --- sm/bigcode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sm/bigcode b/sm/bigcode index b5c5ef26..0b10e643 160000 --- a/sm/bigcode +++ b/sm/bigcode @@ -1 +1 @@ -Subproject commit b5c5ef26e618de765ecaf114984807172f3a500b +Subproject commit 0b10e643e80deb76b9ecb05a707c96818fd376be