From 7806f973bb0f120443f5d0bf7506a5d3ba8af9e2 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 1 Mar 2023 00:36:32 +0100 Subject: [PATCH] Bump buildroot to 2023.02-rc2 (#2374) * Update config for Buildroot 2023.02 * Use Buildroot's version of the rtl8821cu package Buildroot provides a newer driver for the RTL8821CU based chipsets provided by https://github.com/morrownr/8821cu-20210118. * Pass argument when verifying partition table This also avoids running into a segmentation fault in the current version of sgdisk. * Remove obsolte GRUB2/NetworkManager patches * Bump buildroot * buildroot 90aa1a6daa...4832525e6c (4596): > package/runc: add support for CGroup device permission updates > package/network-manager: fix build with -Dmodem_manager=false > package/dbus-broker: bump to release 33 > package/iptables: Allow to use iptables with nf_tables backend > package/brcmfmac_sdio-firmware-rpi: bump to latest version > package/linux-firmware: Deploy fewer Intel WiFi 22000 series variants > package/linux-firmware: Add more Intel WiFi 22000 series variants > package/linux-firmware: Add Broadcom BNX2 firmware > package/rpi-firmware: bump version to 1.20230106 > Update for 2023.02-rc2 * Use Ubuntu 22.04 for CI checks * Bump xe-guest-utilities to 7.33.0 * Remove unnecessary shellcheck ignore for xe-guest-utilities * Address new buildroot check-packages issues --- .github/workflows/pr-checks.yml | 4 +- buildroot | 2 +- buildroot-external/Config.in | 1 - .../configs/generic_aarch64_defconfig | 7 +- .../configs/generic_x86_64_defconfig | 7 +- .../configs/khadas_vim3_defconfig | 7 +- .../configs/odroid_c2_defconfig | 9 +- .../configs/odroid_c4_defconfig | 9 +- .../configs/odroid_n2_defconfig | 9 +- .../configs/odroid_xu4_defconfig | 7 +- buildroot-external/configs/ova_defconfig | 7 +- buildroot-external/configs/rpi2_defconfig | 7 +- buildroot-external/configs/rpi3_64_defconfig | 7 +- buildroot-external/configs/rpi3_defconfig | 7 +- buildroot-external/configs/rpi4_64_defconfig | 7 +- buildroot-external/configs/rpi4_defconfig | 7 +- buildroot-external/configs/tinker_defconfig | 7 +- buildroot-external/configs/yellow_defconfig | 7 +- .../package/hassio/dind-import-containers.sh | 1 - .../package/rpi-rf-mod/Config.in | 6 +- .../package/rpi-rf-mod/rpi-rf-mod.mk | 6 +- ...0001-allow-arm-i386-external-control.patch | 21 - .../package/rtl8821cu/Config.in | 5 - .../package/rtl8821cu/rtl8821cu.mk | 24 - .../xe-guest-utilities/xe-guest-utilities.mk | 8 +- .../xe-guest-utilities/xe-linux-distribution | 572 ------------------ ...quash4-Fix-an-uninitialized-variable.patch | 44 -- ...dle-NoNameServers-resolved-error-and.patch | 46 -- ...dhcp4-probe-forget-lease-after-a-NAK.patch | 61 -- buildroot-external/scripts/hdd-image.sh | 2 +- 30 files changed, 93 insertions(+), 821 deletions(-) delete mode 100644 buildroot-external/package/rtl8821cu/0001-allow-arm-i386-external-control.patch delete mode 100644 buildroot-external/package/rtl8821cu/Config.in delete mode 100644 buildroot-external/package/rtl8821cu/rtl8821cu.mk delete mode 100755 buildroot-external/package/xe-guest-utilities/xe-linux-distribution delete mode 100644 buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch delete mode 100644 buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch delete mode 100644 buildroot-external/patches/network-manager/0002-n-dhcp4-probe-forget-lease-after-a-NAK.patch diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 9ddabbdea..33f616182 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -6,7 +6,7 @@ on: [pull_request] jobs: linters: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Check out code uses: actions/checkout@v3 @@ -21,7 +21,7 @@ jobs: - name: Check shell scripts uses: ludeeus/action-shellcheck@2.0.0 with: - ignore: buildroot buildroot-external/package/xe-guest-utilities + ignore: buildroot - name: Check buildroot-external packages run: | diff --git a/buildroot b/buildroot index 90aa1a6da..4832525e6 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 90aa1a6daa52eb2adfa35af955054cd471d0aff1 +Subproject commit 4832525e6caf289318c80758ccb7f26f657c032e diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 1962c6a60..33002c84f 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -12,7 +12,6 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/lxd-guest-agent/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl88x2bu/Config.in" -source "$BR2_EXTERNAL_HASSOS_PATH/package/rtl8821cu/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/tempio/Config.in.host" source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/xe-guest-utilities/Config.in" diff --git a/buildroot-external/configs/generic_aarch64_defconfig b/buildroot-external/configs/generic_aarch64_defconfig index ecc75b244..3cb1d1a76 100644 --- a/buildroot-external/configs/generic_aarch64_defconfig +++ b/buildroot-external/configs/generic_aarch64_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -87,6 +87,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig index 4ad6eb876..f6094fab9 100644 --- a/buildroot-external/configs/generic_x86_64_defconfig +++ b/buildroot-external/configs/generic_x86_64_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -89,6 +89,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig index 25d0abcfe..55469cc69 100644 --- a/buildroot-external/configs/khadas_vim3_defconfig +++ b/buildroot-external/configs/khadas_vim3_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -73,6 +73,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 306b9f0e9..65d3eaa3c 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -73,6 +73,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y @@ -121,7 +124,7 @@ BR2_PACKAGE_OS_AGENT=y BR2_PACKAGE_OS_AGENT_BOARD="OdroidC2" BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RPI_RF_MOD_DTS=y -BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2=y +BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C2=y BR2_PACKAGE_RTL88X2BU=y BR2_PACKAGE_RTL8821CU=y BR2_PACKAGE_HOST_TEMPIO=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 350cdd2b0..3da12d1f4 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -71,6 +71,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y @@ -120,7 +123,7 @@ BR2_PACKAGE_OS_AGENT=y BR2_PACKAGE_OS_AGENT_BOARD="OdroidC4" BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RPI_RF_MOD_DTS=y -BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4=y +BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C4=y BR2_PACKAGE_RTL88X2BU=y BR2_PACKAGE_RTL8821CU=y BR2_PACKAGE_HOST_TEMPIO=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 19c0d84bb..46382033d 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -73,6 +73,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y @@ -122,7 +125,7 @@ BR2_PACKAGE_OS_AGENT=y BR2_PACKAGE_OS_AGENT_BOARD="OdroidN2" BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RPI_RF_MOD_DTS=y -BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2=y +BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_N2=y BR2_PACKAGE_RTL88X2BU=y BR2_PACKAGE_RTL8821CU=y BR2_PACKAGE_HOST_TEMPIO=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 45d349442..cd457b37b 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -7,8 +7,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -73,6 +73,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 32803b544..c39d9b55d 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -6,8 +6,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -87,6 +87,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 5d59d11ee..48e781be9 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -8,8 +8,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -76,6 +76,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 3293c03bb..90d026259 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -7,8 +7,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -78,6 +78,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index bb6301cf1..465e7e42c 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -8,8 +8,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -79,6 +79,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 41c0aba71..425a157b3 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -7,8 +7,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -79,6 +79,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index ff106fafb..6400a3d3e 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -8,8 +8,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -78,6 +78,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index e8b9b3ac3..a3a8958f2 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -8,8 +8,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -74,6 +74,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index 04093eb30..3f8e50aa4 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -7,8 +7,8 @@ BR2_OPTIMIZE_2=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/patches" BR2_SSP_REGULAR=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_GCC_VERSION_9_X=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GCC_VERSION_11_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_GCC_ENABLE_LTO=y BR2_TARGET_GENERIC_HOSTNAME="homeassistant" @@ -79,6 +79,9 @@ BR2_PACKAGE_NETWORK_MANAGER=y BR2_PACKAGE_IPTABLES_NFTABLES=y BR2_PACKAGE_IPTABLES_NFTABLES_DEFAULT=y BR2_PACKAGE_WIRELESS_REGDB=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y BR2_PACKAGE_WPA_SUPPLICANT_WEXT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y diff --git a/buildroot-external/package/hassio/dind-import-containers.sh b/buildroot-external/package/hassio/dind-import-containers.sh index ece7bdc0d..639d421e4 100755 --- a/buildroot-external/package/hassio/dind-import-containers.sh +++ b/buildroot-external/package/hassio/dind-import-containers.sh @@ -27,4 +27,3 @@ docker tag "${supervisor}" "ghcr.io/home-assistant/${arch}-hassio-supervisor:lat # Setup AppArmor mkdir -p "/data/supervisor/apparmor" wget -O "/data/supervisor/apparmor/hassio-supervisor" "${APPARMOR_URL}" - diff --git a/buildroot-external/package/rpi-rf-mod/Config.in b/buildroot-external/package/rpi-rf-mod/Config.in index d4d699d8a..6b3b22ec8 100644 --- a/buildroot-external/package/rpi-rf-mod/Config.in +++ b/buildroot-external/package/rpi-rf-mod/Config.in @@ -24,17 +24,17 @@ config BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER help For the ASUS Tinkerboard -config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4 +config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C4 bool "Odroid-C4" help For the Odroid-C4 -config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2 +config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_N2 bool "Odroid-N2" help For the Odroid-N2 -config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2 +config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C2 bool "Odroid-C2" help For the Odroid-C2 diff --git a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk index 0e2412f54..23a203e2a 100644 --- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk +++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk @@ -27,13 +27,13 @@ ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_RPI),y) else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER),y) # ASUS Tinkerboard DTS file RPI_RF_MOD_DTS_FILE = rpi-rf-mod-tinker -else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4),y) +else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C4),y) # Odroid C4 DTS file RPI_RF_MOD_DTS_FILE = rpi-rf-mod-odroid-c4 -else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2),y) +else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_N2),y) # Odroid N2/N2+ DTS file RPI_RF_MOD_DTS_FILE = rpi-rf-mod-odroid-n2 -else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2),y) +else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID_C2),y) # Odroid C2 DTS file RPI_RF_MOD_DTS_FILE = rpi-rf-mod-odroid-c2 endif diff --git a/buildroot-external/package/rtl8821cu/0001-allow-arm-i386-external-control.patch b/buildroot-external/package/rtl8821cu/0001-allow-arm-i386-external-control.patch deleted file mode 100644 index 3cfe2ea6c..000000000 --- a/buildroot-external/package/rtl8821cu/0001-allow-arm-i386-external-control.patch +++ /dev/null @@ -1,21 +0,0 @@ -Makefile: expose platform variables - -Signed-off-by: s-ol - -diff --git a/Makefile b/Makefile -index 22bd0e0..72321a4 100755 ---- a/Makefile -+++ b/Makefile -@@ -96,9 +96,9 @@ - ###################### MP HW TX MODE FOR VHT ####################### - CONFIG_MP_VHT_HW_TX_MODE = n - ###################### Platform Related ####################### --CONFIG_PLATFORM_I386_PC = y --CONFIG_PLATFORM_ARM_RPI = n --CONFIG_PLATFORM_ARM64_RPI = n -+CONFIG_PLATFORM_I386_PC ?= n -+CONFIG_PLATFORM_ARM_RPI ?= n -+CONFIG_PLATFORM_ARM64_RPI ?= n - CONFIG_PLATFORM_ANDROID_X86 = n - CONFIG_PLATFORM_ANDROID_INTEL_X86 = n - CONFIG_PLATFORM_JB_X86 = n diff --git a/buildroot-external/package/rtl8821cu/Config.in b/buildroot-external/package/rtl8821cu/Config.in deleted file mode 100644 index 7b40e13ea..000000000 --- a/buildroot-external/package/rtl8821cu/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_RTL8821CU - tristate "Realtek 8821cu USB WiFi" - depends on BR2_LINUX_KERNEL - ---help--- - Driver for RTL8821CU USB WiFi adapters (no firmware needed). diff --git a/buildroot-external/package/rtl8821cu/rtl8821cu.mk b/buildroot-external/package/rtl8821cu/rtl8821cu.mk deleted file mode 100644 index 3077ca039..000000000 --- a/buildroot-external/package/rtl8821cu/rtl8821cu.mk +++ /dev/null @@ -1,24 +0,0 @@ -RTL8821CU_VERSION = 7caf3cc3d66c37aaa10e5cabe996353d8ac6b520 -RTL8821CU_SITE = $(call github,agners,rtl8821CU,$(RTL8821CU_VERSION)) -RTL8821CU_LICENSE = GPL-2.0 -RTL8821CU_LICENSE_FILES = LICENSE - -RTL8821CU_MODULE_MAKE_OPTS = \ - CONFIG_RTL8821CU=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KBASE=$(LINUX_DIR) \ - CROSS_COMPILE=$(TARGET_CROSS) - -ifeq (arm, $(filter arm, $(KERNEL_ARCH))) -RTL8821CU_MODULE_MAKE_OPTS += CONFIG_PLATFORM_ARM_RPI=y -RTL8821CU_MODULE_MAKE_OPTS += CONFIG_PLATFORM_ARM64_RPI=y -else -RTL8821CU_MODULE_MAKE_OPTS += CONFIG_PLATFORM_I386_PC=y -endif - -define RTL8821CU_LINUX_CONFIG_FIXUPS - $(call KCONFIG_DISABLE_OPT,CONFIG_WERROR) -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/buildroot-external/package/xe-guest-utilities/xe-guest-utilities.mk b/buildroot-external/package/xe-guest-utilities/xe-guest-utilities.mk index 046078e6c..7b5e191fb 100644 --- a/buildroot-external/package/xe-guest-utilities/xe-guest-utilities.mk +++ b/buildroot-external/package/xe-guest-utilities/xe-guest-utilities.mk @@ -4,7 +4,7 @@ # ################################################################################ -XE_GUEST_UTILITIES_VERSION = 7.30.0 +XE_GUEST_UTILITIES_VERSION = 7.33.0 XE_GUEST_UTILITIES_SITE = $(call github,xenserver,xe-guest-utilities,v$(XE_GUEST_UTILITIES_VERSION)) XE_GUEST_UTILITIES_LICENSE = BSD-2-Clause @@ -24,11 +24,13 @@ XE_GUEST_UTILITIES_XENSTORE_ALIAS = \ define XE_GUEST_UTILITIES_BUILD_CMDS cd $(@D); \ - $(TARGET_MAKE_ENV) $(MAKE) + $(HOST_GO_TARGET_ENV) $(TARGET_MAKE_ENV); \ + $(GO_BIN) mod vendor; \ + $(MAKE) endef define XE_GUEST_UTILITIES_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 $(XE_GUEST_UTILITIES_PKGDIR)/xe-linux-distribution \ + $(INSTALL) -m 755 $(@D)/build/stage/usr/sbin/xe-linux-distribution \ $(TARGET_DIR)/usr/sbin/xe-linux-distribution $(INSTALL) -m 755 $(@D)/build/stage/usr/sbin/xe-daemon \ $(TARGET_DIR)/usr/sbin/xe-daemon diff --git a/buildroot-external/package/xe-guest-utilities/xe-linux-distribution b/buildroot-external/package/xe-guest-utilities/xe-linux-distribution deleted file mode 100755 index fc9c19ca5..000000000 --- a/buildroot-external/package/xe-guest-utilities/xe-linux-distribution +++ /dev/null @@ -1,572 +0,0 @@ -#! /bin/sh - -# Copyright (c) 2015, Citrix Systems -# All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation and/or -# other materials provided with the distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# Script to write information about the current distribution to stdout or a file. -# Information collected: -# - Distribution name -# - Distribution version (major and minor) -# - Kernel version (uname) - -LANG="C" -export LANG - - -write_to_output() -{ - local distro="$1" - local major="$2" - local minor="$3" - local name="$4" - local uname=$(uname -r) - - if [ -n "${TEST_RESULT}" ] ; then - MAJOR=$major - MINOR=$minor - DISTRO=$distro - UNAME=$uname - NAME=$name - return 0 - fi - - echo "os_distro=\"${distro}\"" - echo "os_majorver=\"${major}\"" - echo "os_minorver=\"${minor}\"" - echo "os_uname=\"${uname}\"" - echo "os_name=\"${name}\"" - - return 0 -} - -identify_debian() -{ - local debian_version="$1" - local major - local minor - - # 3.1 - # 4.0 - # Ignores testing and unstable which contain ".*/sid". - - if [ ! -f "${debian_version}" ] ; then - return 1 - fi - - eval $(awk -F. '/^[0-9]*\.[0-9]*/ \ - { print "major="$1 ; print "minor="$2 ; exit 0 }' \ - "${debian_version}") - - if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then - return 1 - fi - - write_to_output "debian" "${major}" "${minor}" "Debian $(head -n 1 $debian_version)" - - return 0 -} - -identify_redhat() -{ - redhat_release="$1" - local distro - local major - local minor - local beta - - # distro=rhel - # Red Hat Enterprise Linux AS release 3 (Taroon Update 6) - # Red Hat Enterprise Linux AS release 3 (Taroon Update 8) - # Red Hat Enterprise Linux AS release 4 (Nahant) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 1) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 2) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 3) - # Red Hat Enterprise Linux AS release 4 (Nahant Update 4) - # Red Hat Enterprise Linux Server release 4.92 (Tikanga) - # Red Hat Enterprise Linux Server release 5 (Tikanga) - # Red Hat Enterprise Linux Server release 5.1 Beta (Tikanga) - # Red Hat Enterprise Linux release 6.0 Beta (Santiago) - - # distro=xe-ddk - # \@PRODUCT_BRAND\@ DDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@) - # Rio DDK release 0.5.6-2991c (xenenterprise) - - # distro=xe-sdk - # \@PRODUCT_BRAND\@ SDK release \@PRODUCT_VERSION\@-\@BUILD_NUMBER\@ (\@PRODUCT_NAME\@) - # Rio SDK release 0.5.6-2991c (xenenterprise) - - # distro=fedora - # Fedora Core release 3 (Heidelberg) - - # distro=centos - # CentOS release 4.0 (Final) - # CentOS release 5 (Final) - # CentOS Linux release 7.0.1406 (Core) - # CentOS Stream release 8 - - # distro=rocky - # Rocky Linux release 8.3 - - # distro=scientific - # Scientific Linux release 6.5 (Carbon) - - # distro=oracle - # Enterprise Linux Enterprise Linux Server release 5 (Carthage) - # Enterprise Linux Enterprise Linux Server release 5.5 (Carthage) - # Oracle Linux Server release 5.6 - - # distro=almalinux - # AlmaLinux release 8.3 (Purple Manul) - - if [ ! -f "${redhat_release}" ] ; then - return 1 - fi - - eval $(sed -nr \ - 's/^(.*) DDK release ([^-]*)(-(.*))? (.*)$/distro=xe-ddk;major=\2;minor=\4/gp;' \ - "${redhat_release}") - eval $(sed -n \ - -e 's/^\(.*\) SDK release \(.*\)-\(.*\) (.*)$/distro=xe-sdk;major=\2;minor=\3/gp;' \ - -e 's/^Red Hat Enterprise Linux.* release \([0-9]*\) (.* Update \(.*\))$/distro=rhel;major=\1;minor=\2/gp;'\ - -e 's/^Red Hat Enterprise Linux.* release \([0-9]*\) (.*)$/distro=rhel;major=\1/gp;' \ - -e 's/^Red Hat Enterprise Linux.* release \([0-9]*\)\.\([0-9]*\) \([Bb]eta \)\?(.*)$/distro=rhel;major=\1;minor=\2;beta=\3;/gp;' \ - -e 's/^Fedora.*release \([0-9]*\) (.*)$/distro=fedora;major=\1/gp;' \ - -e 's/^CentOS release \([0-9]*\)\.\([0-9]*\) (.*)/distro=centos;major=\1;minor=\2/gp;' \ - -e 's/^CentOS release \([0-9]*\) (.*)/distro=centos;major=\1/gp;' \ - -e 's/^CentOS Linux release \([0-9]*\)\.\([0-9]*\).*$/distro=centos;major=\1;minor=\2/gp;' \ - -e 's/^CentOS Stream release \([0-9]*\).*$/distro=centos;major=\1/gp;' \ - -e 's/^Rocky Linux release \([0-9]*\)\.\([0-9]*\).*$/distro=rocky;major=\1;minor=\2/gp;' \ - -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=oracle;major=\1;minor=\2;/gp;' \ - -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\) (.*)$/distro=oracle;major=\1/gp;' \ - -e 's/^Oracle Linux Server release \([0-9]*\)\.\([0-9]*\)$/distro=oracle;major=\1;minor=\2/gp;' \ - -e 's/^Scientific Linux SL release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=scientific;major=\1;minor=\2;/gp;' \ - -e 's/^Scientific Linux release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=scientific;major=\1;minor=\2;/gp;' \ - -e 's/^AlmaLinux release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=almalinux;major=\1;minor=\2;/gp;' \ - "${redhat_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - # HACK to handle RHEL betas - if [ "${distro}" == "rhel" ] && [ ${minor} -gt 90 ] ; then - major=$(expr ${major} + 1 ) - minor=0 - beta=Beta - fi - - if [ -n "${beta}" ] ; then - minor="${minor}beta" - fi - - write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${redhat_release})" - -} - -identify_sles() -{ - suse_release="$1" - local major - local minor - local _major - - # SUSE LINUX Enterprise Server 9 (i586) - # VERSION = 9 - # - # SUSE LINUX Enterprise Server 9 (i586) - # VERSION = 9 - # PATCHLEVEL = 2 - # - # SUSE LINUX Enterprise Server 9 (i586) - # VERSION = 9 - # PATCHLEVEL = 3 - # - # SUSE Linux Enterprise Server 10 (i586) - # VERSION = 10 - # - # SUSE Linux Enterprise Server 10 (i586) - # VERSION = 10 - # PATCHLEVEL = 1 - # - # SUSE Linux Enterprise Server 11 (i586) - # VERSION = 11 - # PATCHLEVEL = 0 - # - # /etc/SuSE-release is deprecated and removed in SLE15, so use /etc/os-release to detect. - # NAME="SLES" - # VERSION="15" - # VERSION_ID="15" - # PRETTY_NAME="SUSE Linux Enterprise Server 15" - # ID="sles" - # ID_LIKE="suse" - # ANSI_COLOR="0;32" - # CPE_NAME="cpe:/o:suse:sles:15" - - if [ ! -f "${suse_release}" ] ; then - return 1 - fi - - eval $(sed -n \ - -e 's/^VERSION_ID="\([0-9]*\)\.\?\([0-9]*\)\?"$/major=\1;minor=\2;/gp' \ - -e 's/^PRETTY_NAME="SUSE L\(inux\|INUX\) Enterprise \([a-zA-Z0-9_]*\) \([0-9]*\)\( SP[0-9]*\)\?"/_major=\3;_pretty_name=\0;/gp' \ - -e 's/^SUSE L\(inux\|INUX\) Enterprise \([a-zA-Z0-9_]*\) \([0-9]*\) (.*)/_major=\3;_pretty_name="\0";/gp;' \ - -e 's/^VERSION = \([0-9]*\)$/major=\1;/gp;' \ - -e 's/^PATCHLEVEL = \([0-9]*\)$/minor=\1;/gp;' \ - "${suse_release}") - - if [ -z "${major}" -o -z "${_major}" ] ; then - return 1 - fi - - if [ "${major}" != "${_major}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - write_to_output "sles" "${major}" "${minor}" "${_pretty_name##*=}" -} - -identify_lsb() -{ - lsb_release="$1" - - if [ ! -x "${lsb_release}" ] ; then - saved_IFS=$IFS - IFS=: - for i in $PATH ; do - if [ -x "${i}/${lsb_release}" ] ; then - lsb_release="${i}/${lsb_release}" - break - fi - done - IFS=$saved_IFS - fi - - if [ -x "${lsb_release}" ] ; then - distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z') - description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g') - release=$(${lsb_release} --short --release) - else - if [ -f /etc/lsb-release ] ; then - source /etc/lsb-release - distro="$DISTRIB_ID" - description="$DISTRIB_DESCRIPTION" - release="$DISTRIB_RELEASE" - else - return 1 - fi - fi - - if [ -z "${distro}" -o -z "${release}" ] ; then - return 1 - fi - - eval $(echo $release | awk -F. -- '{ subindex = index($0,"."); \ - print "major=\"" $1 "\""; \ - print "minor=\"" substr($0,subindex+1) "\"" }') - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - write_to_output "${distro}" "${major}" "${minor}" "${description}" -} - -identify_os_release() -{ - os_release="$1" - local major - local minor - - # Use /etc/os-release to detect. - # NAME="SLES" - # VERSION="15" - # VERSION_ID="15" - # PRETTY_NAME="SUSE Linux Enterprise Server 15" - # ID="sles" - # ID_LIKE="suse" - # ANSI_COLOR="0;32" - # CPE_NAME="cpe:/o:suse:sles:15" - - if [ ! -f "${os_release}" ] ; then - return 1 - fi - - source "${os_release}" - - eval $(echo "$VERSION_ID" | \ - sed -n -e 's/^\([0-9]*\)\.\?\([0-9]*\).*$/major=\1;minor=\2;/gp') - - major="${major:-unknown}" - minor="${minor:-unknown}" - - write_to_output "${ID}" "${major}" "${minor}" "${PRETTY_NAME}" -} - -identify_kylin() -{ - kylin_release="$1" - local distro - local major - local minor - - # distro - # NeoKylin Linux Security OS V5.0 (Update8) - # Neokylin Linux Security OS Server release V5 (Santiago) - # NeoKylin Linux Advanced Server release 6.5 (Berryllium) - # NeoKylin Linux Advanced Server release 7.0 - - if [ ! -f "${kylin_release}" ] ; then - return 1 - fi - - eval $(sed -rn \ - 's/^Neo[kK]ylin Linux[^0-9]+([0-9]+)\.?([0-9]+)?.*$/distro=neokylin;major=\1;minor=\2;/gp;' \ - "${kylin_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${kylin_release})" -} - -identify_asianux() -{ - asianux_release="$1" - local distro - local major - local minor - - # distro - # 'Asianux Server 4.5 (Final)' - # 'Asianux Server 4 (Hiranya SP2)' - # 'Asianux Server 4 (Hiranya SP4)' - - if [ ! -f "${asianux_release}" ] ; then - return 1 - fi - - eval $(sed -rn \ - 's/^Asianux Server ([0-9]*)\.([0-9]*) .*$/distro=asianux;major=\1;minor=\2;/gp;'` - `'s/^Asianux Server ([0-9]*) \([^0-9]*([0-9]*)\)$/distro=asianux;major=\1;minor=\2;/gp;' \ - "${asianux_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${asianux_release})" -} - -identify_turbo() -{ - turbo_release="$1" - local distro - local major - local minor - - # distro - # GreatTurbo Enterprise Server release 12.2 (Theseus) - - if [ ! -f "${turbo_release}" ] ; then - return 1 - fi - - eval $(sed -rn \ - 's/^GreatTurbo[^0-9]*([0-9]*)\.?([0-9]*)?.*$/distro=turbo;major=\1;minor=\2;/gp;' \ - "${turbo_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - write_to_output "${distro}" "${major}" "${minor}" "$(head -n 1 ${turbo_release})" -} - -identify_linx() -{ - linx_release="$1" - local distro - local major - local minor - - # distro - # '6.0.60.4' corresponds to Linx Linux 6 - # '6.0.80' corresponds to Linx Linux 8 - - - if [ ! -f "${linx_release}" ] ; then - return 1 - fi - - eval $(sed -rn \ - 's/^6.0.([0-9])0.*$/distro=linx;major=\1;minor=0;/gp;' \ - "${linx_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - linx_osname="Linx Linux ${major}.${minor}" - write_to_output "${distro}" "${major}" "${minor}" "${linx_osname}" -} - -identify_yinhe() -{ - yinhe_release="$1" - local distro - local major - local minor - - # distro - # Kylin 4.0 - - if [ ! -f "${yinhe_release}" ] ; then - return 1 - fi - - eval $(sed -rn \ - 's/^Kylin ([0-9]).([0-9])$/distro=yinhe;major=\1;minor=\2;/gp;' \ - "${yinhe_release}") - - if [ -z "${major}" -o -z "${distro}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - yinhe_osname="Yinhe Kylin Linux ${major}.${minor}" - write_to_output "${distro}" "${major}" "${minor}" "${yinhe_osname}" -} - -identify_gooroom() -{ - gooroom_release="$1" - local distro - local major - local minor - local description - - if [ ! -f "${gooroom_release}" ] ; then - return 1 - fi - - eval $(sed -rn 's/^DISTRIB_ID=(.*)$/distro=\1;/gp;' ${gooroom_release}) - if [ ${distro} != "Gooroom" ] ; then - return 1 - fi - - eval $(sed -rn 's/^DISTRIB_RELEASE=([0-9]).([0-9])$/major=\1;minor=\2;/gp;' ${gooroom_release}) - - if [ -z "${major}" ] ; then - return 1 - fi - - if [ -z "${minor}" ] ; then - minor=0 - fi - - eval $(sed -rn 's/^DISTRIB_DESCRIPTION=(.*)$/description=\1;/gp;' ${gooroom_release}) - - write_to_output "${distro}" "${major}" "${minor}" "${description}" -} - -identify_boot2docker() -{ - boot2docker_release="$1" - local major - local minor - - if [ ! -f "${boot2docker_release}" ] ; then - return 1 - fi - - major=$(awk -F. '{printf("%s", $1)}' /etc/version) - minor=$(awk -F. '{printf("%s.%s", $2, $3)}' /etc/version) - - write_to_output "boot2docker" "${major}" "${minor}" "boot2docker $(head -n 1 /etc/version)" - -} - -if [ $# -eq 1 ] ; then - exec 1>"$1" -fi - -if [ -z "${TEST}" ] ; then - #identify kylin disto before redhat, as kylin has both kylin_release and redhat_release. - identify_asianux /etc/asianux-release && exit 0 - identify_turbo /etc/turbo-release && exit 0 - identify_kylin /etc/neokylin-release && exit 0 - identify_redhat /etc/oracle-release && exit 0 - identify_redhat /etc/enterprise-release && exit 0 - #identify Rocky or AlmaLinux before CentOS and RHEL, as Rocky and AlmaLinux both have centos-release and redhat-release - identify_redhat /etc/rocky-release && exit 0 - identify_redhat /etc/almalinux-release && exit 0 - identify_redhat /etc/centos-release && exit 0 - identify_redhat /etc/redhat-release && exit 0 - #identify SuSE-release before, as previous version of SUSE or other distros also have os-release - identify_sles /etc/SuSE-release && exit 0 - identify_sles /etc/os-release && exit 0 - #identify Linx disto before debian, as Linx has both linx_release and debian_version. - identify_yinhe /etc/kylin-build && exit 0 - identify_linx /etc/linx-release && exit 0 - identify_gooroom /etc/lsb-release && exit 0 - identify_lsb lsb_release && exit 0 - identify_debian /etc/debian_version && exit 0 - identify_boot2docker /etc/boot2docker && exit 0 - identify_os_release /etc/os-release && exit 0 - - - if [ $# -eq 1 ] ; then - rm -f "$1" - fi - - exit 1 -fi diff --git a/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch b/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch deleted file mode 100644 index 49806c9bd..000000000 --- a/buildroot-external/patches/grub2/0002-squash4-Fix-an-uninitialized-variable.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3b2b7d0c9a886d913062ed5a9ffa8b764d882540 Mon Sep 17 00:00:00 2001 -Message-Id: <3b2b7d0c9a886d913062ed5a9ffa8b764d882540.1652945863.git.stefan@agner.ch> -In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch> -References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch> -From: Peter Jones -Date: Mon, 27 Jan 2020 15:01:16 -0500 -Subject: [PATCH] squash4: Fix an uninitialized variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc says: - -grub-core/fs/squash4.c: In function ‘direct_read’: -grub-core/fs/squash4.c:868:10: error: ‘err’ may be used uninitialized in -this function [-Werror=maybe-uninitialized] - 868 | if (err) - | ^ -cc1: all warnings being treated as errors - -This patch initializes it to GRUB_ERR_NONE. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper ---- - grub-core/fs/squash4.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c -index 95d5c1e1f..82704f966 100644 ---- a/grub-core/fs/squash4.c -+++ b/grub-core/fs/squash4.c -@@ -746,7 +746,7 @@ direct_read (struct grub_squash_data *data, - struct grub_squash_cache_inode *ino, - grub_off_t off, char *buf, grub_size_t len) - { -- grub_err_t err; -+ grub_err_t err = GRUB_ERR_NONE; - grub_off_t cumulated_uncompressed_size = 0; - grub_uint64_t a = 0; - grub_size_t i; --- -2.36.1 - diff --git a/buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch b/buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch deleted file mode 100644 index 3e85f31ea..000000000 --- a/buildroot-external/patches/network-manager/0001-connectivity-handle-NoNameServers-resolved-error-and.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 88f63699c444e43096e765b2603aa211a8ae58bb Mon Sep 17 00:00:00 2001 -Message-Id: <88f63699c444e43096e765b2603aa211a8ae58bb.1675879722.git.stefan@agner.ch> -From: Thomas Haller -Date: Fri, 8 Apr 2022 15:33:39 +0200 -Subject: [PATCH] connectivity: handle "NoNameServers" resolved error and don't - callback to system resolver - -No need to try further. The verdict is clear. - -From the log: - - [1649424031.1507] connectivity: (wlan0,IPv4,427) can't resolve a name via systemd-resolved: GDBus.Error:org.freedesktop.resolve1.NoNameServers: No appropriate name servers or networks for name found - [1649424031.1507] connectivity: (wlan0,IPv4,427) start request to 'http://fedoraproject.org/static/hotspot.txt' (try resolving 'fedoraproject.org' using system resolver) - -(cherry picked from commit 5b779c1ab7fb53857db235383af8274ab824a55e) -(altered to apply to 1.34.0) ---- - src/core/nm-connectivity.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c -index 13fb026514..3e4914ee3b 100644 ---- a/src/core/nm-connectivity.c -+++ b/src/core/nm-connectivity.c -@@ -719,8 +719,17 @@ resolve_cb(GObject *object, GAsyncResult *res, gpointer user_data) - g_clear_object(&cb_data->concheck.resolve_cancellable); - - if (!result) { -- /* Never mind. Just let do curl do its own resolving. */ -+ gs_free char *dbus_error = NULL; -+ - _LOG2D("can't resolve a name via systemd-resolved: %s", error->message); -+ -+ dbus_error = g_dbus_error_get_remote_error(error); -+ if (nm_streq0(dbus_error, "org.freedesktop.resolve1.NoNameServers")) { -+ cb_data_complete(cb_data, NM_CONNECTIVITY_LIMITED, "resolve-error"); -+ return; -+ } -+ -+ /* Never mind. Just let do curl do its own resolving. */ - do_curl_request(cb_data); - return; - } --- -2.39.1 - diff --git a/buildroot-external/patches/network-manager/0002-n-dhcp4-probe-forget-lease-after-a-NAK.patch b/buildroot-external/patches/network-manager/0002-n-dhcp4-probe-forget-lease-after-a-NAK.patch deleted file mode 100644 index 9c496dd52..000000000 --- a/buildroot-external/patches/network-manager/0002-n-dhcp4-probe-forget-lease-after-a-NAK.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5f5e5bd79d78fc057a887858012df01604fc1ca8 Mon Sep 17 00:00:00 2001 -Message-Id: <5f5e5bd79d78fc057a887858012df01604fc1ca8.1675879722.git.stefan@agner.ch> -In-Reply-To: <88f63699c444e43096e765b2603aa211a8ae58bb.1675879722.git.stefan@agner.ch> -References: <88f63699c444e43096e765b2603aa211a8ae58bb.1675879722.git.stefan@agner.ch> -From: Beniamino Galvani -Date: Thu, 5 May 2022 17:50:57 +0200 -Subject: [PATCH] n-dhcp4/probe: forget lease after a NAK - -If we have a lease and we get a NAK renewing/rebinding it, the lease -is lost. - -Without this, probe->current_lease remains set and after the next -DISCOVER/OFFER round, any call to n_dhcp4_client_lease_select() will -fail at: - - if (lease->probe->current_lease) - return -ENOTRECOVERABLE; - -As in: - - [5325.1313] dhcp4 (veth0): send REQUEST of 172.25.1.200 to 255.255.255.255 - [5325.1434] dhcp4 (veth0): received NACK from 172.25.1.1 - [5325.1435] dhcp4 (veth0): client event 3 (RETRACTED) - [5325.1436] dhcp4 (veth0): send DISCOVER to 255.255.255.255 - [5325.1641] dhcp4 (veth0): received OFFER of 172.25.1.200 from 172.25.1.1 - [5325.1641] dhcp4 (veth0): client event (OFFER) - [5325.1641] dhcp4 (veth0): selecting lease failed: -131 (ENOTRECOVERABLE) - -Upstream: https://github.com/nettools/n-dhcp4/pull/33 -Upstream: https://github.com/nettools/n-dhcp4/commit/e4af93228e3772bbb443ec1237252e6a2f3e3dd7 - -https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/993 - -e43b1791a382 ('Merge commit 'e23b3c9c3ac86b065eef002fa5c4321cc4a87df2' as 'shared/n-dhcp4'') ---- - src/n-dhcp4/src/n-dhcp4-c-probe.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/n-dhcp4/src/n-dhcp4-c-probe.c b/src/n-dhcp4/src/n-dhcp4-c-probe.c -index 7f20ac0527..283c1693cf 100644 ---- a/src/n-dhcp4/src/n-dhcp4-c-probe.c -+++ b/src/n-dhcp4/src/n-dhcp4-c-probe.c -@@ -995,14 +995,13 @@ static int n_dhcp4_client_probe_transition_nak(NDhcp4ClientProbe *probe) { - case N_DHCP4_CLIENT_PROBE_STATE_RENEWING: - case N_DHCP4_CLIENT_PROBE_STATE_REBINDING: - -- /* XXX */ -- - r = n_dhcp4_client_probe_raise(probe, - NULL, - N_DHCP4_CLIENT_EVENT_RETRACTED); - if (r) - return r; - -+ probe->current_lease = n_dhcp4_client_lease_unref(probe->current_lease); - probe->state = N_DHCP4_CLIENT_PROBE_STATE_INIT; - probe->ns_deferred = n_dhcp4_gettime(CLOCK_BOOTTIME) + probe->ns_nak_restart_delay; - probe->ns_nak_restart_delay = C_CLAMP(probe->ns_nak_restart_delay * 2u, --- -2.39.1 - diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh index 3d7a90135..934512f82 100755 --- a/buildroot-external/scripts/hdd-image.sh +++ b/buildroot-external/scripts/hdd-image.sh @@ -171,7 +171,7 @@ function _create_disk_gpt() { ## # Write Images - sgdisk -v + sgdisk -v "${hdd_img}" dd if="${boot_img}" of"=${hdd_img}" conv=notrunc,sparse bs=512 seek="${boot_offset}" dd if="${kernel_img}" of="${hdd_img}" conv=notrunc,sparse bs=512 seek="${kernel_offset}" dd if="${rootfs_img}" of="${hdd_img}" conv=notrunc,sparse bs=512 seek="${rootfs_offset}"