Skip to content

Commit a7b8f20

Browse files
authored
Merge pull request #9523 from afbjorklund/buildroot-2020.02.7
Upgrade buildroot and kernel minor version
2 parents f9c90ac + ed00bcd commit a7b8f20

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
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.15.2
3333

3434
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
35-
BUILDROOT_BRANCH ?= 2020.02.6
35+
BUILDROOT_BRANCH ?= 2020.02.7
3636
REGISTRY?=gcr.io/k8s-minikube
3737
REGISTRY_GH?=docker.pkg.github.com/kubernetes/minikube
3838

@@ -58,7 +58,7 @@ MINIKUBE_BUCKET ?= minikube/releases
5858
MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
5959
MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
6060

61-
KERNEL_VERSION ?= 4.19.114
61+
KERNEL_VERSION ?= 4.19.150
6262
# latest from https://github.com/golangci/golangci-lint/releases
6363
GOLINT_VERSION ?= v1.30.0
6464
# Limit number of default jobs, to avoid the CI builds running out of memory

deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig

-2
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ CONFIG_VMWARE_BALLOON=m
313313
CONFIG_VMWARE_VMCI=m
314314
CONFIG_BLK_DEV_SD=y
315315
CONFIG_BLK_DEV_SR=y
316-
CONFIG_BLK_DEV_SR_VENDOR=y
317316
CONFIG_CHR_DEV_SG=y
318317
CONFIG_SCSI_CONSTANTS=y
319318
CONFIG_SCSI_SPI_ATTRS=y
@@ -408,7 +407,6 @@ CONFIG_FB_MODE_HELPERS=y
408407
CONFIG_FB_TILEBLITTING=y
409408
CONFIG_FB_EFI=y
410409
# CONFIG_LCD_CLASS_DEVICE is not set
411-
CONFIG_VGACON_SOFT_SCROLLBACK=y
412410
CONFIG_LOGO=y
413411
# CONFIG_LOGO_LINUX_MONO is not set
414412
# CONFIG_LOGO_LINUX_VGA16 is not set

deploy/iso/minikube-iso/configs/minikube_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patche
2121
BR2_LINUX_KERNEL=y
2222
BR2_LINUX_KERNEL_LATEST_VERSION=n
2323
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
24-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.114"
24+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.150"
2525
BR2_LINUX_KERNEL_BZIMAGE=y
2626
BR2_LINUX_KERNEL_LZ4=y
2727
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

0 commit comments

Comments
 (0)