osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36511?usp=email )

Change subject: kernel-test/kernel-build: update net-next branch ......................................................................

kernel-test/kernel-build: update net-next branch

The branch of net-next is now called main. Update the default KERNEL_BRANCH to main, as the default KERNEL_URL points to net-next.git.

Related: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ Change-Id: Ic4b13c3cbc0933db9d520e6d737c45b6b08e8c48

fixup

Change-Id: Id7544960c50c948231046882e4d76085e8180f10 --- M README.md M scripts/kernel-test/kernel-build.sh 2 files changed, 19 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/11/36511/1

diff --git a/README.md b/README.md index 4c6c40a..6c2c989 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ * `KERNEL_REMOTE_NAME`: git remote name (to add multiple git repositories in the same local linux clone, default: net-next) * `KERNEL_URL`: git remote url (default: net-next.git on kernel.org) -* `KERNEL_BRANCH` branch to checkout (default: master) +* `KERNEL_BRANCH` branch to checkout (default: main) * `KERNEL_SKIP_REBUILD`: set to 1 to not build the kernel again if already built with `KERNEL_BUILD=1` * `KERNEL_SKIP_SMOKE_TEST`: don't boot up the kernel in QEMU once before diff --git a/scripts/kernel-test/kernel-build.sh b/scripts/kernel-test/kernel-build.sh index 9bd8064..bbf3e43 100755 --- a/scripts/kernel-test/kernel-build.sh +++ b/scripts/kernel-test/kernel-build.sh @@ -3,7 +3,7 @@

KERNEL_REMOTE_NAME="${KERNEL_REMOTE_NAME:-net-next}" KERNEL_URL="${KERNEL_URL:-https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git%7D" -KERNEL_BRANCH="${KERNEL_BRANCH:-master}" +KERNEL_BRANCH="${KERNEL_BRANCH:-main}" KERNEL_DIR=/cache/linux