Skip to content

Commit 22904e8

Browse files
committed
Regenerate defconfig after upgrade
1 parent 4c1053b commit 22904e8

File tree

2 files changed

+17
-25
lines changed

2 files changed

+17
-25
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -274,25 +274,24 @@ CONFIG_BRIDGE_EBT_LOG=m
274274
CONFIG_BRIDGE_EBT_NFLOG=m
275275
CONFIG_BRIDGE=m
276276
CONFIG_NET_SCHED=y
277+
CONFIG_NET_SCH_HTB=y
277278
CONFIG_NET_SCH_PRIO=y
278279
CONFIG_NET_SCH_SFQ=y
279-
CONFIG_NET_SCH_HTB=y
280280
CONFIG_NET_SCH_TBF=y
281281
CONFIG_NET_SCH_NETEM=y
282282
CONFIG_NET_SCH_INGRESS=m
283283
CONFIG_NET_CLS_BASIC=m
284+
CONFIG_NET_CLS_FW=y
284285
CONFIG_NET_CLS_U32=m
285286
CONFIG_NET_CLS_CGROUP=y
286287
CONFIG_NET_CLS_BPF=m
287-
CONFIG_NET_CLS_FW=y
288288
CONFIG_NET_CLS_MATCHALL=y
289289
CONFIG_NET_EMATCH=y
290290
CONFIG_NET_EMATCH_IPSET=y
291291
CONFIG_NET_CLS_ACT=y
292292
CONFIG_NET_ACT_MIRRED=m
293-
CONFIG_NET_ACT_CONNMARK=m
294293
CONFIG_NET_ACT_BPF=m
295-
CONFIG_IFB=m
294+
CONFIG_NET_ACT_CONNMARK=m
296295
CONFIG_OPENVSWITCH=m
297296
CONFIG_VSOCKETS=m
298297
CONFIG_VIRTIO_VSOCKETS=m
@@ -353,6 +352,7 @@ CONFIG_MACINTOSH_DRIVERS=y
353352
CONFIG_MAC_EMUMOUSEBTN=y
354353
CONFIG_NETDEVICES=y
355354
CONFIG_DUMMY=m
355+
CONFIG_IFB=m
356356
CONFIG_MACVLAN=y
357357
CONFIG_MACVTAP=y
358358
CONFIG_IPVLAN=m
@@ -461,8 +461,8 @@ CONFIG_EXT4_FS=y
461461
CONFIG_EXT4_FS_POSIX_ACL=y
462462
CONFIG_EXT4_FS_SECURITY=y
463463
CONFIG_XFS_FS=y
464-
CONFIG_XFS_POSIX_ACL=y
465464
CONFIG_XFS_QUOTA=y
465+
CONFIG_XFS_POSIX_ACL=y
466466
CONFIG_BTRFS_FS=m
467467
CONFIG_BTRFS_FS_POSIX_ACL=y
468468
CONFIG_QUOTA=y
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
BR2_x86_64=y
22
BR2_CCACHE=y
33
BR2_OPTIMIZE_2=y
4+
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patches"
45
BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube"
56
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
67
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
7-
BR2_BINUTILS_VERSION_2_32_X=y
8-
BR2_GCC_VERSION_8_X=y
98
BR2_TOOLCHAIN_BUILDROOT_CXX=y
109
BR2_GCC_ENABLE_LTO=y
1110
BR2_TARGET_GENERIC_HOSTNAME="minikube"
@@ -17,18 +16,17 @@ BR2_SYSTEM_BIN_SH_BASH=y
1716
# BR2_TARGET_GENERIC_GETTY is not set
1817
BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/users"
1918
BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/rootfs-overlay"
20-
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/patches"
2119
BR2_LINUX_KERNEL=y
22-
BR2_LINUX_KERNEL_LATEST_VERSION=n
2320
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
2421
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.171"
25-
BR2_LINUX_KERNEL_BZIMAGE=y
26-
BR2_LINUX_KERNEL_LZ4=y
2722
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2823
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux_defconfig"
24+
BR2_LINUX_KERNEL_LZ4=y
2925
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
3026
BR2_PACKAGE_GZIP=y
27+
BR2_PACKAGE_LZ4=y
3128
BR2_PACKAGE_XZ=y
29+
BR2_PACKAGE_STRACE=y
3230
BR2_PACKAGE_SYSDIG=y
3331
BR2_PACKAGE_FINDUTILS=y
3432
BR2_PACKAGE_GIT=y
@@ -38,38 +36,32 @@ BR2_PACKAGE_NFS_UTILS=y
3836
BR2_PACKAGE_SSHFS=y
3937
BR2_PACKAGE_XFSPROGS=y
4038
BR2_PACKAGE_PARTED=y
39+
BR2_PACKAGE_SYSSTAT=y
4140
BR2_PACKAGE_CA_CERTIFICATES=y
41+
BR2_PACKAGE_LIBOPENSSL_BIN=y
42+
BR2_PACKAGE_LIBCURL_CURL=y
4243
BR2_PACKAGE_BRIDGE_UTILS=y
44+
BR2_PACKAGE_CONNTRACK_TOOLS=y
4345
BR2_PACKAGE_EBTABLES=y
4446
BR2_PACKAGE_ETHTOOL=y
4547
BR2_PACKAGE_IPROUTE2=y
4648
BR2_PACKAGE_IPTABLES=y
47-
BR2_PACKAGE_PROCPS_NG=y
48-
BR2_PACKAGE_PSMISC=y
4949
BR2_PACKAGE_RSYNC=y
5050
BR2_PACKAGE_SOCAT=y
5151
BR2_PACKAGE_SUDO=y
5252
BR2_PACKAGE_ACL=y
5353
BR2_PACKAGE_COREUTILS=y
54-
BR2_PACKAGE_LIBCURL_CURL=y
55-
BR2_PACKAGE_LIBOPENSSL=y
56-
BR2_PACKAGE_LIBOPENSSL_BIN=y
54+
BR2_PACKAGE_HTOP=y
5755
BR2_PACKAGE_OPENVMTOOLS=y
56+
BR2_PACKAGE_PROCPS_NG=y
57+
BR2_PACKAGE_PSMISC=y
5858
BR2_PACKAGE_SYSTEMD_LOGIND=y
5959
BR2_PACKAGE_SYSTEMD_MACHINED=y
60-
BR2_PACKAGE_SYSTEMD_VCONSOLE=y
60+
BR2_PACKAGE_TAR=y
6161
BR2_PACKAGE_UTIL_LINUX_NSENTER=y
6262
BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
63-
BR2_TARGET_ROOTFS_CPIO=y
6463
BR2_TARGET_ROOTFS_CPIO_GZIP=y
6564
BR2_TARGET_ROOTFS_ISO9660=y
6665
BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/isolinux.cfg"
6766
BR2_TARGET_SYSLINUX=y
6867
BR2_PACKAGE_HOST_E2TOOLS=y
69-
BR2_PACKAGE_SYSTEMD_TIMESYNCD=y
70-
BR2_PACKAGE_STRACE=y
71-
BR2_PACKAGE_SYSSTAT=y
72-
BR2_PACKAGE_HTOP=y
73-
BR2_PACKAGE_CONNTRACK_TOOLS=y
74-
BR2_PACKAGE_TAR=y
75-
BR2_PACKAGE_LZ4=y

0 commit comments

Comments
 (0)