Merge pull request #18020 from travier/buildroot-update

Update to buildroot 2023.02.9 & Golang 1.21.6
kubernetes · Feb 28, 2024 · d4e0a20 · d4e0a20
2 parents 995cb8e + dc93288
commit d4e0a20
Show file tree

Hide file tree

Showing 43 changed files with 228 additions and 322 deletions.
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
 HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.32.1-1708020063-17936
+ISO_VERSION ?= v1.32.1-1708638130-18020
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
@@ -44,9 +44,9 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
 
 
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
-BUILDROOT_BRANCH ?= 2021.02.12
+BUILDROOT_BRANCH ?= 2023.02.9
 # the go version on the line below is for the ISO
-GOLANG_OPTIONS = GO_VERSION=1.19.9 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
+GOLANG_OPTIONS = GO_VERSION=1.21.6 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
 BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS)
 REGISTRY ?= gcr.io/k8s-minikube
 
@@ -76,7 +76,7 @@ MINIKUBE_BUCKET ?= minikube/releases
 MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
 MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 
-KERNEL_VERSION ?= 5.10.57
+KERNEL_VERSION ?= 5.10.207
 # latest from https://github.com/golangci/golangci-lint/releases
 # update this only by running `make update-golint-version`
 GOLINT_VERSION ?= v1.56.2
@@ -303,10 +303,9 @@ minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/
 		cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \
 		git --git-dir=$(BUILD_DIR)/buildroot/.git config user.email "[email protected]"; \
 		git --git-dir=$(BUILD_DIR)/buildroot/.git config user.name "Random developer"; \
-		git --git-dir=$(BUILD_DIR)/buildroot/.git --work-tree=$(BUILD_DIR)/buildroot am ../../deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch; \
 	fi;
 	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig
-	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python3
 	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$*
 	# x86_64 ISO is still BIOS rather than EFI because of AppArmor issues for KVM, and Gen 2 issues for Hyper-V
 	if [ "$*" = "aarch64" ]; then \
@@ -1087,6 +1086,11 @@ update-cri-o-version:
 	(cd hack/update/cri-o_version && \
 	 go run update_cri-o_version.go)
 
+.PHONY: update-crun-version
+update-crun-version:
+	(cd hack/update/crun_version && \
+	 go run update_crun_version.go)
+
 .PHONY: update-metrics-server-version
 update-metrics-server-version:
 	(cd hack/update/metrics_server_version && \

diff --git a/deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch b/deploy/iso/minikube-iso/0001-linux-add-BR2_LINUX_KERNEL_NEEDS_HOST_PAHOLE.patch
diff --git a/deploy/iso/minikube-iso/arch/aarch64/Config.in.tmpl b/deploy/iso/minikube-iso/arch/aarch64/Config.in.tmpl
@@ -1,2 +1,2 @@
 source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
-source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in" 
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in"
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
@@ -3,7 +3,7 @@ menu "System tools aarch64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-latest-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/nerdctl-bin-aarch64/Config.in"
 endmenu
diff --git a/...h64/package/cni-plugins-aarch64/Config.in → ...kage/cni-plugins-latest-aarch64/Config.in b/...h64/package/cni-plugins-aarch64/Config.in → ...kage/cni-plugins-latest-aarch64/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_CNI_PLUGINS_AARCH64
-	bool "cni-plugins"
+config BR2_PACKAGE_CNI_PLUGINS_LATEST_AARCH64
+	bool "cni-plugins-latest"
 	default y
 	depends on BR2_aarch64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
diff --git a/...kage/cni-plugins-aarch64/cni-plugins.hash → ...ns-latest-aarch64/cni-plugins-latest.hash b/...kage/cni-plugins-aarch64/cni-plugins.hash → ...ns-latest-aarch64/cni-plugins-latest.hash
diff --git a/...ackage/cni-plugins-aarch64/cni-plugins.mk → ...gins-latest-aarch64/cni-plugins-latest.mk b/...ackage/cni-plugins-aarch64/cni-plugins.mk → ...gins-latest-aarch64/cni-plugins-latest.mk
@@ -1,16 +1,16 @@
 ################################################################################
 #
-# cni-plugins
+# cni-plugins-latest
 #
 ################################################################################
 
-CNI_PLUGINS_AARCH64_VERSION = v1.4.0
-CNI_PLUGINS_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_AARCH64_VERSION)
-CNI_PLUGINS_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_AARCH64_VERSION).tgz
-CNI_PLUGINS_AARCH64_LICENSE = Apache-2.0
-CNI_PLUGINS_AARCH64_LICENSE_FILES = LICENSE
+CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.4.0
+CNI_PLUGINS_LATEST_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_AARCH64_VERSION)
+CNI_PLUGINS_LATEST_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_LATEST_AARCH64_VERSION).tgz
+CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0
+CNI_PLUGINS_LATEST_AARCH64_LICENSE_FILES = LICENSE
 
-define CNI_PLUGINS_AARCH64_INSTALL_TARGET_CMDS
+define CNI_PLUGINS_LATEST_AARCH64_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 \
 		$(@D)/bandwidth \
 		$(TARGET_DIR)/opt/cni/bin/bandwidth

diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/Config.in b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/Config.in
@@ -13,6 +13,5 @@ config BR2_PACKAGE_CONTAINERD_BIN_AARCH64
 	select BR2_PACKAGE_LIBSECCOMP
 	select BR2_PACKAGE_LIBGPGME
 	select BR2_PACKAGE_LVM2
-	select BR2_PACKAGE_LVM2_APP_LIBRARY
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_LIBGLIB2
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
@@ -23,6 +23,15 @@ CRI_DOCKERD_AARCH64_ENV = \
 CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd
 CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'"
 
+define CRI_DOCKERD_AARCH64_POST_EXTRACT_WORKAROUNDS
+	# Set -buildvcs=false to disable VCS stamping (fails in buildroot)
+	sed -i 's|go build |go build -buildvcs=false |' -i $(@D)/packaging/static/Makefile
+	# Use the GOARCH environment variable that we set
+	sed -i 's|GOARCH=$(ARCH) go build|GOARCH=$(GOARCH) go build|' -i $(@D)/packaging/static/Makefile
+endef
+
+CRI_DOCKERD_AARCH64_POST_EXTRACT_HOOKS += CRI_DOCKERD_AARCH64_POST_EXTRACT_WORKAROUNDS
+
 # If https://github.com/Mirantis/cri-dockerd/blob/master/packaging/Makefile changes, then this will almost certainly need to change
 # This uses the static make target at the top level Makefile, since that builds everything, then picks out the arm64 binary
 define CRI_DOCKERD_AARCH64_BUILD_CMDS

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
@@ -3,7 +3,7 @@ menu "System tools x86_64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins-latest/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/nerdctl-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in"

diff --git a/...arch/x86_64/package/cni-plugins/Config.in → ...6_64/package/cni-plugins-latest/Config.in b/...arch/x86_64/package/cni-plugins/Config.in → ...6_64/package/cni-plugins-latest/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_CNI_PLUGINS
-	bool "cni-plugins"
+config BR2_PACKAGE_CNI_PLUGINS_LATEST
+	bool "cni-plugins-latest"
 	default y
 	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
diff --git a/...6_64/package/cni-plugins/cni-plugins.hash → ...ni-plugins-latest/cni-plugins-latest.hash b/...6_64/package/cni-plugins/cni-plugins.hash → ...ni-plugins-latest/cni-plugins-latest.hash
diff --git a/...x86_64/package/cni-plugins/cni-plugins.mk → .../cni-plugins-latest/cni-plugins-latest.mk b/...x86_64/package/cni-plugins/cni-plugins.mk → .../cni-plugins-latest/cni-plugins-latest.mk
@@ -1,16 +1,16 @@
 ################################################################################
 #
-# cni-plugins
+# cni-plugins-latest
 #
 ################################################################################
 
-CNI_PLUGINS_VERSION = v1.4.0
-CNI_PLUGINS_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_VERSION)
-CNI_PLUGINS_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_VERSION).tgz
-CNI_PLUGINS_LICENSE = Apache-2.0
-CNI_PLUGINS_LICENSE_FILES = LICENSE
+CNI_PLUGINS_LATEST_VERSION = v1.4.0
+CNI_PLUGINS_LATEST_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_VERSION)
+CNI_PLUGINS_LATEST_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_LATEST_VERSION).tgz
+CNI_PLUGINS_LATEST_LICENSE = Apache-2.0
+CNI_PLUGINS_LATEST_LICENSE_FILES = LICENSE
 
-define CNI_PLUGINS_INSTALL_TARGET_CMDS
+define CNI_PLUGINS_LATEST_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 \
 		$(@D)/bandwidth \
 		$(TARGET_DIR)/opt/cni/bin/bandwidth

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/Config.in b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/Config.in
@@ -13,6 +13,5 @@ config BR2_PACKAGE_CONTAINERD_BIN
 	select BR2_PACKAGE_LIBSECCOMP
 	select BR2_PACKAGE_LIBGPGME
 	select BR2_PACKAGE_LVM2
-	select BR2_PACKAGE_LVM2_APP_LIBRARY
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_LIBGLIB2
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cri-dockerd/cri-dockerd.mk
@@ -23,6 +23,15 @@ CRI_DOCKERD_ENV = \
 CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
 CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"
 
+define CRI_DOCKERD_POST_EXTRACT_WORKAROUNDS
+	# Set -buildvcs=false to disable VCS stamping (fails in buildroot)
+	sed -i 's|go build |go build -buildvcs=false |' -i $(@D)/packaging/static/Makefile
+	# Use the GOARCH environment variable that we set
+	sed -i 's|GOARCH=$(ARCH) go build|GOARCH=$(GOARCH) go build|' -i $(@D)/packaging/static/Makefile
+endef
+
+CRI_DOCKERD_POST_EXTRACT_HOOKS += CRI_DOCKERD_POST_EXTRACT_WORKAROUNDS
+
 define CRI_DOCKERD_BUILD_CMDS
 	$(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) static-linux
 endef

diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/genimage.cfg b/deploy/iso/minikube-iso/board/minikube/aarch64/genimage.cfg
@@ -1,9 +1,6 @@
 image efiboot.img {
   vfat {
     label = "EFIBOOTISO"
-    file startup.nsh {
-      image = "efi-part/startup.nsh"
-    }
     file EFI {
       image = "efi-part/EFI"
     }

diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/genimage.cfg b/deploy/iso/minikube-iso/board/minikube/x86_64/genimage.cfg
@@ -1,9 +1,6 @@
 image efiboot.img {
   vfat {
     label = "EFIBOOTISO"
-    file startup.nsh {
-      image = "efi-part/startup.nsh"
-    }
     file EFI {
       image = "efi-part/EFI"
     }

diff --git a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig
@@ -17,8 +17,8 @@ BR2_PACKAGE_HOST_MTOOLS=y
 # Bootloader
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_ARM64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/grub-stub.cfg"
-BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
+BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/grub-stub.cfg"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
 
 # Filesystem / image
 BR2_TARGET_ROOTFS_CPIO=y
@@ -35,8 +35,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.57"
-BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.207"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
@@ -113,3 +112,5 @@ BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
 BR2_PACKAGE_HOST_E2TOOLS=y
 BR2_PACKAGE_HOST_PYTHON=y
 BR2_PACKAGE_LIBFUSE=y
+BR2_PACKAGE_PAHOLE=y
+BR2_PACKAGE_TBB=y
diff --git a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig
@@ -18,8 +18,8 @@ BR2_PACKAGE_HOST_MTOOLS=y
 # To turn the x86_64 ISO from BIOS to EFI, uncomment the following 7 lines and comment out the 3 lines beneath it.
 #BR2_TARGET_GRUB2=y
 #BR2_TARGET_GRUB2_X86_64_EFI=y
-#BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/grub-stub.cfg"
-#BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
+#BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/grub-stub.cfg"
+#BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
 #BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/post-build.sh"
 #BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/post-image.sh"
 #BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/genimage.cfg"
@@ -37,8 +37,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.57"
-BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.207"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
@@ -113,3 +112,5 @@ BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
 BR2_PACKAGE_HOST_E2TOOLS=y
 BR2_PACKAGE_HOST_PYTHON=y
 BR2_PACKAGE_LIBFUSE=y
+BR2_PACKAGE_PAHOLE=y
+BR2_PACKAGE_TBB=y
diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
@@ -1,10 +1,8 @@
 menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/tbb/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/sysdig/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/pahole/Config.in.host"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun-latest/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"

diff --git a/deploy/iso/minikube-iso/package/crio-bin/Config.in b/deploy/iso/minikube-iso/package/crio-bin/Config.in
@@ -14,6 +14,5 @@ config BR2_PACKAGE_CRIO_BIN
 	select BR2_PACKAGE_LIBSECCOMP
 	select BR2_PACKAGE_LIBGPGME
 	select BR2_PACKAGE_LVM2
-	select BR2_PACKAGE_LVM2_APP_LIBRARY
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_LIBGLIB2
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash
@@ -27,3 +27,5 @@ sha256 6e1c0e393cd16af907fabb24e4cc068e27c606c5f1071060d46efdcd29cb5c0d v1.22.1.
 sha256 34097a0f535aa79cf990aaee5d3ff6226663587b188cbee11089f120e7f869e4 v1.22.2.tar.gz
 sha256 52836549cfa27a688659576be9266f4837357a6fa162b1d0a05fa8da62c724b3 v1.22.3.tar.gz
 sha256 5543b96b668e964a24d5fc4af9a0e51e4c571c4c4bec5f0cf2cfd5df76debd7f v1.24.1.tar.gz
+sha256 525ea1048b303e0022d91dc7465907a9e6baf576df1c004d9422d16e3130006a v1.28.3.tar.gz
+sha256 d4f9d5a35e7e6a9838bbc052f66561d453c710d94fc47207a9e528232b878505 v1.29.1.tar.gz
diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.24.1
-CRIO_BIN_COMMIT = a3bbde8a77c323aa6a485da9a9046299155c6016
+CRIO_BIN_VERSION = v1.29.1
+CRIO_BIN_COMMIT = 78e179ba8dd3ce462382a17049e8d1f770246af1
 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme

diff --git a/...y/iso/minikube-iso/package/crun/Config.in → ...inikube-iso/package/crun-latest/Config.in b/...y/iso/minikube-iso/package/crun/Config.in → ...inikube-iso/package/crun-latest/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_CRUN
-	bool "crun"
+config BR2_PACKAGE_CRUN_LATEST
+	bool "crun-latest"
 	select BR2_PACKAGE_YAJL
 	help
 	  A fast and low-memory footprint OCI Container Runtime

diff --git a/...y/iso/minikube-iso/package/crun/crun.hash → ...-iso/package/crun-latest/crun-latest.hash b/...y/iso/minikube-iso/package/crun/crun.hash → ...-iso/package/crun-latest/crun-latest.hash
@@ -6,3 +6,4 @@ sha256 84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23  crun-0.
 sha256 e1745172bf603c6832e1a77ee2b7ac9ad4644cd0f4349704df84b66385bbbe61  crun-1.0.tar.gz
 sha256 5f2d98a13bdd7ab3c83620abc7dc29cfaf7b8f7487b5b3722453bc9619d3ea0b  crun-1.1.tar.gz
 sha256 1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978  crun-1.2.tar.gz
+sha256 f6ceb53ef6c686b1e8bc7e4a52cfac3ebec915edc6bc750ac600a8b3decb6e13 crun-1.14.tar.gz