diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index e1ef88a55..427116294 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -8,6 +8,12 @@ jobs: linters: runs-on: ubuntu-22.04 steps: + - name: Install additional dependencies + run: | + sudo apt-get update + sudo apt-get -y install \ + python3-flake8 + - name: Check out code uses: actions/checkout@v4 with: @@ -25,4 +31,4 @@ jobs: - name: Check buildroot-external packages run: | - buildroot/utils/check-package --exclude PackageHeader --br2-external buildroot-external/package/*/* + buildroot/utils/check-package --exclude PackageHeader --exclude Upstream --br2-external buildroot-external/package/*/* diff --git a/buildroot b/buildroot index 15dc3b6e0..a1b2d12f3 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 15dc3b6e0cc9d68d7bd18ea75b9cf34f6e16b1dc +Subproject commit a1b2d12f323ca9a96feacd0e69e9a79e9a5ad4e6 diff --git a/buildroot-external/configs/generic_aarch64_defconfig b/buildroot-external/configs/generic_aarch64_defconfig index 1f9cf4947..3619110b7 100644 --- a/buildroot-external/configs/generic_aarch64_defconfig +++ b/buildroot-external/configs/generic_aarch64_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches" BR2_SSP_REGULAR=y @@ -30,7 +29,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -110,6 +108,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LIBCGROUP=y BR2_PACKAGE_LIBCGROUP_TOOLS=y +BR2_PACKAGE_QEMU_GUEST_AGENT=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y @@ -151,7 +150,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y @@ -171,7 +169,6 @@ BR2_PACKAGE_HASSIO_ARCH="aarch64" BR2_PACKAGE_HASSIO_MACHINE="qemuarm-64" BR2_PACKAGE_OS_AGENT=y BR2_PACKAGE_OS_AGENT_BOARD="GenericAarch64" -BR2_PACKAGE_QEMU_GUEST_AGENT=y BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_HOST_TEMPIO=y BR2_PACKAGE_UDISKS2=y diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig index 5b82f6086..f0e4f64a6 100644 --- a/buildroot-external/configs/generic_x86_64_defconfig +++ b/buildroot-external/configs/generic_x86_64_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches" BR2_SSP_REGULAR=y @@ -30,7 +29,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -154,7 +152,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/green_defconfig b/buildroot-external/configs/green_defconfig index fca78add2..e960db516 100755 --- a/buildroot-external/configs/green_defconfig +++ b/buildroot-external/configs/green_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/patches-rockchip $(BR2_EXTERNAL_HASSOS_PATH)/board/nabucasa/green/patches" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_MTD=y # BR2_PACKAGE_MTD_MTD_DEBUG is not set @@ -131,7 +129,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig index 4c2fe8065..806ddf380 100644 --- a/buildroot-external/configs/khadas_vim3_defconfig +++ b/buildroot-external/configs/khadas_vim3_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index ae3f6e811..2995d8de8 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 34d55de8d..07a306abc 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches" BR2_SSP_REGULAR=y @@ -32,7 +31,6 @@ BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_V4L2LOOPBACK=y BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -124,7 +122,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/odroid_m1_defconfig b/buildroot-external/configs/odroid_m1_defconfig index f71e2a517..ab109debc 100644 --- a/buildroot-external/configs/odroid_m1_defconfig +++ b/buildroot-external/configs/odroid_m1_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/patches-rockchip" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/odroid_m1s_defconfig b/buildroot-external/configs/odroid_m1s_defconfig index 2aef4415d..ccc48cbfd 100644 --- a/buildroot-external/configs/odroid_m1s_defconfig +++ b/buildroot-external/configs/odroid_m1s_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/patches-rockchip $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-m1s/patches" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 626ee38ed..001754431 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/patches" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index b13bc5c13..90a49b540 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -4,7 +4,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=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 @@ -33,7 +32,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 40328ae38..0b35e5088 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -3,7 +3,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/patches" BR2_SSP_REGULAR=y @@ -34,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -114,6 +112,7 @@ BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LIBCGROUP=y BR2_PACKAGE_LIBCGROUP_TOOLS=y +BR2_PACKAGE_QEMU_GUEST_AGENT=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y @@ -155,7 +154,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y @@ -175,7 +173,6 @@ BR2_PACKAGE_HASSIO_ARCH="amd64" BR2_PACKAGE_HASSIO_MACHINE="qemux86-64" BR2_PACKAGE_OS_AGENT=y BR2_PACKAGE_OS_AGENT_BOARD="Ova" -BR2_PACKAGE_QEMU_GUEST_AGENT=y BR2_PACKAGE_LXD_GUEST_AGENT=y BR2_PACKAGE_RPI_RF_MOD=y BR2_PACKAGE_RTL88X2BU=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 79512b90d..5b531266f 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y @@ -34,7 +34,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -129,7 +128,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 086b424d5..b27d5eb40 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -1,10 +1,10 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y @@ -33,7 +33,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -130,7 +129,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index d6973d0ce..95bc90e39 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y @@ -34,7 +34,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -131,7 +130,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 41aa21754..45b7e3938 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -1,10 +1,10 @@ BR2_aarch64=y BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y @@ -34,7 +34,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -131,7 +130,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index 3a86b7b4d..8768fbce3 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y @@ -34,7 +34,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -130,7 +129,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/rpi5_64_defconfig b/buildroot-external/configs/rpi5_64_defconfig index cc1bd40f5..dbace4414 100644 --- a/buildroot-external/configs/rpi5_64_defconfig +++ b/buildroot-external/configs/rpi5_64_defconfig @@ -1,10 +1,10 @@ BR2_aarch64=y BR2_cortex_a76=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches" BR2_SSP_REGULAR=y @@ -36,7 +36,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -129,7 +128,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 26d3d746c..2577e9e77 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -5,7 +5,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/patches" BR2_SSP_REGULAR=y @@ -36,7 +35,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -126,7 +124,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index e5b1d3822..d09bcdf3c 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -1,10 +1,10 @@ BR2_aarch64=y BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_DL_DIR="/cache/dl" BR2_CCACHE=y BR2_CCACHE_DIR="/cache/cc" -BR2_OPTIMIZE_2=y BR2_ENABLE_LTO=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 @@ -35,7 +35,6 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_CIFS_UTILS=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_E2IMAGE=y BR2_PACKAGE_NFS_UTILS=y # BR2_PACKAGE_NFS_UTILS_RPC_NFSD is not set @@ -133,7 +132,6 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_UTIL_LINUX_LOGIN=y BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y BR2_PACKAGE_UTIL_LINUX_PARTX=y -BR2_PACKAGE_UTIL_LINUX_SULOGIN=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y diff --git a/buildroot-external/package/os-agent/os-agent.mk b/buildroot-external/package/os-agent/os-agent.mk index 19e715db9..311cf199c 100644 --- a/buildroot-external/package/os-agent/os-agent.mk +++ b/buildroot-external/package/os-agent/os-agent.mk @@ -20,7 +20,7 @@ endef define OS_AGENT_GO_VENDORING (cd $(@D); \ - $(HOST_DIR)/bin/go mod vendor) + $(OS_AGENT_DL_ENV) $(GO_BIN) env) endef OS_AGENT_POST_PATCH_HOOKS += OS_AGENT_GO_VENDORING diff --git a/buildroot-external/package/udisks2/0001-Allow-to-explicitly-disable-libsystemd-login.patch b/buildroot-external/package/udisks2/0001-Allow-to-explicitly-disable-libsystemd-login.patch index cb7ee3424..02b3f57bd 100644 --- a/buildroot-external/package/udisks2/0001-Allow-to-explicitly-disable-libsystemd-login.patch +++ b/buildroot-external/package/udisks2/0001-Allow-to-explicitly-disable-libsystemd-login.patch @@ -1,5 +1,4 @@ -From a00ce68f8b08abb925bf22c0c46858958dd93866 Mon Sep 17 00:00:00 2001 -Message-Id: +From 368deb08a3f54ed9a67854af81758a705e24af00 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 25 Mar 2021 11:35:12 +0100 Subject: [PATCH] Allow to explicitly disable libsystemd-login @@ -15,10 +14,10 @@ Signed-off-by: Stefan Agner 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 53917998..0b3f0c9a 100644 +index 010269e7..cbea9845 100644 --- a/configure.ac +++ b/configure.ac -@@ -197,16 +197,21 @@ if test "x$enable_daemon" = "xyes"; then +@@ -194,16 +194,21 @@ if test "x$enable_daemon" = "xyes"; then [AC_DEFINE([UUID_STR_LEN], 37, [compat UUID_STR_LEN define])], [[#include ]]) @@ -48,6 +47,3 @@ index 53917998..0b3f0c9a 100644 PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219], [have_libelogind=yes], --- -2.30.2 - diff --git a/buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch b/buildroot-external/package/udisks2/0002-Isolate-authorization-specific-functions-into-new-co.patch similarity index 96% rename from buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch rename to buildroot-external/package/udisks2/0002-Isolate-authorization-specific-functions-into-new-co.patch index 6c5fcb61d..5be9853dd 100644 --- a/buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch +++ b/buildroot-external/package/udisks2/0002-Isolate-authorization-specific-functions-into-new-co.patch @@ -1,14 +1,18 @@ -From abcac570bfe1db867fda504942e6c782ada2aa00 Mon Sep 17 00:00:00 2001 -Message-Id: +From 4cdd4955dc6b88a34fef1a8458344747dd94fcc2 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 13 Mar 2021 14:39:31 +0100 Subject: [PATCH] Isolate authorization specific functions into new compile unit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Introduce udisksauthorization.c for authorization related functionality. This allows to make polkit optional much easier. Signed-off-by: Stefan Agner +[Jan: Updated patch to reflect udisks 2.10+ changes] +Signed-off-by: Jan Čermák --- src/Makefile.am | 1 + src/udisksauthorization.c | 382 ++++++++++++++++++++++++++++++++ @@ -17,7 +21,7 @@ Signed-off-by: Stefan Agner src/udisksdaemon.h | 1 + src/udisksdaemontypes.h | 1 - src/udisksdaemonutil.c | 356 ----------------------------- - src/udisksdaemonutil.h | 31 --- + src/udisksdaemonutil.h | 32 --- src/udiskslinuxblock.c | 1 + src/udiskslinuxdrive.c | 1 + src/udiskslinuxdriveata.c | 1 + @@ -29,22 +33,22 @@ Signed-off-by: Stefan Agner src/udiskslinuxpartition.c | 1 + src/udiskslinuxpartitiontable.c | 1 + src/udiskslinuxswapspace.c | 1 + - 19 files changed, 459 insertions(+), 388 deletions(-) + 19 files changed, 459 insertions(+), 389 deletions(-) create mode 100644 src/udisksauthorization.c create mode 100644 src/udisksauthorization.h diff --git a/src/Makefile.am b/src/Makefile.am -index 4048854c..bb09560a 100644 +index 5a174d1a..dad8d914 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -92,6 +92,7 @@ libudisks_daemon_la_SOURCES = \ - udisksmount.h udisksmount.c \ - udisksmountmonitor.h udisksmountmonitor.c \ - udisksdaemonutil.h udisksdaemonutil.c \ -+ udisksauthorization.h udisksauthorization.c \ - udiskslogging.h udiskslogging.c \ - udisksstate.h udisksstate.c \ - udisksprivate.h \ +@@ -91,6 +91,7 @@ libudisks_daemon_la_SOURCES = + udisksmount.h udisksmount.c \ + udisksmountmonitor.h udisksmountmonitor.c \ + udisksdaemonutil.h udisksdaemonutil.c \ ++ udisksauthorization.h udisksauthorization.c \ + udiskslogging.h udiskslogging.c \ + udisksstate.h udisksstate.c \ + udisksprivate.h \ diff --git a/src/udisksauthorization.c b/src/udisksauthorization.c new file mode 100644 index 00000000..f74e194a @@ -515,7 +519,7 @@ index 71038ec9..08da42ce 100644 #define MAX_SAMPLES 100 diff --git a/src/udisksdaemon.h b/src/udisksdaemon.h -index c175054d..19b4bda3 100644 +index 36dd285a..7bba921e 100644 --- a/src/udisksdaemon.h +++ b/src/udisksdaemon.h @@ -23,6 +23,7 @@ @@ -527,7 +531,7 @@ index c175054d..19b4bda3 100644 G_BEGIN_DECLS diff --git a/src/udisksdaemontypes.h b/src/udisksdaemontypes.h -index f23a29c5..1f4e8ba1 100644 +index de5f6bda..1f9c216e 100644 --- a/src/udisksdaemontypes.h +++ b/src/udisksdaemontypes.h @@ -23,7 +23,6 @@ @@ -539,7 +543,7 @@ index f23a29c5..1f4e8ba1 100644 #include diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c -index 60134765..66489cb9 100644 +index 3db92f58..f183da94 100644 --- a/src/udisksdaemonutil.c +++ b/src/udisksdaemonutil.c @@ -617,362 +617,6 @@ udisks_daemon_util_setup_by_user (UDisksDaemon *daemon, @@ -906,7 +910,7 @@ index 60134765..66489cb9 100644 static gboolean diff --git a/src/udisksdaemonutil.h b/src/udisksdaemonutil.h -index 2d7ac981..bd628acb 100644 +index 40dc6ba2..0ca3e036 100644 --- a/src/udisksdaemonutil.h +++ b/src/udisksdaemonutil.h @@ -74,21 +74,6 @@ gboolean udisks_daemon_util_on_user_seat (UDisksDaemon *daemon, @@ -931,9 +935,9 @@ index 2d7ac981..bd628acb 100644 gboolean udisks_daemon_util_get_user_info (const uid_t uid, gid_t *out_gid, gchar **out_user_name, -@@ -129,22 +114,6 @@ gchar *udisks_daemon_util_get_free_mdraid_device (void); +@@ -137,23 +122,6 @@ guint16 udisks_ata_identify_get_word (const guchar *identify_data, guint word_nu - guint16 udisks_ata_identify_get_word (const guchar *identify_data, guint word_number); + gboolean udisks_module_validate_name (const gchar *module_name); -/* Utility macro for policy verification. */ -#define UDISKS_DAEMON_CHECK_AUTHORIZATION(daemon, \ @@ -951,14 +955,15 @@ index 2d7ac981..bd628acb 100644 - { \ - goto out; \ - } - +- G_END_DECLS + #endif /* __UDISKS_DAEMON_UTIL_H__ */ diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c -index 901426ad..b1dd869c 100644 +index 829dd5f7..23c5a9cb 100644 --- a/src/udiskslinuxblock.c +++ b/src/udiskslinuxblock.c -@@ -53,6 +53,7 @@ +@@ -54,6 +54,7 @@ #include "udisksprivate.h" #include "udisksconfigmanager.h" #include "udisksdaemonutil.h" @@ -967,7 +972,7 @@ index 901426ad..b1dd869c 100644 #include "udisksfstabentry.h" #include "udiskscrypttabmonitor.h" diff --git a/src/udiskslinuxdrive.c b/src/udiskslinuxdrive.c -index 592d3edc..f2f39b57 100644 +index d24cf2f3..6427c7f7 100644 --- a/src/udiskslinuxdrive.c +++ b/src/udiskslinuxdrive.c @@ -49,6 +49,7 @@ @@ -979,10 +984,10 @@ index 592d3edc..f2f39b57 100644 #include "udisksconfigmanager.h" diff --git a/src/udiskslinuxdriveata.c b/src/udiskslinuxdriveata.c -index 5ebdcd76..cd153d72 100644 +index b86c3465..c83afdbb 100644 --- a/src/udiskslinuxdriveata.c +++ b/src/udiskslinuxdriveata.c -@@ -45,6 +45,7 @@ +@@ -46,6 +46,7 @@ #include "udiskslinuxblockobject.h" #include "udisksdaemon.h" #include "udisksdaemonutil.h" @@ -991,7 +996,7 @@ index 5ebdcd76..cd153d72 100644 #include "udiskssimplejob.h" #include "udisksthreadedjob.h" diff --git a/src/udiskslinuxencrypted.c b/src/udiskslinuxencrypted.c -index c3a0821a..5678cd47 100644 +index 9bcbd2f0..93c205d6 100644 --- a/src/udiskslinuxencrypted.c +++ b/src/udiskslinuxencrypted.c @@ -37,6 +37,7 @@ @@ -1003,10 +1008,10 @@ index c3a0821a..5678cd47 100644 #include "udiskslinuxdevice.h" #include "udiskslinuxblock.h" diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c -index 279d952b..5355fc8d 100644 +index 9f4880ad..5e1da2b6 100644 --- a/src/udiskslinuxfilesystem.c +++ b/src/udiskslinuxfilesystem.c -@@ -50,6 +50,7 @@ +@@ -49,6 +49,7 @@ #include "udisksdaemon.h" #include "udisksstate.h" #include "udisksdaemonutil.h" @@ -1015,7 +1020,7 @@ index 279d952b..5355fc8d 100644 #include "udisksmount.h" #include "udiskslinuxdevice.h" diff --git a/src/udiskslinuxloop.c b/src/udiskslinuxloop.c -index 5d7e3553..5854220e 100644 +index 5f162f1d..c88eeb0e 100644 --- a/src/udiskslinuxloop.c +++ b/src/udiskslinuxloop.c @@ -42,6 +42,7 @@ @@ -1027,7 +1032,7 @@ index 5d7e3553..5854220e 100644 #include "udiskssimplejob.h" diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c -index 8af65d97..f6601195 100644 +index 5bfeec10..037cd58e 100644 --- a/src/udiskslinuxmanager.c +++ b/src/udiskslinuxmanager.c @@ -41,6 +41,7 @@ @@ -1037,9 +1042,9 @@ index 8af65d97..f6601195 100644 +#include "udisksauthorization.h" #include "udisksstate.h" #include "udiskslinuxblockobject.h" - #include "udiskslinuxdevice.h" + #include "udiskslinuxblock.h" diff --git a/src/udiskslinuxmdraid.c b/src/udiskslinuxmdraid.c -index 4560a7ab..361383c9 100644 +index 900cd650..2999df53 100644 --- a/src/udiskslinuxmdraid.c +++ b/src/udiskslinuxmdraid.c @@ -43,6 +43,7 @@ @@ -1051,7 +1056,7 @@ index 4560a7ab..361383c9 100644 #include "udiskslinuxblock.h" #include "udiskssimplejob.h" diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c -index ff0fdfc0..7937257a 100644 +index c4433627..5b1cc53f 100644 --- a/src/udiskslinuxpartition.c +++ b/src/udiskslinuxpartition.c @@ -40,6 +40,7 @@ @@ -1063,7 +1068,7 @@ index ff0fdfc0..7937257a 100644 #include "udiskslinuxblock.h" #include "udiskssimplejob.h" diff --git a/src/udiskslinuxpartitiontable.c b/src/udiskslinuxpartitiontable.c -index e43a0708..63c295bb 100644 +index 528b22ff..9016214c 100644 --- a/src/udiskslinuxpartitiontable.c +++ b/src/udiskslinuxpartitiontable.c @@ -39,6 +39,7 @@ @@ -1075,7 +1080,7 @@ index e43a0708..63c295bb 100644 #include "udiskslinuxblock.h" #include "udiskslinuxpartition.h" diff --git a/src/udiskslinuxswapspace.c b/src/udiskslinuxswapspace.c -index bb47f3d4..6998b6ab 100644 +index 0c4fd9a4..5375f662 100644 --- a/src/udiskslinuxswapspace.c +++ b/src/udiskslinuxswapspace.c @@ -35,6 +35,7 @@ @@ -1086,6 +1091,3 @@ index bb47f3d4..6998b6ab 100644 #include "udisksmountmonitor.h" #include "udiskslinuxdevice.h" #include "udisksthreadedjob.h" --- -2.30.2 - diff --git a/buildroot-external/package/udisks2/0003-Avoid-autoreconf-error-if-introspection-macros-are-n.patch b/buildroot-external/package/udisks2/0003-Avoid-autoreconf-error-if-introspection-macros-are-n.patch deleted file mode 100644 index 9f1625a24..000000000 --- a/buildroot-external/package/udisks2/0003-Avoid-autoreconf-error-if-introspection-macros-are-n.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 25b38dee43559d58f1bf9cc464107f32f476c753 Mon Sep 17 00:00:00 2001 -Message-Id: <25b38dee43559d58f1bf9cc464107f32f476c753.1616318066.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Fri, 19 Mar 2021 15:54:30 +0100 -Subject: [PATCH] Avoid autoreconf error if introspection macros are not - available - -Don't make macros for introspection mandatory. This allows to run -autoreconf even without GObject introspection automake macros available. - -Signed-off-by: Stefan Agner ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7d95bc91..30096af9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -123,7 +123,10 @@ AC_ARG_ENABLE(daemon, - enable_daemon=yes) - AM_CONDITIONAL(ENABLE_DAEMON, test "$enable_daemon" != no) - --GOBJECT_INTROSPECTION_CHECK([0.6.2]) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ -+ GOBJECT_INTROSPECTION_CHECK([0.6.2]) -+]) -+AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") - - # Behavior - # --- -2.30.2 - diff --git a/buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch b/buildroot-external/package/udisks2/0003-Make-polkit-dependency-optional.patch similarity index 91% rename from buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch rename to buildroot-external/package/udisks2/0003-Make-polkit-dependency-optional.patch index fdf6316db..9540a2085 100644 --- a/buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch +++ b/buildroot-external/package/udisks2/0003-Make-polkit-dependency-optional.patch @@ -1,10 +1,10 @@ -From 573a9b6988c48abb7579acbe634d6b532ecb8517 Mon Sep 17 00:00:00 2001 -Message-Id: <573a9b6988c48abb7579acbe634d6b532ecb8517.1616318066.git.stefan@agner.ch> -In-Reply-To: -References: +From 50c2d270aa88121bc34cb2fd6b91316890e85e45 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 13 Mar 2021 15:24:45 +0100 Subject: [PATCH] Make polkit dependency optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Make authorization using polkit a compile time option. This allows to build udisks2 without polkit. @@ -12,6 +12,8 @@ build udisks2 without polkit. Fixes: #615 Signed-off-by: Stefan Agner +[Jan: Updated patch to reflect udisks 2.10+ changes] +Signed-off-by: Jan Čermák --- configure.ac | 33 +++++++++++++++---- data/Makefile.am | 2 ++ @@ -22,10 +24,10 @@ Signed-off-by: Stefan Agner 6 files changed, 89 insertions(+), 34 deletions(-) diff --git a/configure.ac b/configure.ac -index 53917998..7d95bc91 100644 +index cbea9845..57e3558c 100644 --- a/configure.ac +++ b/configure.ac -@@ -150,13 +150,31 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.50]) +@@ -151,13 +151,31 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.50]) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) @@ -64,16 +66,16 @@ index 53917998..7d95bc91 100644 if test "x$enable_daemon" = "xyes"; then PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165]) -@@ -793,6 +811,7 @@ echo " +@@ -689,6 +707,7 @@ echo " using libelogind: ${have_libelogind} use /media for mounting: ${fhs_media} acl support: ${have_acl} + polkit support: ${have_polkit} - using libmount/utab: ${have_libmount_utab} compiler: ${CC} + cflags: ${CFLAGS} diff --git a/data/Makefile.am b/data/Makefile.am -index 758644be..bf4f29b8 100644 +index 946823de..d17f225d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -31,6 +31,7 @@ endif @@ -201,10 +203,10 @@ index 4903bb57..64dcf4e4 100644 G_BEGIN_DECLS diff --git a/src/udisksdaemon.c b/src/udisksdaemon.c -index 51e2bb5c..8995167f 100644 +index cdb9e647..a892751f 100644 --- a/src/udisksdaemon.c +++ b/src/udisksdaemon.c -@@ -379,6 +379,7 @@ udisks_daemon_constructed (GObject *object) +@@ -359,6 +359,7 @@ udisks_daemon_constructed (GObject *object) uuid_unparse (uuid, &uuid_buf[0]); daemon->uuid = g_strdup (uuid_buf); @@ -212,7 +214,7 @@ index 51e2bb5c..8995167f 100644 daemon->authority = polkit_authority_get_sync (NULL, &error); if (daemon->authority == NULL) { -@@ -386,6 +387,7 @@ udisks_daemon_constructed (GObject *object) +@@ -366,6 +367,7 @@ udisks_daemon_constructed (GObject *object) error->message, g_quark_to_string (error->domain), error->code); g_clear_error (&error); } @@ -221,7 +223,7 @@ index 51e2bb5c..8995167f 100644 daemon->object_manager = g_dbus_object_manager_server_new ("/org/freedesktop/UDisks2"); diff --git a/tools/udisksctl.c b/tools/udisksctl.c -index 7a5de65d..feacfa6d 100644 +index 7d207f98..d380ceed 100644 --- a/tools/udisksctl.c +++ b/tools/udisksctl.c @@ -35,9 +35,11 @@ @@ -261,6 +263,3 @@ index 7a5de65d..feacfa6d 100644 /* ---------------------------------------------------------------------------------------------------- */ --- -2.30.2 - diff --git a/buildroot-external/package/udisks2/Config.in b/buildroot-external/package/udisks2/Config.in index 0b64e3af8..6f7806652 100644 --- a/buildroot-external/package/udisks2/Config.in +++ b/buildroot-external/package/udisks2/Config.in @@ -13,6 +13,7 @@ config BR2_PACKAGE_UDISKS2 select BR2_PACKAGE_LIBBLOCKDEV_FS select BR2_PACKAGE_LIBBLOCKDEV_LOOP select BR2_PACKAGE_LIBBLOCKDEV_MDRAID + select BR2_PACKAGE_LIBBLOCKDEV_NVME select BR2_PACKAGE_LIBBLOCKDEV_PART select BR2_PACKAGE_LIBBLOCKDEV_SWAP select BR2_PACKAGE_LIBGUDEV diff --git a/buildroot-external/package/udisks2/udisks2.hash b/buildroot-external/package/udisks2/udisks2.hash index 303a0aae0..66f4be5e1 100644 --- a/buildroot-external/package/udisks2/udisks2.hash +++ b/buildroot-external/package/udisks2/udisks2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bda6f9d7edc632c57e55862731a8ffeff2413fa4346708a22bf31ed72b0fe058 udisks-2.9.2.tar.bz2 +sha256 b75734ccf602540dedb4068bec206adcb508a4c003725e117ae8f994d92d8ece udisks-2.10.1.tar.bz2 sha256 98046e932dc6c739001e79d7079a3bd958fc55475dcd917d27f884c0c93525cc COPYING diff --git a/buildroot-external/package/udisks2/udisks2.mk b/buildroot-external/package/udisks2/udisks2.mk index bfb0b81a5..c180b353e 100644 --- a/buildroot-external/package/udisks2/udisks2.mk +++ b/buildroot-external/package/udisks2/udisks2.mk @@ -4,7 +4,7 @@ # ################################################################################ -UDISKS2_VERSION = 2.9.2 +UDISKS2_VERSION = 2.10.1 UDISKS2_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS2_VERSION) UDISKS2_SOURCE = udisks-$(UDISKS2_VERSION).tar.bz2 UDISKS2_LICENSE = GPL-2.0+ 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 7b5e191fb..6ff31896e 100644 --- a/buildroot-external/package/xe-guest-utilities/xe-guest-utilities.mk +++ b/buildroot-external/package/xe-guest-utilities/xe-guest-utilities.mk @@ -25,7 +25,7 @@ XE_GUEST_UTILITIES_XENSTORE_ALIAS = \ define XE_GUEST_UTILITIES_BUILD_CMDS cd $(@D); \ $(HOST_GO_TARGET_ENV) $(TARGET_MAKE_ENV); \ - $(GO_BIN) mod vendor; \ + $(XE_GUEST_UTILITIES_DL_ENV) $(GO_BIN) mod vendor; \ $(MAKE) endef diff --git a/buildroot-external/patches/grub2/0003-efidisk-pass-buffers-with-higher-alignment.patch b/buildroot-external/patches/grub2/0003-efidisk-pass-buffers-with-higher-alignment.patch deleted file mode 100644 index 91a0214d9..000000000 --- a/buildroot-external/patches/grub2/0003-efidisk-pass-buffers-with-higher-alignment.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7eaacdbf00ec29931553384f914c229c6078582e Mon Sep 17 00:00:00 2001 -Message-Id: <7eaacdbf00ec29931553384f914c229c6078582e.1652945863.git.stefan@agner.ch> -In-Reply-To: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch> -References: <184b6a054e04bb4c7fb4885a30d62314229dc551.1652945863.git.stefan@agner.ch> -From: Stefan Agner -Date: Thu, 5 May 2022 15:46:51 +0200 -Subject: [PATCH] efidisk: pass buffers with higher alignment - -Some devices report a IoAlign value of 2, however seem to require a -buffer with higher alignment. - -The UEFI specification is saying: "IoAlign values of 0 and 1 mean that -the buffer can be placed anywhere in memory. Otherwise, IoAlign must -be a power of 2, and the requirement is that the start address of a -buffer must be evenly divisible by IoAlign with no remainder." - -It seems that this got misinterpreted by some vendors assuming IoAlign -is 2^IoAlign. There is also such a hint in an example in earlier -versions of the Driver Writer's Guide: -ScsiPassThruMode.IoAlign = 2; // Data must be alligned on 4-byte boundary - -However, it is unsafe to just blindly align buffers by 2^IoAlign, as -this would lead to an overflow for systems which use block size -alignment (e.g. 512 bytes, for example U-Boot). - -Ontop of that, some devices seem to report no alignment requirements -but seem to read corrupt data or report read errors if the buffer is -not aligned. - -Work around by using an alignment of at least BlockSize (typically 512 -bytes) in any casea. Also make sure that IoAlign is still respected as -per UEFI specification if a higher alignment than block size is -requested. - -Note: The problem has only noticed with compressed squashfs. It seems -that ext4 (and presumably other file system drivers) pass buffers with -a higher alignment already. - -Acked-by: Heinrich Schuchardt -Signed-off-by: Stefan Agner ---- - grub-core/disk/efi/efidisk.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c -index 9e20af70e..c6e37f131 100644 ---- a/grub-core/disk/efi/efidisk.c -+++ b/grub-core/disk/efi/efidisk.c -@@ -553,8 +553,19 @@ grub_efidisk_readwrite (struct grub_disk *disk, grub_disk_addr_t sector, - d = disk->data; - bio = d->block_io; - -- /* Set alignment to 1 if 0 specified */ -- io_align = bio->media->io_align ? bio->media->io_align : 1; -+ /* -+ * If IoAlign is > 1, it should represent the required alignment. However, -+ * some UEFI implementation on Intel NUC systems seem to use IoAlign=2 but -+ * require 2^IoAlign. Some implementation seem to require alignment despite -+ * not reporting any requirements. -+ * -+ * Make sure to align to at least block size in any case. -+ */ -+ if (bio->media->io_align < bio->media->block_size) -+ io_align = bio->media->block_size; -+ else -+ io_align = bio->media->io_align; -+ - num_bytes = size << disk->log_sector_size; - - if ((grub_addr_t) buf & (io_align - 1)) --- -2.36.1 - diff --git a/buildroot-external/patches/network-manager/0001-ndisc-support-multiple-gateways-for-a-single-network.patch b/buildroot-external/patches/network-manager/0001-ndisc-support-multiple-gateways-for-a-single-network.patch index a594bae26..a4303ccfe 100644 --- a/buildroot-external/patches/network-manager/0001-ndisc-support-multiple-gateways-for-a-single-network.patch +++ b/buildroot-external/patches/network-manager/0001-ndisc-support-multiple-gateways-for-a-single-network.patch @@ -1,27 +1,27 @@ -From a053500cf43a31ee82a6e0f3d644ea36f5c77ffb Mon Sep 17 00:00:00 2001 -Message-Id: +From 00592cc1e5f0a04b06a4aac33fd62d84650c9c3f Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 27 Mar 2023 17:48:34 +0200 Subject: [PATCH] ndisc: support multiple gateways for a single network +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit --- - src/core/ndisc/nm-ndisc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) +[Jan: updated for NM 1.44] +Signed-off-by: Jan Čermák +--- + src/core/ndisc/nm-ndisc.c | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c -index 9a6038d406..67cdf5d99a 100644 +index 20dd21212d..e00bdac872 100644 --- a/src/core/ndisc/nm-ndisc.c +++ b/src/core/ndisc/nm-ndisc.c -@@ -654,7 +654,8 @@ nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec - NMNDiscRoute *item = &g_array_index(rdata->routes, NMNDiscRoute, i); - - if (IN6_ARE_ADDR_EQUAL(&item->network, &new_item->network) -- && item->plen == new_item->plen) { -+ && item->plen == new_item->plen -+ && IN6_ARE_ADDR_EQUAL(&item->gateway, &new_item->gateway)) { +@@ -705,6 +705,7 @@ nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec + * comparison is aborted, and both routes are added. + */ + if (IN6_ARE_ADDR_EQUAL(&item->network, &new_item->network) && item->plen == new_item->plen ++ && IN6_ARE_ADDR_EQUAL(&item->gateway, &new_item->gateway) + && item->on_link == new_item->on_link) { if (new_item->expiry_msec <= now_msec) { g_array_remove_index(rdata->routes, i); - return TRUE; --- -2.40.0 -