From 2e20dddc4aab3ac8c6f7ff09f8a200bfa9c70ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 13 Oct 2019 15:06:33 +0200 Subject: [PATCH] Upgrade Buildroot to 2019.02 and VirtualBox to 5.2 New major version of Buildroot, with new Linux kernel. Both are LTS versions, and are supported until 2020. Buildroot is upgraded from 2018.05 to 2019.02 LTS, and Linux from 4.15 to 4.19 LTS as included in BR2. Also upgrade VirtualBox to the supported 5.2 version of the older branch, so that it will work everywhere. Need to remove the legacy symlink for crio.sock from the image, since it was causing build time issues... --- Makefile | 4 ++-- .../board/coreos/minikube/rootfs-overlay/var/run/crio.sock | 1 - .../coreos/minikube/rootfs-overlay/var/run/crio/.empty | 0 deploy/iso/minikube-iso/configs/minikube_defconfig | 4 +--- .../minikube-iso/package/hyperv-daemons/hyperv-daemons.mk | 4 ++-- deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash | 3 +++ deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) delete mode 120000 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock delete mode 100644 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty diff --git a/Makefile b/Makefile index fcbd24ce16..f4efa1dfdb 100755 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ RPM_VERSION ?= $(DEB_VERSION) GO_VERSION ?= 1.12.9 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) -BUILDROOT_BRANCH ?= 2018.05.3 +BUILDROOT_BRANCH ?= 2019.02.6 REGISTRY?=gcr.io/k8s-minikube # Get git commit id @@ -49,7 +49,7 @@ MINIKUBE_BUCKET ?= minikube/releases MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download -KERNEL_VERSION ?= 4.15 +KERNEL_VERSION ?= 4.19.76 # latest from https://github.com/golangci/golangci-lint/releases GOLINT_VERSION ?= v1.20.0 # Limit number of default jobs, to avoid the CI builds running out of memory diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock deleted file mode 120000 index 2c31ff8a45..0000000000 --- a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock +++ /dev/null @@ -1 +0,0 @@ -crio/crio.sock \ No newline at end of file diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 01010e85da..abcb1c8491 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -3,7 +3,7 @@ BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_BINUTILS_VERSION_2_30_X=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -18,8 +18,6 @@ BR2_SYSTEM_BIN_SH_BASH=y BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/users" BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/rootfs-overlay" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux_defconfig" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk index a069741c65..c6f87675be 100644 --- a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk @@ -4,8 +4,8 @@ # ################################################################################ -HYPERV_DAEMONS_VERSION = 4.15.1 -HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v${HYPERV_DAEMONS_VERSION%%.*}.x +HYPERV_DAEMONS_VERSION = 4.19.76 +HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v4.x HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz define HYPERV_DAEMONS_BUILD_CMDS diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash index 191a7c833d..f8dd11fe31 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash @@ -1,3 +1,6 @@ # From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS sha256 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 VirtualBox-5.1.38.tar.bz2 sha256 0e7ee2c78ebf7cd0d3a933d51148bef04a64f64fb27ccf70d59cddf9ca1e517a VBoxGuestAdditions_5.1.38.iso +# From http://download.virtualbox.org/virtualbox/5.2.32/SHA256SUMS +sha256 ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958 VirtualBox-5.2.32.tar.bz2 +sha256 4311c7408a3410e6a33264a9062347d9eec04f58339a49f0a60488c0cabc8996 VBoxGuestAdditions_5.2.32.iso diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk index 63b9bcea5a..7b092b8695 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk @@ -4,7 +4,7 @@ # ################################################################################ -VBOX_GUEST_VERSION = 5.1.38 +VBOX_GUEST_VERSION = 5.2.32 VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION) VBOX_GUEST_LICENSE = GPLv2 VBOX_GUEST_LICENSE_FILES = COPYING @@ -12,7 +12,7 @@ VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso define VBOX_GUEST_EXPORT_MODULES - ( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz ) + ( cd $(@D)/src/VBox/Additions/linux; ./export_modules.sh modules.tar.gz ) mkdir -p $(@D)/vbox-modules tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz endef @@ -20,7 +20,7 @@ endef VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES VBOX_GUEST_MODULE_SUBDIRS = vbox-modules/ -VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) +VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) KERN_DIR=$(LINUX_DIR) define VBOX_GUEST_USERS - -1 vboxsf -1 - - - - -