From 0ecbe7f4eefc1c09c27322439b657cbfa30304d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Tue, 2 Feb 2021 19:45:15 +0100 Subject: [PATCH 1/2] Upgrade buildroot minor version --- Makefile | 4 ++-- deploy/iso/minikube-iso/configs/minikube_defconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 030add33216e..320550e049ba 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ RPM_REVISION ?= 0 GO_VERSION ?= 1.15.5 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) -BUILDROOT_BRANCH ?= 2020.02.8 +BUILDROOT_BRANCH ?= 2020.02.10 REGISTRY?=gcr.io/k8s-minikube REGISTRY_GH?=docker.pkg.github.com/kubernetes/minikube @@ -68,7 +68,7 @@ MINIKUBE_BUCKET ?= minikube/releases MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download -KERNEL_VERSION ?= 4.19.157 +KERNEL_VERSION ?= 4.19.171 # latest from https://github.com/golangci/golangci-lint/releases GOLINT_VERSION ?= v1.30.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 0008346e165f..af6bd96b8109 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -21,7 +21,7 @@ BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patche BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_LATEST_VERSION=n BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.157" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.171" BR2_LINUX_KERNEL_BZIMAGE=y BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y From 384b52b9f44a86c1e97c970a320191e4b885ac87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Tue, 2 Feb 2021 19:57:12 +0100 Subject: [PATCH 2/2] Regenerate defconfig after upgrade --- .../board/coreos/minikube/linux_defconfig | 10 +++--- .../minikube-iso/configs/minikube_defconfig | 32 +++++++------------ 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig index e1ffa53665a1..25fdb0ae0c9f 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig +++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig @@ -274,25 +274,24 @@ CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_BRIDGE=m CONFIG_NET_SCHED=y +CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_PRIO=y CONFIG_NET_SCH_SFQ=y -CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_NETEM=y CONFIG_NET_SCH_INGRESS=m CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_FW=y CONFIG_NET_CLS_U32=m CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_BPF=m -CONFIG_NET_CLS_FW=y CONFIG_NET_CLS_MATCHALL=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_IPSET=y CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_BPF=m -CONFIG_IFB=m +CONFIG_NET_ACT_CONNMARK=m CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m @@ -353,6 +352,7 @@ CONFIG_MACINTOSH_DRIVERS=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_NETDEVICES=y CONFIG_DUMMY=m +CONFIG_IFB=m CONFIG_MACVLAN=y CONFIG_MACVTAP=y CONFIG_IPVLAN=m @@ -461,8 +461,8 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_XFS_FS=y -CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_QUOTA=y diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index af6bd96b8109..adedda6ff1ff 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -1,11 +1,10 @@ BR2_x86_64=y BR2_CCACHE=y BR2_OPTIMIZE_2=y +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patches" BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_BINUTILS_VERSION_2_32_X=y -BR2_GCC_VERSION_8_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="minikube" @@ -17,18 +16,17 @@ BR2_SYSTEM_BIN_SH_BASH=y # BR2_TARGET_GENERIC_GETTY is not set 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_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patches" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_LATEST_VERSION=n BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.171" -BR2_LINUX_KERNEL_BZIMAGE=y -BR2_LINUX_KERNEL_LZ4=y 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_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_GZIP=y +BR2_PACKAGE_LZ4=y BR2_PACKAGE_XZ=y +BR2_PACKAGE_STRACE=y BR2_PACKAGE_SYSDIG=y BR2_PACKAGE_FINDUTILS=y BR2_PACKAGE_GIT=y @@ -38,38 +36,32 @@ BR2_PACKAGE_NFS_UTILS=y BR2_PACKAGE_SSHFS=y BR2_PACKAGE_XFSPROGS=y BR2_PACKAGE_PARTED=y +BR2_PACKAGE_SYSSTAT=y BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_LIBOPENSSL_BIN=y +BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_BRIDGE_UTILS=y +BR2_PACKAGE_CONNTRACK_TOOLS=y BR2_PACKAGE_EBTABLES=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_IPTABLES=y -BR2_PACKAGE_PROCPS_NG=y -BR2_PACKAGE_PSMISC=y BR2_PACKAGE_RSYNC=y BR2_PACKAGE_SOCAT=y BR2_PACKAGE_SUDO=y BR2_PACKAGE_ACL=y BR2_PACKAGE_COREUTILS=y -BR2_PACKAGE_LIBCURL_CURL=y -BR2_PACKAGE_LIBOPENSSL=y -BR2_PACKAGE_LIBOPENSSL_BIN=y +BR2_PACKAGE_HTOP=y BR2_PACKAGE_OPENVMTOOLS=y +BR2_PACKAGE_PROCPS_NG=y +BR2_PACKAGE_PSMISC=y BR2_PACKAGE_SYSTEMD_LOGIND=y BR2_PACKAGE_SYSTEMD_MACHINED=y -BR2_PACKAGE_SYSTEMD_VCONSOLE=y +BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_NSENTER=y BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y -BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_TARGET_ROOTFS_ISO9660=y BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg" BR2_TARGET_SYSLINUX=y BR2_PACKAGE_HOST_E2TOOLS=y -BR2_PACKAGE_SYSTEMD_TIMESYNCD=y -BR2_PACKAGE_STRACE=y -BR2_PACKAGE_SYSSTAT=y -BR2_PACKAGE_HTOP=y -BR2_PACKAGE_CONNTRACK_TOOLS=y -BR2_PACKAGE_TAR=y -BR2_PACKAGE_LZ4=y