From 43a82bc2ac59fe3f2e0617a0b6e8db2beb42fcda Mon Sep 17 00:00:00 2001 From: ijl Date: Thu, 7 Jun 2018 23:52:57 +0000 Subject: [PATCH 1/3] linux 4.16, buildroot 2018.05 linux is upgraded to 4.16, binutils is upgraded to 2.30, and libelf is installed for the newer kernel. Other configuration changes are changes in defaults and ordering. Now using glibc 2.27. systemd 237, and Go 1.10. vbox-guest is removed because it's upstream as of linux 4.16. More on buildroot at https://git.buildroot.net/buildroot/tree/CHANGES --- Makefile | 6 +- .../{linux-4.9_defconfig => linux_defconfig} | 2 + .../minikube-iso/configs/minikube_defconfig | 19 ++---- deploy/iso/minikube-iso/package/Config.in | 1 - .../package/cri-tools/cri-tools.mk | 2 +- .../minikube-iso/package/crio-bin/crio-bin.mk | 2 +- .../minikube-iso/package/rkt-bin/rkt-bin.mk | 4 +- .../minikube-iso/package/vbox-guest/Config.in | 4 -- .../package/vbox-guest/vbox-guest.hash | 6 -- .../package/vbox-guest/vbox-guest.mk | 67 ------------------- .../package/vbox-guest/vboxservice.service | 12 ---- 11 files changed, 16 insertions(+), 109 deletions(-) rename deploy/iso/minikube-iso/board/coreos/minikube/{linux-4.9_defconfig => linux_defconfig} (99%) delete mode 100644 deploy/iso/minikube-iso/package/vbox-guest/Config.in delete mode 100644 deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash delete mode 100644 deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk delete mode 100644 deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service diff --git a/Makefile b/Makefile index c943d085df18..4025b7ce6997 100755 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ VERSION_BUILD ?= 0 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) -BUILDROOT_BRANCH ?= 2017.11 +BUILDROOT_BRANCH ?= 2018.05 REGISTRY?=gcr.io/k8s-minikube HYPERKIT_BUILD_IMAGE ?= karalabe/xgo-1.8.3 @@ -29,7 +29,7 @@ ISO_BUILD_IMAGE ?= $(REGISTRY)/buildroot-image ISO_VERSION ?= v0.26.0 ISO_BUCKET ?= minikube/iso -KERNEL_VERSION ?= 4.9.64 +KERNEL_VERSION ?= 4.16.14 GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) @@ -147,7 +147,7 @@ minikube_iso: # old target kept for making tests happy linux-menuconfig: $(MAKE) -C $(BUILD_DIR)/buildroot linux-menuconfig $(MAKE) -C $(BUILD_DIR)/buildroot linux-savedefconfig - cp $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig + cp $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig out/minikube.iso: $(shell find deploy/iso/minikube-iso -type f) ifeq ($(IN_DOCKER),1) diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig similarity index 99% rename from deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig rename to deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig index d4ce9ddf57c4..f86833b24741 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.9_defconfig +++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig @@ -504,3 +504,5 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_VHOST_VSOCK=m +CONFIG_VBOXGUEST=m +CONFIG_VBOXSF_FS=m diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index f98f32a8484e..92e606dd4c65 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -3,10 +3,8 @@ BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="4.9.64" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_BINUTILS_VERSION_2_29_X=y +BR2_KERNEL_HEADERS_4_16=y +BR2_BINUTILS_VERSION_2_30_X=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y @@ -21,28 +19,27 @@ BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/use BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/rootfs-overlay" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.64" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.14" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux-4.9_defconfig" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux_defconfig" +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_GZIP=y BR2_PACKAGE_XZ=y +BR2_PACKAGE_SYSDIG=y BR2_PACKAGE_FINDUTILS=y BR2_PACKAGE_GIT=y -BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_E2TOOLS=y BR2_PACKAGE_NFS_UTILS=y +BR2_PACKAGE_SSHFS=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_CA_CERTIFICATES=y -BR2_PACKAGE_LIBFUSE=y -BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_EBTABLES=y BR2_PACKAGE_ETHTOOL=y BR2_PACKAGE_IPROUTE2=y BR2_PACKAGE_IPTABLES=y -BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_RSYNC=y BR2_PACKAGE_SOCAT=y BR2_PACKAGE_SUDO=y @@ -59,5 +56,3 @@ 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_SYSDIG=y -BR2_PACKAGE_SSHFS=y diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 1ad69cbf0c12..b3e379f5c6dc 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -9,5 +9,4 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-kvp-daemon/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in" endmenu diff --git a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk index 825bc9c5b4e3..48d740659703 100644 --- a/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk +++ b/deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk @@ -9,7 +9,7 @@ CRI_TOOLS_SITE = https://github.com/kubernetes-incubator/cri-tools/archive CRI_TOOLS_SOURCE = $(CRI_TOOLS_VERSION).tar.gz CRI_TOOLS_LICENSE = Apache-2.0 CRI_TOOLS_LICENSE_FILES = LICENSE -CRI_TOOLS_DEPENDENCIES = +CRI_TOOLS_DEPENDENCIES = host-go CRI_TOOLS_GOPATH = $(@D)/_output CRI_TOOLS_ENV = \ CGO_ENABLED=1 \ diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index c8aaefcfd433..529554185a78 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -7,7 +7,7 @@ CRIO_BIN_VERSION = v1.10.0 CRIO_BIN_SITE = https://github.com/kubernetes-incubator/cri-o/archive CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz -CRIO_BIN_DEPENDENCIES = libgpgme +CRIO_BIN_DEPENDENCIES = host-go libgpgme CRIO_BIN_GOPATH = $(@D)/_output CRIO_BIN_ENV = \ CGO_ENABLED=1 \ diff --git a/deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk b/deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk index af6d7378934c..255b3298d033 100644 --- a/deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk +++ b/deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk @@ -18,11 +18,11 @@ define RKT_BIN_USERS endef define RKT_BIN_BUILD_CMDS - gpg2 --import $(BR2_DL_DIR)/app-signing-pubkey.gpg + gpg2 --import $(BR2_DL_DIR)/rkt-bin/app-signing-pubkey.gpg gpg2 \ --trusted-key `gpg2 --with-colons --keyid-format long -k security@coreos.com | egrep ^pub | cut -d ':' -f5` \ - --verify-files $(BR2_DL_DIR)/rkt-v$(RKT_BIN_VERSION).tar.gz.asc + --verify-files $(BR2_DL_DIR)/rkt-bin/rkt-v$(RKT_BIN_VERSION).tar.gz.asc mkdir -p $(TARGET_DIR)/var/lib/rkt endef diff --git a/deploy/iso/minikube-iso/package/vbox-guest/Config.in b/deploy/iso/minikube-iso/package/vbox-guest/Config.in deleted file mode 100644 index 14f5de70e960..000000000000 --- a/deploy/iso/minikube-iso/package/vbox-guest/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_VBOX_GUEST - bool "vbox-guest" - default y - depends on BR2_LINUX_KERNEL diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash deleted file mode 100644 index 4f9ccbf35d44..000000000000 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From http://download.virtualbox.org/virtualbox/5.1.30/MD5SUMS -md5 4dadcb625f72b8b36a374a52526c682a VirtualBox-5.1.30.tar.bz2 - -# From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS -sha256 6059b0986c9cdacc533177867634a76331ceccdcd46dddd111a50d1c42846d0b VirtualBox-5.1.30.tar.bz2 -sha256 631ca8e8d513acf43a75de56a71a31aaffb5624864c57d10346ba657d991ec1e VBoxGuestAdditions_5.1.30.iso diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk deleted file mode 100644 index 402c3b9adb7d..000000000000 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# VirtualBox Linux Guest Drivers -# -################################################################################ - -VBOX_GUEST_VERSION = 5.1.30 -VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION) -VBOX_GUEST_LICENSE = GPLv2 -VBOX_GUEST_LICENSE_FILES = COPYING -VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 -VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso - -define VBOX_GUEST_EXPORT_MODULES - ( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz ) - mkdir -p $(@D)/vbox-modules - tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz -endef - -VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES - -VBOX_GUEST_MODULE_SUBDIRS = vbox-modules -VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) - -define VBOX_GUEST_USERS - - -1 vboxsf -1 - - - - - -endef - -define VBOX_GUEST_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 \ - $(BR2_EXTERNAL_MINIKUBE_PATH)/package/vbox-guest/vboxservice.service \ - $(TARGET_DIR)/usr/lib/systemd/system/vboxservice.service - - ln -fs /usr/lib/systemd/system/vboxservice.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vboxservice.service -endef - -define VBOX_GUEST_BUILD_CMDS - 7z x -aoa $(BR2_DL_DIR)/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso -ir'!VBoxLinuxAdditions.run' -o"$(@D)" - sh $(@D)/VBoxLinuxAdditions.run --noexec --target $(@D) - tar --overwrite -C $(@D) -xjf $(@D)/VBoxGuestAdditions-amd64.tar.bz2 sbin/VBoxService - tar --overwrite -C $(@D) -xjf $(@D)/VBoxGuestAdditions-amd64.tar.bz2 bin/VBoxControl - - $(TARGET_CC) -Wall -O2 -D_GNU_SOURCE -DIN_RING3 \ - -I$(@D)/vbox-modules/vboxsf/include \ - -I$(@D)/vbox-modules/vboxsf \ - -o $(@D)/vbox-modules/mount.vboxsf \ - $(@D)/src/VBox/Additions/linux/sharedfolders/vbsfmount.c \ - $(@D)/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c -endef - -define VBOX_GUEST_INSTALL_TARGET_CMDS - $(INSTALL) -Dm755 \ - $(@D)/vbox-modules/mount.vboxsf \ - $(TARGET_DIR)/sbin - - $(INSTALL) -Dm755 \ - $(@D)/sbin/VBoxService \ - $(TARGET_DIR)/sbin - - $(INSTALL) -Dm755 \ - $(@D)/bin/VBoxControl \ - $(TARGET_DIR)/bin -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service deleted file mode 100644 index 03c8535e7f6b..000000000000 --- a/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=VirtualBox Guest Service -ConditionVirtualization=oracle - -[Service] -ExecStartPre=-/usr/sbin/modprobe vboxguest -ExecStartPre=-/usr/sbin/modprobe vboxvideo -ExecStartPre=-/usr/sbin/modprobe vboxsf -ExecStart=/usr/sbin/VBoxService -f --disable-automount - -[Install] -WantedBy=multi-user.target \ No newline at end of file From 06c1230df640266b3e08e9516d5e4666de5de235 Mon Sep 17 00:00:00 2001 From: ijl Date: Fri, 8 Jun 2018 22:01:16 +0000 Subject: [PATCH 2/3] Add make iso-menuconfig, avoid host-tar build for linux-menuconfig --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4025b7ce6997..47d4715b2fe1 100755 --- a/Makefile +++ b/Makefile @@ -142,11 +142,17 @@ minikube_iso: # old target kept for making tests happy $(MAKE) -C $(BUILD_DIR)/buildroot mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso +# Change buildroot configuration for the minikube ISO +.PHONY: iso-menuconfig +iso-menuconfig: + $(MAKE) -C $(BUILD_DIR)/buildroot menuconfig + $(MAKE) -C $(BUILD_DIR)/buildroot savedefconfig + # Change the kernel configuration for the minikube ISO .PHONY: linux-menuconfig linux-menuconfig: - $(MAKE) -C $(BUILD_DIR)/buildroot linux-menuconfig - $(MAKE) -C $(BUILD_DIR)/buildroot linux-savedefconfig + $(MAKE) -C $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/ menuconfig + $(MAKE) -C $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/ savedefconfig cp $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig out/minikube.iso: $(shell find deploy/iso/minikube-iso -type f) From 56c06a4b17ef048247130df32fcba2cbf767771b Mon Sep 17 00:00:00 2001 From: ijl Date: Fri, 8 Jun 2018 22:01:21 +0000 Subject: [PATCH 3/3] Update linux_defconfig for 4.16 --- .../board/coreos/minikube/linux_defconfig | 37 +++---------------- .../minikube-iso/configs/minikube_defconfig | 1 - 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig index f86833b24741..57049d4afff9 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig +++ b/deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig @@ -5,8 +5,6 @@ CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_BSD_PROCESS_ACCT=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_IKCONFIG=y @@ -49,7 +47,6 @@ CONFIG_SUN_PARTITION=y CONFIG_KARMA_PARTITION=y CONFIG_SMP=y CONFIG_HYPERVISOR_GUEST=y -CONFIG_PARAVIRT=y CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_KVM_DEBUG_FS=y CONFIG_CALGARY_IOMMU=y @@ -70,7 +67,6 @@ CONFIG_HIBERNATION=y CONFIG_PM_DEBUG=y CONFIG_PM_TRACE_RTC=y CONFIG_ACPI_DOCK=y -CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y @@ -184,7 +180,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_RECENT=m CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m @@ -262,6 +257,7 @@ CONFIG_NET_CLS_BPF=m CONFIG_NET_EMATCH=y CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_BPF=m +CONFIG_OPENVSWITCH=m CONFIG_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_BPF_JIT=y @@ -317,15 +313,13 @@ CONFIG_FUSION_LOGGING=y CONFIG_MACINTOSH_DRIVERS=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_NETDEVICES=y -CONFIG_MACVLAN=y CONFIG_DUMMY=m +CONFIG_MACVLAN=y CONFIG_MACVTAP=y CONFIG_VXLAN=y CONFIG_NETCONSOLE=y CONFIG_TUN=y CONFIG_VETH=y -CONFIG_OPENVSWITCH=m -CONFIG_OPENVSWITCH_VXLAN=m CONFIG_VIRTIO_NET=y CONFIG_AMD8111_ETH=m CONFIG_PCNET32=m @@ -343,7 +337,6 @@ CONFIG_FDDI=y CONFIG_VMXNET3=y CONFIG_HYPERV_NET=m CONFIG_INPUT_POLLDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_TABLET=y @@ -382,12 +375,9 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=y CONFIG_SND=y +CONFIG_SND_HRTIMER=y CONFIG_SND_SEQUENCER=y CONFIG_SND_SEQ_DUMMY=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=y CONFIG_SND_HDA_INTEL=y CONFIG_SND_HDA_HWDEP=y CONFIG_HIDRAW=y @@ -416,6 +406,8 @@ CONFIG_EDAC=y CONFIG_RTC_CLASS=y # CONFIG_RTC_HCTOSYS is not set CONFIG_DMADEVICES=y +CONFIG_VIRT_DRIVERS=y +CONFIG_VBOXGUEST=m CONFIG_VIRTIO_PCI=y CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m @@ -455,7 +447,6 @@ CONFIG_NFSD_V4=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CIFS=y -CONFIG_CIFS_SMB2=y CONFIG_9P_FS=m CONFIG_9P_FS_POSIX_ACL=y CONFIG_9P_FS_SECURITY=y @@ -473,11 +464,9 @@ CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_SCHED_DEBUG is not set CONFIG_SCHEDSTATS=y -CONFIG_TIMER_STATS=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_EARLY_PRINTK_DBGP=y -# CONFIG_DEBUG_RODATA_TEST is not set CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_OPTIMIZE_INLINING=y CONFIG_SECURITY=y @@ -486,23 +475,7 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_CRYPTO_USER_API_HASH=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_HAVE_KVM_IRQFD=y -CONFIG_HAVE_KVM_IRQ_ROUTING=y -CONFIG_HAVE_KVM_EVENTFD=y -CONFIG_KVM_MMIO=y -CONFIG_KVM_ASYNC_PF=y -CONFIG_HAVE_KVM_MSI=y -CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y -CONFIG_KVM_VFIO=y -CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y -CONFIG_KVM_COMPAT=y -CONFIG_HAVE_KVM_IRQ_BYPASS=y -CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_VHOST_VSOCK=m -CONFIG_VBOXGUEST=m -CONFIG_VBOXSF_FS=m diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 92e606dd4c65..5c431d60844b 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -3,7 +3,6 @@ BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_KERNEL_HEADERS_4_16=y BR2_BINUTILS_VERSION_2_30_X=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y