From 8db8b8776ffeb6447893492ea15e49e46c17a742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 5 Jul 2020 22:08:44 +0200 Subject: [PATCH] Revert "Upgrade Buildroot to 2019.02 LTS and Linux to 5.4" This reverts commit b53518d74f07506146d3ca18e752eba2c3455642. --- Makefile | 4 ++-- deploy/iso/minikube-iso/configs/minikube_defconfig | 9 +++++---- .../package/hyperv-daemons/hyperv-daemons.mk | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1b68cdb87471..5733c145a79b 100755 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ RPM_VERSION ?= $(DEB_VERSION) GO_VERSION ?= 1.13.9 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) -BUILDROOT_BRANCH ?= 2020.02.2 +BUILDROOT_BRANCH ?= 2019.02.10 REGISTRY?=gcr.io/k8s-minikube # Get git commit id @@ -53,7 +53,7 @@ MINIKUBE_BUCKET ?= minikube/releases MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download -KERNEL_VERSION ?= 5.4.40 +KERNEL_VERSION ?= 4.19.107 # latest from https://github.com/golangci/golangci-lint/releases GOLINT_VERSION ?= v1.26.0 # Limit number of default jobs, to avoid the CI builds running out of memory diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index c413f82cf746..b1b8252df0cb 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -3,10 +3,9 @@ BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_SSP_STRONG=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y -BR2_BINUTILS_VERSION_2_32_X=y -BR2_GCC_VERSION_9_X=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 BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="minikube" @@ -37,6 +36,7 @@ BR2_PACKAGE_SSHFS=y BR2_PACKAGE_XFSPROGS=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_CURL=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_EBTABLES=y BR2_PACKAGE_ETHTOOL=y @@ -53,6 +53,7 @@ BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LIBOPENSSL=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_OPENVMTOOLS=y +BR2_PACKAGE_OPENVMTOOLS_PROCPS=y BR2_PACKAGE_SYSTEMD_LOGIND=y BR2_PACKAGE_SYSTEMD_MACHINED=y BR2_PACKAGE_SYSTEMD_VCONSOLE=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 dcc26010ee0b..3ea36bbbb00c 100644 --- a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk @@ -5,7 +5,7 @@ ################################################################################ HYPERV_DAEMONS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION)) -HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v5.x +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