Skip to content

Commit a03ef5f

Browse files
authored
Merge pull request #5609 from afbjorklund/buildroot-2019.02
Upgrade Buildroot to 2019.02 and VirtualBox to 5.2
2 parents 72698ef + 2e20ddd commit a03ef5f

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RPM_VERSION ?= $(DEB_VERSION)
2929
GO_VERSION ?= 1.12.9
3030

3131
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
32-
BUILDROOT_BRANCH ?= 2018.05.3
32+
BUILDROOT_BRANCH ?= 2019.02.6
3333
REGISTRY?=gcr.io/k8s-minikube
3434

3535
# Get git commit id
@@ -49,7 +49,7 @@ MINIKUBE_BUCKET ?= minikube/releases
4949
MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
5050
MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
5151

52-
KERNEL_VERSION ?= 4.15
52+
KERNEL_VERSION ?= 4.19.76
5353
# latest from https://github.com/golangci/golangci-lint/releases
5454
GOLINT_VERSION ?= v1.20.0
5555
# Limit number of default jobs, to avoid the CI builds running out of memory

deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock

-1
This file was deleted.

deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty

Whitespace-only changes.

deploy/iso/minikube-iso/configs/minikube_defconfig

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ BR2_CCACHE=y
33
BR2_OPTIMIZE_2=y
44
BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube"
55
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
6-
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
6+
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
77
BR2_BINUTILS_VERSION_2_30_X=y
88
BR2_GCC_VERSION_7_X=y
99
BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -18,8 +18,6 @@ BR2_SYSTEM_BIN_SH_BASH=y
1818
BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/users"
1919
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/rootfs-overlay"
2020
BR2_LINUX_KERNEL=y
21-
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
22-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
2321
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2422
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux_defconfig"
2523
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y

deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
HYPERV_DAEMONS_VERSION = 4.15.1
8-
HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v${HYPERV_DAEMONS_VERSION%%.*}.x
7+
HYPERV_DAEMONS_VERSION = 4.19.76
8+
HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v4.x
99
HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz
1010

1111
define HYPERV_DAEMONS_BUILD_CMDS
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS
22
sha256 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 VirtualBox-5.1.38.tar.bz2
33
sha256 0e7ee2c78ebf7cd0d3a933d51148bef04a64f64fb27ccf70d59cddf9ca1e517a VBoxGuestAdditions_5.1.38.iso
4+
# From http://download.virtualbox.org/virtualbox/5.2.32/SHA256SUMS
5+
sha256 ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958 VirtualBox-5.2.32.tar.bz2
6+
sha256 4311c7408a3410e6a33264a9062347d9eec04f58339a49f0a60488c0cabc8996 VBoxGuestAdditions_5.2.32.iso

deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
#
55
################################################################################
66

7-
VBOX_GUEST_VERSION = 5.1.38
7+
VBOX_GUEST_VERSION = 5.2.32
88
VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION)
99
VBOX_GUEST_LICENSE = GPLv2
1010
VBOX_GUEST_LICENSE_FILES = COPYING
1111
VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2
1212
VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso
1313

1414
define VBOX_GUEST_EXPORT_MODULES
15-
( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz )
15+
( cd $(@D)/src/VBox/Additions/linux; ./export_modules.sh modules.tar.gz )
1616
mkdir -p $(@D)/vbox-modules
1717
tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz
1818
endef
1919

2020
VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES
2121

2222
VBOX_GUEST_MODULE_SUBDIRS = vbox-modules/
23-
VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED)
23+
VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) KERN_DIR=$(LINUX_DIR)
2424

2525
define VBOX_GUEST_USERS
2626
- -1 vboxsf -1 - - - - -

0 commit comments

Comments
 (0)