diff --git a/config/kernel-config b/config/kernel-config index d1c28ea..fba52af 100644 --- a/config/kernel-config +++ b/config/kernel-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.19 Kernel Configuration +# Linux/x86 4.9.21 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -929,7 +929,7 @@ CONFIG_TCP_CONG_HTCP=m CONFIG_TCP_CONG_HSTCP=m CONFIG_TCP_CONG_HYBLA=m CONFIG_TCP_CONG_VEGAS=m -# CONFIG_TCP_CONG_NV is not set +CONFIG_TCP_CONG_NV=m CONFIG_TCP_CONG_SCALABLE=m CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m @@ -937,8 +937,9 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m -# CONFIG_TCP_CONG_BBR is not set +CONFIG_TCP_CONG_BBR=m CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_BBR is not set # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_TCP_MD5SIG=y diff --git a/scripts/release b/scripts/release index cc50268..69c02b3 100755 --- a/scripts/release +++ b/scripts/release @@ -6,7 +6,6 @@ if ! ./scripts/ci; then echo "build failure see release.log" exit 1 fi -mv build.log dist/ echo echo "--- ${KERNEL_VERSION} Kernel prepared for RancherOS" @@ -15,7 +14,7 @@ echo " ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz" echo " ./dist/kernel/build-linux-${KERNEL_VERSION}-x86.tar.gz" echo " ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz" echo " ./dist/kernel/config" -echo " ./dist/build.log" +echo " ./release.log" echo echo "Images ready to push:" cat dist/images @@ -29,7 +28,7 @@ echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VER echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/config --name config" >> dist/publish.sh echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/extra-linux-${KERNEL_VERSION}-x86.tar.gz --name extra-linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/kernel/linux-${KERNEL_VERSION}-x86.tar.gz --name linux-${KERNEL_VERSION}-x86.tar.gz" >> dist/publish.sh -echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./dist/build.log --name build.log" >> dist/publish.sh +echo "github-release upload --user rancher --repo os-kernel --tag v${KERNEL_VERSION} --file ./release.log --name release.log" >> dist/publish.sh cat dist/images | sed 's/^/docker push /' >> dist/publish.sh chmod 755 dist/publish.sh