diff --git a/.gitmodules b/.gitmodules index 88123322f032..e72b798c4f32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/Azure/sonic-swss-common [submodule "sonic-linux-kernel"] path = src/sonic-linux-kernel - url = https://github.com/Azure/sonic-linux-kernel + url = https://github.com/rspolyak/sonic-linux-kernel [submodule "sonic-sairedis"] path = src/sonic-sairedis url = https://github.com/Azure/sonic-sairedis diff --git a/Makefile b/Makefile index 49cff64ffe00..6dd4dccc56de 100644 --- a/Makefile +++ b/Makefile @@ -141,4 +141,4 @@ brcm-all: target/acs-generic.bin $(addprefix target/,docker-syncd.gz docker-orch mlnx-all: target/acs-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz) ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd -cavm-all: $(addprefix target/,docker-syncd-cavm.gz docker-orchagent-cavm.gz docker-fpm.gz) +cavm-all: target/acs-generic.bin $(addprefix target/,docker-syncd-cavm.gz docker-orchagent-cavm.gz docker-fpm.gz) diff --git a/build_image.sh b/build_image.sh index 887d63ae049f..110878eecd02 100755 --- a/build_image.sh +++ b/build_image.sh @@ -13,10 +13,10 @@ } ## Retrieval short version of Git revision hash for partition metadata -[ -z "$(git status --untracked-files=no -s)" ] || { - echo "Error: There is local changes not committed to git repo. Cannot get a revision hash for partition metadata." - exit 1 -} +#[ -z "$(git status --untracked-files=no -s)" ] || { +# echo "Error: There is local changes not committed to git repo. Cannot get a revision hash for partition metadata." +# exit 1 +#} GIT_REVISION=$(git rev-parse --short HEAD) mkdir -p `dirname $OUTPUT_ONIE_IMAGE` diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh index 58243be24283..6db5527933cc 100755 --- a/installer/x86_64/install.sh +++ b/installer/x86_64/install.sh @@ -59,6 +59,10 @@ elif [ "$onie_platform" == "x86_64-mlnx_x86-r5.0.1400" ]; then elif [ "$onie_platform" == "x86_64-dell_s6100_c2538-r0" ]; then CONSOLE_PORT=0x2f8 CONSOLE_DEV=1 +elif [ "$onie_platform" == "x86_64-accton_as7512_32x-r0" ]; then + CONSOLE_PORT=0x2f8 + CONSOLE_DEV=1 + CONSOLE_SPEED=115200 fi # Install demo on same block device as ONIE diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel index 9794d29a08a4..6864429bbf22 160000 --- a/src/sonic-linux-kernel +++ b/src/sonic-linux-kernel @@ -1 +1 @@ -Subproject commit 9794d29a08a4f81fbcd900e03072561f42b81074 +Subproject commit 6864429bbf22ed4e963f2ecbd0173879db4b2408