Skip to content

Commit b53518d

Browse files
committed
Upgrade Buildroot to 2019.02 LTS and Linux to 5.4
With binutils 2.32 and gcc 9 as per newer defaults Systemd requires SSP, and some legacy options gone
1 parent 63933c1 commit b53518d

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RPM_VERSION ?= $(DEB_VERSION)
3232
GO_VERSION ?= 1.13.8
3333

3434
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
35-
BUILDROOT_BRANCH ?= 2019.02.10
35+
BUILDROOT_BRANCH ?= 2020.02.2
3636
REGISTRY?=gcr.io/k8s-minikube
3737

3838
# Get git commit id
@@ -52,7 +52,7 @@ MINIKUBE_BUCKET ?= minikube/releases
5252
MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
5353
MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
5454

55-
KERNEL_VERSION ?= 4.19.107
55+
KERNEL_VERSION ?= 5.4.40
5656
# latest from https://github.com/golangci/golangci-lint/releases
5757
GOLINT_VERSION ?= v1.26.0
5858
# Limit number of default jobs, to avoid the CI builds running out of memory

deploy/iso/minikube-iso/configs/minikube_defconfig

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ 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_19=y
7-
BR2_BINUTILS_VERSION_2_30_X=y
8-
BR2_GCC_VERSION_7_X=y
6+
BR2_SSP_STRONG=y
7+
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
8+
BR2_BINUTILS_VERSION_2_32_X=y
9+
BR2_GCC_VERSION_9_X=y
910
BR2_TOOLCHAIN_BUILDROOT_CXX=y
1011
BR2_GCC_ENABLE_LTO=y
1112
BR2_TARGET_GENERIC_HOSTNAME="minikube"
@@ -36,7 +37,6 @@ BR2_PACKAGE_SSHFS=y
3637
BR2_PACKAGE_XFSPROGS=y
3738
BR2_PACKAGE_PARTED=y
3839
BR2_PACKAGE_CA_CERTIFICATES=y
39-
BR2_PACKAGE_CURL=y
4040
BR2_PACKAGE_BRIDGE_UTILS=y
4141
BR2_PACKAGE_EBTABLES=y
4242
BR2_PACKAGE_ETHTOOL=y
@@ -51,7 +51,6 @@ BR2_PACKAGE_COREUTILS=y
5151
BR2_PACKAGE_LIBRESSL=y
5252
BR2_PACKAGE_LIBRESSL_BIN=y
5353
BR2_PACKAGE_OPENVMTOOLS=y
54-
BR2_PACKAGE_OPENVMTOOLS_PROCPS=y
5554
BR2_PACKAGE_SYSTEMD_LOGIND=y
5655
BR2_PACKAGE_SYSTEMD_MACHINED=y
5756
BR2_PACKAGE_SYSTEMD_VCONSOLE=y

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
################################################################################
66

77
HYPERV_DAEMONS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
8-
HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v4.x
8+
HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v5.x
99
HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz
1010

1111
define HYPERV_DAEMONS_BUILD_CMDS

0 commit comments

Comments
 (0)