From ef92c0f271a2fec657a1ff04742a36a5bea61f65 Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 14 Feb 2022 14:19:24 -0800 Subject: [PATCH 01/11] build iso with buildroot defaults --- .../minikube-iso/board/pc/genimage-bios.cfg | 23 ++++ .../minikube-iso/board/pc/genimage-efi.cfg | 32 +++++ .../iso/minikube-iso/board/pc/grub-bios.cfg | 6 + deploy/iso/minikube-iso/board/pc/grub-efi.cfg | 6 + .../iso/minikube-iso/board/pc/post-build.sh | 29 +++++ .../iso/minikube-iso/board/pc/post-image.sh | 22 ++++ .../minikube-iso/configs/minikube_defconfig | 13 ++- .../minikube-iso/configs/original_defconfig | 110 ++++++++++++++++++ .../configs/pc_x86_64_efi_defconfig | 67 +++++++++++ 9 files changed, 305 insertions(+), 3 deletions(-) create mode 100644 deploy/iso/minikube-iso/board/pc/genimage-bios.cfg create mode 100644 deploy/iso/minikube-iso/board/pc/genimage-efi.cfg create mode 100644 deploy/iso/minikube-iso/board/pc/grub-bios.cfg create mode 100644 deploy/iso/minikube-iso/board/pc/grub-efi.cfg create mode 100755 deploy/iso/minikube-iso/board/pc/post-build.sh create mode 100755 deploy/iso/minikube-iso/board/pc/post-image.sh create mode 100644 deploy/iso/minikube-iso/configs/original_defconfig create mode 100644 deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig diff --git a/deploy/iso/minikube-iso/board/pc/genimage-bios.cfg b/deploy/iso/minikube-iso/board/pc/genimage-bios.cfg new file mode 100644 index 0000000000..54026f6527 --- /dev/null +++ b/deploy/iso/minikube-iso/board/pc/genimage-bios.cfg @@ -0,0 +1,23 @@ +image disk.img { + hdimage { + } + + partition boot { + in-partition-table = "no" + image = "boot.img" + offset = 0 + size = 512 + holes = {"(440; 512)"} + } + + partition grub { + in-partition-table = "no" + image = "grub.img" + offset = 512 + } + + partition root { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg b/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg new file mode 100644 index 0000000000..035a077a78 --- /dev/null +++ b/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg @@ -0,0 +1,32 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file bzImage { + image = "bzImage" + } + } + + size = 16352K # 16MB - 32KB +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a + partition-uuid = UUID_TMP + image = "rootfs.ext2" + } +} diff --git a/deploy/iso/minikube-iso/board/pc/grub-bios.cfg b/deploy/iso/minikube-iso/board/pc/grub-bios.cfg new file mode 100644 index 0000000000..bd3e3f0006 --- /dev/null +++ b/deploy/iso/minikube-iso/board/pc/grub-bios.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /boot/bzImage root=/dev/sda1 rootwait console=tty1 +} diff --git a/deploy/iso/minikube-iso/board/pc/grub-efi.cfg b/deploy/iso/minikube-iso/board/pc/grub-efi.cfg new file mode 100644 index 0000000000..bd44666404 --- /dev/null +++ b/deploy/iso/minikube-iso/board/pc/grub-efi.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /bzImage root=PARTUUID=UUID_TMP rootwait console=tty1 +} diff --git a/deploy/iso/minikube-iso/board/pc/post-build.sh b/deploy/iso/minikube-iso/board/pc/post-build.sh new file mode 100755 index 0000000000..b32de42b62 --- /dev/null +++ b/deploy/iso/minikube-iso/board/pc/post-build.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# Copyright 2022 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -e + +BOARD_DIR=$(dirname "$0") + +# Detect boot strategy, EFI or BIOS +if [ -d "$BINARIES_DIR/efi-part/" ]; then + cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" +else + cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg" + + # Copy grub 1st stage to binaries, required for genimage + cp -f "$TARGET_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR" +fi diff --git a/deploy/iso/minikube-iso/board/pc/post-image.sh b/deploy/iso/minikube-iso/board/pc/post-image.sh new file mode 100755 index 0000000000..2665cd594d --- /dev/null +++ b/deploy/iso/minikube-iso/board/pc/post-image.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Copyright 2022 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -e + +UUID=$(dumpe2fs "$BINARIES_DIR/rootfs.ext2" 2>/dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p') +sed -i "s/UUID_TMP/$UUID/g" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" +sed "s/UUID_TMP/$UUID/g" board/pc/genimage-efi.cfg > "$BINARIES_DIR/genimage-efi.cfg" +support/scripts/genimage.sh -c "$BINARIES_DIR/genimage-efi.cfg" diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 44e17f5b2a..38ffa9b544 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -6,6 +6,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y # System BR2_SYSTEM_DHCP="eth0" +BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y # Required tools to create bootable media BR2_PACKAGE_HOST_DOSFSTOOLS=y @@ -21,9 +23,13 @@ BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gp # Filesystem / image BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/genimage.cfg" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y @@ -34,6 +40,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_CCACHE=y diff --git a/deploy/iso/minikube-iso/configs/original_defconfig b/deploy/iso/minikube-iso/configs/original_defconfig new file mode 100644 index 0000000000..44e17f5b2a --- /dev/null +++ b/deploy/iso/minikube-iso/configs/original_defconfig @@ -0,0 +1,110 @@ +# Architecture +BR2_x86_64=y + +# Toolchain +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Required tools to create bootable media +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Bootloader +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/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" + +# Filesystem / image +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_GZIP=y +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/genimage.cfg" + +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_CCACHE=y + +# Packages +BR2_PACKAGE_ACPID=y + +# Minikube + +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_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GCC_ENABLE_LTO=y +BR2_TARGET_GENERIC_HOSTNAME="minikube" +BR2_TARGET_GENERIC_ISSUE="Welcome to minikube" +BR2_TARGET_GENERIC_PASSWD_SHA512=y +BR2_INIT_SYSTEMD=y +BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/permissions" +BR2_SYSTEM_BIN_SH_BASH=y +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_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_XZ=y +BR2_PACKAGE_STRACE=y +BR2_PACKAGE_SYSDIG=y +BR2_PACKAGE_FINDUTILS=y +BR2_PACKAGE_GIT=y +BR2_PACKAGE_CIFS_UTILS=y +BR2_PACKAGE_E2TOOLS=y +BR2_PACKAGE_NFS_UTILS=y +BR2_PACKAGE_SSHFS=y +BR2_PACKAGE_XFSPROGS=y +BR2_PACKAGE_PARTED=y +BR2_PACKAGE_SYSSTAT=y +BR2_PACKAGE_LUAJIT=y +BR2_PACKAGE_LZ4=y +BR2_PACKAGE_LZ4_PROGS=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_RSYNC=y +BR2_PACKAGE_SOCAT=y +BR2_PACKAGE_SUDO=y +BR2_PACKAGE_ACL=y +BR2_PACKAGE_COREUTILS=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_TAR=y +BR2_PACKAGE_UTIL_LINUX_BINARIES=y +BR2_PACKAGE_UTIL_LINUX_LOSETUP=y +BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y +BR2_PACKAGE_UTIL_LINUX_NSENTER=y +BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=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_HOST_PYTHON=y +BR2_PACKAGE_LIBFUSE=y diff --git a/deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig b/deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig new file mode 100644 index 0000000000..4fdc93b16b --- /dev/null +++ b/deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig @@ -0,0 +1,67 @@ +# Architecture +BR2_x86_64=y + +# Toolchain, required for eudev (to autoload drivers) +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="tty1" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + +# Required tools to create bootable media +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Bootloader +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" + +# Linux headers same as kernel, a 4.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y + +# Packages +# +# Use connman so that networking setup is simpler, via connmanctl tool +# acpid is for seamless power button support +BR2_PACKAGE_ACPID=y +BR2_PACKAGE_CONNMAN=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_CONNMAN_WIFI=y \ No newline at end of file From 8b42dc26e6bcc8db236fcf6f37379f79b37ee82d Mon Sep 17 00:00:00 2001 From: klaases Date: Mon, 14 Feb 2022 16:34:15 -0800 Subject: [PATCH 02/11] Increase BR2_TARGET_ROOTFS_EXT2_SIZE --- deploy/iso/minikube-iso/configs/minikube_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 38ffa9b544..2ffd2e8902 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -28,7 +28,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-image. BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/genimage.cfg" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_SIZE="2G" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel, a 4.19 series From 9370f015ee229bfd5c96d6e00046d0130996cda2 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 16 Feb 2022 09:12:06 -0800 Subject: [PATCH 03/11] Add some logging --- .../minikube-iso/board/pc/genimage-efi.cfg | 2 +- .../iso/minikube-iso/board/pc/post-build.sh | 17 +++++++++++++++ .../iso/minikube-iso/board/pc/post-image.sh | 21 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg b/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg index 035a077a78..8924b38ba2 100644 --- a/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg +++ b/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg @@ -9,7 +9,7 @@ image efi-part.vfat { } } - size = 16352K # 16MB - 32KB + size = 65408K # 16MB - 32KB } image disk.img { diff --git a/deploy/iso/minikube-iso/board/pc/post-build.sh b/deploy/iso/minikube-iso/board/pc/post-build.sh index b32de42b62..7727ac7cd4 100755 --- a/deploy/iso/minikube-iso/board/pc/post-build.sh +++ b/deploy/iso/minikube-iso/board/pc/post-build.sh @@ -16,14 +16,31 @@ set -e +echo "1*** post-build.sh" +pwd +ls -lah + BOARD_DIR=$(dirname "$0") +echo "${BOARD_DIR}" + # Detect boot strategy, EFI or BIOS if [ -d "$BINARIES_DIR/efi-part/" ]; then + echo "1a*** boot strategy: EFI" + pwd + echo "BINARIES_DIR: $BINARIES_DIR" cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" + + echo "1b*** copy done?" + pwd + ls -lah $BINARIES_DIR/efi-part/EFI/BOOT/ + else + echo "1a*** boot strategy: BIOS" cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg" # Copy grub 1st stage to binaries, required for genimage cp -f "$TARGET_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR" fi + +echo "1z*** done" diff --git a/deploy/iso/minikube-iso/board/pc/post-image.sh b/deploy/iso/minikube-iso/board/pc/post-image.sh index 2665cd594d..1c8e0f6fc5 100755 --- a/deploy/iso/minikube-iso/board/pc/post-image.sh +++ b/deploy/iso/minikube-iso/board/pc/post-image.sh @@ -16,7 +16,28 @@ set -e +echo "2*** post-image.sh" + +pwd +ls -lah +echo "BINARIES_DIR $BINARIES_DIR" + UUID=$(dumpe2fs "$BINARIES_DIR/rootfs.ext2" 2>/dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p') + +echo "$UUID" + sed -i "s/UUID_TMP/$UUID/g" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" + +echo "2***b is grub in here?" +ls -lah $BINARIES_DIR/efi-part/EFI/BOOT/ +cat $BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg + sed "s/UUID_TMP/$UUID/g" board/pc/genimage-efi.cfg > "$BINARIES_DIR/genimage-efi.cfg" + +echo "2***c genimage-efi.cfg" +ls -lah $BINARIES_DIR +cat $BINARIES_DIR/genimage-efi.cfg + support/scripts/genimage.sh -c "$BINARIES_DIR/genimage-efi.cfg" + +echo "2***z done" \ No newline at end of file From 0135dbf438a3e223a2be1f754508c3f45a8e27d3 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 16 Feb 2022 10:15:50 -0800 Subject: [PATCH 04/11] Disable BR2_TARGET_ROOTFS_EXT2 --- deploy/iso/minikube-iso/configs/minikube_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 2ffd2e8902..0b680771a9 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -26,9 +26,9 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/genimage.cfg" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="2G" +# BR2_TARGET_ROOTFS_EXT2=y +# BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_EXT2_SIZE="2G" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel, a 4.19 series From 296920b75783bc331fa35e065f94503e3d34cc3a Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 16 Feb 2022 19:21:37 +0000 Subject: [PATCH 05/11] Working UEFI config --- Makefile | 4 +- .../board/iso/x86_64/grub-stub.cfg | 2 + .../minikube-iso/board/iso/x86_64/grub.cfg | 4 +- .../minikube-iso/board/pc/genimage-bios.cfg | 23 ---------- .../minikube-iso/board/pc/genimage-efi.cfg | 32 ------------- .../iso/minikube-iso/board/pc/grub-bios.cfg | 6 --- deploy/iso/minikube-iso/board/pc/grub-efi.cfg | 6 --- .../iso/minikube-iso/board/pc/post-build.sh | 46 ------------------- .../iso/minikube-iso/board/pc/post-image.sh | 43 ----------------- .../minikube-iso/configs/minikube_defconfig | 16 +++---- 10 files changed, 13 insertions(+), 169 deletions(-) delete mode 100644 deploy/iso/minikube-iso/board/pc/genimage-bios.cfg delete mode 100644 deploy/iso/minikube-iso/board/pc/genimage-efi.cfg delete mode 100644 deploy/iso/minikube-iso/board/pc/grub-bios.cfg delete mode 100644 deploy/iso/minikube-iso/board/pc/grub-efi.cfg delete mode 100755 deploy/iso/minikube-iso/board/pc/post-build.sh delete mode 100755 deploy/iso/minikube-iso/board/pc/post-image.sh diff --git a/Makefile b/Makefile index 44e437d5ac..a9fbde6ea2 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,7 @@ minikube_iso: deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/b $(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) host-python $(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) - mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso + mv $(BUILD_DIR)/buildroot/output/images/boot.iso $(BUILD_DIR)/minikube.iso # Change buildroot configuration for the minikube ISO .PHONY: iso-menuconfig @@ -322,7 +322,7 @@ iso_in_docker: $(ISO_BUILD_IMAGE) /bin/bash test-iso: - go test -v $(INTEGRATION_TESTS_TO_RUN) --tags=iso --minikube-start-args="--iso-url=file://$(shell pwd)/out/buildroot/output/images/rootfs.iso9660" + go test -v $(INTEGRATION_TESTS_TO_RUN) --tags=iso --minikube-start-args="--iso-url=file://$(shell pwd)/out/buildroot/output/images/boot.iso" .PHONY: test-pkg test-pkg/%: ## Trigger packaging test diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg b/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg index 92730a9730..e0b01cf7f5 100644 --- a/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg +++ b/deploy/iso/minikube-iso/board/iso/x86_64/grub-stub.cfg @@ -2,3 +2,5 @@ insmod iso9660 insmod udf search --no-floppy --label EFIBOOTISO --set root + +# used to find the cd diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg b/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg index ba43e7ca23..441c3373c1 100644 --- a/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg +++ b/deploy/iso/minikube-iso/board/iso/x86_64/grub.cfg @@ -2,6 +2,6 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /boot/vmlinuz console=tty0 rw - initrd /boot/initrd.img + linux /boot/vmlinuz console=tty0 rw # kernel + initrd /boot/initrd.img # rootfs } diff --git a/deploy/iso/minikube-iso/board/pc/genimage-bios.cfg b/deploy/iso/minikube-iso/board/pc/genimage-bios.cfg deleted file mode 100644 index 54026f6527..0000000000 --- a/deploy/iso/minikube-iso/board/pc/genimage-bios.cfg +++ /dev/null @@ -1,23 +0,0 @@ -image disk.img { - hdimage { - } - - partition boot { - in-partition-table = "no" - image = "boot.img" - offset = 0 - size = 512 - holes = {"(440; 512)"} - } - - partition grub { - in-partition-table = "no" - image = "grub.img" - offset = 512 - } - - partition root { - partition-type = 0x83 - image = "rootfs.ext2" - } -} diff --git a/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg b/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg deleted file mode 100644 index 8924b38ba2..0000000000 --- a/deploy/iso/minikube-iso/board/pc/genimage-efi.cfg +++ /dev/null @@ -1,32 +0,0 @@ -image efi-part.vfat { - vfat { - file EFI { - image = "efi-part/EFI" - } - - file bzImage { - image = "bzImage" - } - } - - size = 65408K # 16MB - 32KB -} - -image disk.img { - hdimage { - partition-table-type = "gpt" - } - - partition boot { - image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - offset = 32K - bootable = true - } - - partition root { - partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a - partition-uuid = UUID_TMP - image = "rootfs.ext2" - } -} diff --git a/deploy/iso/minikube-iso/board/pc/grub-bios.cfg b/deploy/iso/minikube-iso/board/pc/grub-bios.cfg deleted file mode 100644 index bd3e3f0006..0000000000 --- a/deploy/iso/minikube-iso/board/pc/grub-bios.cfg +++ /dev/null @@ -1,6 +0,0 @@ -set default="0" -set timeout="5" - -menuentry "Buildroot" { - linux /boot/bzImage root=/dev/sda1 rootwait console=tty1 -} diff --git a/deploy/iso/minikube-iso/board/pc/grub-efi.cfg b/deploy/iso/minikube-iso/board/pc/grub-efi.cfg deleted file mode 100644 index bd44666404..0000000000 --- a/deploy/iso/minikube-iso/board/pc/grub-efi.cfg +++ /dev/null @@ -1,6 +0,0 @@ -set default="0" -set timeout="5" - -menuentry "Buildroot" { - linux /bzImage root=PARTUUID=UUID_TMP rootwait console=tty1 -} diff --git a/deploy/iso/minikube-iso/board/pc/post-build.sh b/deploy/iso/minikube-iso/board/pc/post-build.sh deleted file mode 100755 index 7727ac7cd4..0000000000 --- a/deploy/iso/minikube-iso/board/pc/post-build.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# Copyright 2022 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -echo "1*** post-build.sh" -pwd -ls -lah - -BOARD_DIR=$(dirname "$0") - -echo "${BOARD_DIR}" - -# Detect boot strategy, EFI or BIOS -if [ -d "$BINARIES_DIR/efi-part/" ]; then - echo "1a*** boot strategy: EFI" - pwd - echo "BINARIES_DIR: $BINARIES_DIR" - cp -f "$BOARD_DIR/grub-efi.cfg" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" - - echo "1b*** copy done?" - pwd - ls -lah $BINARIES_DIR/efi-part/EFI/BOOT/ - -else - echo "1a*** boot strategy: BIOS" - cp -f "$BOARD_DIR/grub-bios.cfg" "$TARGET_DIR/boot/grub/grub.cfg" - - # Copy grub 1st stage to binaries, required for genimage - cp -f "$TARGET_DIR/lib/grub/i386-pc/boot.img" "$BINARIES_DIR" -fi - -echo "1z*** done" diff --git a/deploy/iso/minikube-iso/board/pc/post-image.sh b/deploy/iso/minikube-iso/board/pc/post-image.sh deleted file mode 100755 index 1c8e0f6fc5..0000000000 --- a/deploy/iso/minikube-iso/board/pc/post-image.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# Copyright 2022 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -echo "2*** post-image.sh" - -pwd -ls -lah -echo "BINARIES_DIR $BINARIES_DIR" - -UUID=$(dumpe2fs "$BINARIES_DIR/rootfs.ext2" 2>/dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p') - -echo "$UUID" - -sed -i "s/UUID_TMP/$UUID/g" "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" - -echo "2***b is grub in here?" -ls -lah $BINARIES_DIR/efi-part/EFI/BOOT/ -cat $BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg - -sed "s/UUID_TMP/$UUID/g" board/pc/genimage-efi.cfg > "$BINARIES_DIR/genimage-efi.cfg" - -echo "2***c genimage-efi.cfg" -ls -lah $BINARIES_DIR -cat $BINARIES_DIR/genimage-efi.cfg - -support/scripts/genimage.sh -c "$BINARIES_DIR/genimage-efi.cfg" - -echo "2***z done" \ No newline at end of file diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 0b680771a9..4c1a57fbfd 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -23,12 +23,10 @@ BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gp # Filesystem / image BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/pc/genimage.cfg" -# BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_EXT2_SIZE="2G" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/genimage.cfg" + # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel, a 4.19 series @@ -109,9 +107,9 @@ BR2_PACKAGE_UTIL_LINUX_LOSETUP=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_NSENTER=y BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=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_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_HOST_PYTHON=y BR2_PACKAGE_LIBFUSE=y From 1be70185bdfb7e92dd2f8fd5b4ad61506c7ced46 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 16 Feb 2022 21:03:30 +0000 Subject: [PATCH 06/11] Update KVM2 configuration for UEFI --- pkg/drivers/kvm/domain_definition_x86.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kvm/domain_definition_x86.go b/pkg/drivers/kvm/domain_definition_x86.go index e10fc0c441..eb8c379469 100644 --- a/pkg/drivers/kvm/domain_definition_x86.go +++ b/pkg/drivers/kvm/domain_definition_x86.go @@ -40,15 +40,17 @@ const domainTmpl = ` {{end}} - hvm + hvm + /usr/share/OVMF/OVMF_CODE.fd + /usr/share/OVMF/OVMF_VARS.fds - + - + From 276d7287f32fb6e3e6df043bcb9f097aa59635a6 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Wed, 16 Feb 2022 22:43:35 +0000 Subject: [PATCH 07/11] Updating ISO to v1.25.0-1645046644-13612 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a9fbde6ea2..441d9cc5a0 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.25.0-1644344644-13531 +ISO_VERSION ?= v1.25.0-1645046644-13612 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 38e6ff4cfa..01d5e06cd5 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -40,7 +40,7 @@ const fileScheme = "file" // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order func DefaultISOURLs() []string { v := version.GetISOVersion() - isoBucket := "minikube-builds/iso/13531" + isoBucket := "minikube-builds/iso/13612" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 495449d9b9..4e85abb478 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -68,7 +68,7 @@ minikube start [flags] --insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added. --install-addons If set, install addons. Defaults to true. (default true) --interactive Allow user prompts for more information (default true) - --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13531/minikube-v1.25.0-1644344644-13531.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.0-1644344644-13531/minikube-v1.25.0-1644344644-13531.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.0-1644344644-13531.iso]) + --iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13612/minikube-v1.25.0-1645046644-13612.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.0-1645046644-13612/minikube-v1.25.0-1645046644-13612.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.0-1645046644-13612.iso]) --keep-context This will keep the existing kubectl context and will create a minikube context. --kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.3, 'latest' for v1.23.4-rc.0). Defaults to 'stable'. --kvm-gpu Enable experimental NVIDIA GPU support in minikube From e2aa1ddd76d706451219a6c8d6dc6cad44db1c42 Mon Sep 17 00:00:00 2001 From: klaases Date: Wed, 16 Feb 2022 15:07:56 -0800 Subject: [PATCH 08/11] Remove commented defconfig settings --- .../minikube-iso/configs/minikube_defconfig | 5 - .../minikube-iso/configs/original_defconfig | 110 ------------------ .../configs/pc_x86_64_efi_defconfig | 67 ----------- 3 files changed, 182 deletions(-) delete mode 100644 deploy/iso/minikube-iso/configs/original_defconfig delete mode 100644 deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 4c1a57fbfd..1454a8316e 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -27,8 +27,6 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/pos BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y @@ -107,9 +105,6 @@ BR2_PACKAGE_UTIL_LINUX_LOSETUP=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_NSENTER=y BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=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_HOST_PYTHON=y BR2_PACKAGE_LIBFUSE=y diff --git a/deploy/iso/minikube-iso/configs/original_defconfig b/deploy/iso/minikube-iso/configs/original_defconfig deleted file mode 100644 index 44e17f5b2a..0000000000 --- a/deploy/iso/minikube-iso/configs/original_defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# Architecture -BR2_x86_64=y - -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System -BR2_SYSTEM_DHCP="eth0" - -# Required tools to create bootable media -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=y -BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/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" - -# Filesystem / image -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/iso/x86_64/genimage.cfg" - -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -BR2_CCACHE=y - -# Packages -BR2_PACKAGE_ACPID=y - -# Minikube - -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_TOOLCHAIN_BUILDROOT_CXX=y -BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="minikube" -BR2_TARGET_GENERIC_ISSUE="Welcome to minikube" -BR2_TARGET_GENERIC_PASSWD_SHA512=y -BR2_INIT_SYSTEMD=y -BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/permissions" -BR2_SYSTEM_BIN_SH_BASH=y -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_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_XZ=y -BR2_PACKAGE_STRACE=y -BR2_PACKAGE_SYSDIG=y -BR2_PACKAGE_FINDUTILS=y -BR2_PACKAGE_GIT=y -BR2_PACKAGE_CIFS_UTILS=y -BR2_PACKAGE_E2TOOLS=y -BR2_PACKAGE_NFS_UTILS=y -BR2_PACKAGE_SSHFS=y -BR2_PACKAGE_XFSPROGS=y -BR2_PACKAGE_PARTED=y -BR2_PACKAGE_SYSSTAT=y -BR2_PACKAGE_LUAJIT=y -BR2_PACKAGE_LZ4=y -BR2_PACKAGE_LZ4_PROGS=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_RSYNC=y -BR2_PACKAGE_SOCAT=y -BR2_PACKAGE_SUDO=y -BR2_PACKAGE_ACL=y -BR2_PACKAGE_COREUTILS=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_TAR=y -BR2_PACKAGE_UTIL_LINUX_BINARIES=y -BR2_PACKAGE_UTIL_LINUX_LOSETUP=y -BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y -BR2_PACKAGE_UTIL_LINUX_NSENTER=y -BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=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_HOST_PYTHON=y -BR2_PACKAGE_LIBFUSE=y diff --git a/deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig b/deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig deleted file mode 100644 index 4fdc93b16b..0000000000 --- a/deploy/iso/minikube-iso/configs/pc_x86_64_efi_defconfig +++ /dev/null @@ -1,67 +0,0 @@ -# Architecture -BR2_x86_64=y - -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System -BR2_TARGET_GENERIC_GETTY_PORT="tty1" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y - -# Required tools to create bootable media -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=y - -# Filesystem / image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set -BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" - -# Linux headers same as kernel, a 4.19 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y -BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y -BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y - -# Packages -# -# Use connman so that networking setup is simpler, via connmanctl tool -# acpid is for seamless power button support -BR2_PACKAGE_ACPID=y -BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_CLIENT=y -BR2_PACKAGE_CONNMAN_WIFI=y \ No newline at end of file From 03b064da1b3ad480e2c84e615794116db6d4975a Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 17 Feb 2022 15:33:37 -0800 Subject: [PATCH 09/11] Fix bzImage path --- deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh index b3b21c3304..3617a83a67 100755 --- a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh +++ b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh @@ -22,7 +22,7 @@ support/scripts/genimage.sh -c "$GENIMAGE_CFG" cd "$BINARIES_DIR" mkdir -p root/boot -cp bzImage root/boot/vmlinuz +cp bzImage root/boot/bzImage cp rootfs.cpio.gz root/boot/initrd.img mkdir -p root/EFI/BOOT cp efi-part/EFI/BOOT/* root/EFI/BOOT/ From d8912627818c989ff4fb25e835b42ef9c2bc08c2 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 17 Feb 2022 15:36:21 -0800 Subject: [PATCH 10/11] Match capitalization to driver.go entry --- deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh index 3617a83a67..9a6eb5de75 100755 --- a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh +++ b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh @@ -22,7 +22,7 @@ support/scripts/genimage.sh -c "$GENIMAGE_CFG" cd "$BINARIES_DIR" mkdir -p root/boot -cp bzImage root/boot/bzImage +cp bzImage root/boot/bzimage cp rootfs.cpio.gz root/boot/initrd.img mkdir -p root/EFI/BOOT cp efi-part/EFI/BOOT/* root/EFI/BOOT/ From 9786d0a1c2b3fa3706854f5f2970515dbe9bd240 Mon Sep 17 00:00:00 2001 From: klaases Date: Thu, 17 Feb 2022 15:39:47 -0800 Subject: [PATCH 11/11] Remove .img from initrd --- deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh index 9a6eb5de75..99c560f656 100755 --- a/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh +++ b/deploy/iso/minikube-iso/board/iso/x86_64/post-image.sh @@ -23,7 +23,7 @@ support/scripts/genimage.sh -c "$GENIMAGE_CFG" cd "$BINARIES_DIR" mkdir -p root/boot cp bzImage root/boot/bzimage -cp rootfs.cpio.gz root/boot/initrd.img +cp rootfs.cpio.gz root/boot/initrd mkdir -p root/EFI/BOOT cp efi-part/EFI/BOOT/* root/EFI/BOOT/ cp efiboot.img root/EFI/BOOT/