From 97dffedbcd2f88fe10d0057b2ed698a761ddd87f Mon Sep 17 00:00:00 2001 From: Jens Maus Date: Sat, 4 Sep 2021 10:46:55 +0200 Subject: [PATCH] Add a buildroot utils/check-package linter check to pr-checks.yml (#1523) Add buildroot utils/check-package check to the pr-checks.yml workflow. It checks for common errors/mistakes when creating own buildroot packages. Also fixed all warnings this utility output for our existing packages. --- .github/workflows/pr-checks.yml | 10 ++++- .../package/bluetooth-rtl8723/Config.in | 2 +- .../package/eq3_char_loop/0001-Makefile.patch | 4 ++ .../eq3_char_loop/0002-version1_1.patch | 4 ++ .../package/eq3_char_loop/eq3_char_loop.mk | 4 +- .../0001-kernel-Makefile.patch | 4 ++ .../package/generic_raw_uart/Config.in | 10 ++--- .../generic_raw_uart/generic_raw_uart.mk | 4 +- .../hardkernel-boot/hardkernel-boot.mk | 13 +++--- .../package/intel-e1000e/Config.in | 3 +- .../package/khadas-boot/khadas-boot.mk | 2 - .../package/qemu-guest-agent/Config.in | 8 ++-- .../package/rpi-eeprom/rpi-eeprom.mk | 5 ++- .../package/rpi-firmware/rpi-firmware.mk | 7 +++- .../package/rpi-rf-mod/Config.in | 42 +++++++++---------- .../package/rpi-rf-mod/rpi-rf-mod.mk | 28 ++++++------- .../package/rtl8812au/Config.in | 4 +- ...-explicitly-disable-libsystemd-login.patch | 2 + ...ation-specific-functions-into-new-co.patch | 4 +- ...0002-Make-polkit-dependency-optional.patch | 4 +- ...-error-if-introspection-macros-are-n.patch | 4 +- buildroot-external/package/udisks2/Config.in | 4 +- .../package/xe-guest-utilities/Config.in | 2 +- 23 files changed, 104 insertions(+), 70 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index ac3b99bce..47c39b33f 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -9,12 +9,20 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Check out code - uses: actions/checkout@v1 + uses: actions/checkout@v2 + with: + submodules: true + - name: Check Dockerfile uses: brpaz/hadolint-action@v1.1.0 with: dockerfile: Dockerfile + - name: Check shell scripts uses: ludeeus/action-shellcheck@1.1.0 with: ignore: buildroot buildroot-external/package/xe-guest-utilities + + - name: Check buildroot-external packages + run: | + buildroot/utils/check-package --exclude PackageHeader --br2-external buildroot-external/package/*/* diff --git a/buildroot-external/package/bluetooth-rtl8723/Config.in b/buildroot-external/package/bluetooth-rtl8723/Config.in index 2db51c590..4e79bf265 100644 --- a/buildroot-external/package/bluetooth-rtl8723/Config.in +++ b/buildroot-external/package/bluetooth-rtl8723/Config.in @@ -2,4 +2,4 @@ config BR2_PACKAGE_BLUETOOTH_RTL8723 bool "bluetooth rtl8723" depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT help - Install bluetooth for rtl8723. + Install bluetooth for rtl8723. diff --git a/buildroot-external/package/eq3_char_loop/0001-Makefile.patch b/buildroot-external/package/eq3_char_loop/0001-Makefile.patch index f92449731..52f74bc6d 100644 --- a/buildroot-external/package/eq3_char_loop/0001-Makefile.patch +++ b/buildroot-external/package/eq3_char_loop/0001-Makefile.patch @@ -1,3 +1,7 @@ +KernelDrivers/Makefile: add Makefile to get compiled as Linux kernel module + +Signed-off-by: Jens Maus + --- ./KernelDrivers/Makefile.orig 2021-04-02 17:01:07.029932165 +0200 +++ ./KernelDrivers/Makefile 2020-06-04 14:36:10.188174788 +0200 @@ -0,0 +1 @@ diff --git a/buildroot-external/package/eq3_char_loop/0002-version1_1.patch b/buildroot-external/package/eq3_char_loop/0002-version1_1.patch index 7b2208dda..865e36caa 100644 --- a/buildroot-external/package/eq3_char_loop/0002-version1_1.patch +++ b/buildroot-external/package/eq3_char_loop/0002-version1_1.patch @@ -1,3 +1,7 @@ +KernelDrivers/eq3_char_loop.c: updated to latest 1.1 version + +Signed-off-by: Jens Maus + --- ./KernelDrivers/eq3_char_loop.c.orig 2017-05-14 22:57:19.109181928 +0200 +++ ./KernelDrivers/eq3_char_loop.c 2020-06-04 14:36:10.188174788 +0200 @@ -48,8 +48,8 @@ diff --git a/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk b/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk index b413dab97..5faf7ef60 100644 --- a/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk +++ b/buildroot-external/package/eq3_char_loop/eq3_char_loop.mk @@ -1,4 +1,4 @@ -############################################################# +################################################################################ # # eQ-3 char loopback kernel module for HomeMatic/homematicIP # dual stack implementations for the RPI-RF-MOD/HM-MOD-RPI-PCB @@ -6,7 +6,7 @@ # Copyright (c) 2015 by eQ-3 Entwicklung GmbH # https://github.com/eq-3/occu/tree/master/KernelDrivers # -############################################################# +################################################################################ EQ3_CHAR_LOOP_VERSION = e60183fc5b8375d9eea185c716f716c07657fa00 EQ3_CHAR_LOOP_SITE = $(call github,eq-3,occu,$(EQ3_CHAR_LOOP_VERSION)) diff --git a/buildroot-external/package/generic_raw_uart/0001-kernel-Makefile.patch b/buildroot-external/package/generic_raw_uart/0001-kernel-Makefile.patch index 96d7b389a..85e8fa65e 100644 --- a/buildroot-external/package/generic_raw_uart/0001-kernel-Makefile.patch +++ b/buildroot-external/package/generic_raw_uart/0001-kernel-Makefile.patch @@ -1,3 +1,7 @@ +kernel/Makefile: modification to get compile as buildroot package + +Signed-off-by: Jens Maus + --- ./kernel/Makefile.orig 2020-12-14 13:09:44.406823210 +0100 +++ ./kernel/Makefile 2021-01-14 11:37:37.524474444 +0100 @@ -1,17 +1,26 @@ diff --git a/buildroot-external/package/generic_raw_uart/Config.in b/buildroot-external/package/generic_raw_uart/Config.in index 81f38f641..a0a22a69a 100644 --- a/buildroot-external/package/generic_raw_uart/Config.in +++ b/buildroot-external/package/generic_raw_uart/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_GENERIC_RAW_UART - bool "Support for Generic RAW UART kernel module" - help - Adds support for generic-raw-uart kernel module + bool "Support for Generic RAW UART kernel module" + help + Adds support for generic-raw-uart kernel module - Alexander Reinert - https://github.com/alexreinert/piVCCU/tree/master/kernel + Alexander Reinert + https://github.com/alexreinert/piVCCU/tree/master/kernel diff --git a/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk b/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk index ec1304143..6a8190657 100644 --- a/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk +++ b/buildroot-external/package/generic_raw_uart/generic_raw_uart.mk @@ -1,4 +1,4 @@ -############################################################# +################################################################################ # # Generic raw uart kernel module for low-latency uart # communication with a RPI-RF-MOD/HM-MOD-RPI-PCB @@ -11,7 +11,7 @@ # https://github.com/eq-3/occu/tree/master/KernelDrivers # https://github.com/jens-maus/RaspberryMatic/tree/master/buildroot-external/package/bcm2835_raw_uart # -############################################################# +################################################################################ GENERIC_RAW_UART_VERSION = 9510818fa12e52baf40fe5ac84e58fd62db4f70e GENERIC_RAW_UART_SITE = $(call github,alexreinert,piVCCU,$(GENERIC_RAW_UART_VERSION)) diff --git a/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk index bf1abb141..f170cb39c 100644 --- a/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk +++ b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk @@ -11,12 +11,12 @@ HARDKERNEL_BOOT_LICENSE_FILES = Licenses/gpl-2.0.txt HARDKERNEL_BOOT_INSTALL_IMAGES = YES HARDKERNEL_BOOT_DEPENDENCIES = uboot - ifeq ($(BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2),y) HARDKERNEL_BOOT_VERSION = 205c7b3259559283161703a1a200b787c2c445a5 -HARDKERNEL_BOOT_BINS += sd_fuse/bl1.bin.hardkernel \ - u-boot.gxbb +HARDKERNEL_BOOT_BINS += sd_fuse/bl1.bin.hardkernel +HARDKERNEL_BOOT_BINS += u-boot.gxbb + define HARDKERNEL_BOOT_BUILD_CMDS $(@D)/fip/fip_create --bl30 $(@D)/fip/gxb/bl30.bin \ --bl301 $(@D)/fip/gxb/bl301.bin \ @@ -89,9 +89,10 @@ endef else ifeq ($(BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4),y) HARDKERNEL_BOOT_VERSION = 88af53fbcef8386cb4d5f04c19f4b2bcb69e90ca -HARDKERNEL_BOOT_BINS += sd_fuse/bl1.bin.hardkernel \ - sd_fuse/bl2.bin.hardkernel.720k_uboot \ - sd_fuse/tzsw.bin.hardkernel +HARDKERNEL_BOOT_BINS += sd_fuse/bl1.bin.hardkernel +HARDKERNEL_BOOT_BINS += sd_fuse/bl2.bin.hardkernel.720k_uboot +HARDKERNEL_BOOT_BINS += sd_fuse/tzsw.bin.hardkernel + define HARDKERNEL_BOOT_BUILD_CMDS endef diff --git a/buildroot-external/package/intel-e1000e/Config.in b/buildroot-external/package/intel-e1000e/Config.in index a0999931e..ed8b03238 100644 --- a/buildroot-external/package/intel-e1000e/Config.in +++ b/buildroot-external/package/intel-e1000e/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_INTEL_E1000E bool "Intel Network Adapter Driver for PCIe" depends on BR2_LINUX_KERNEL help - Install Intel Network Adapter Driver for PCIe (external module) + Install Intel Network Adapter Driver for PCIe + (external module) https://downloadcenter.intel.com/download/15817/Intel-Network-Adapter-Driver-for-PCIe-Intel-Gigabit-Ethernet-Network-Connections-Under-Linux- diff --git a/buildroot-external/package/khadas-boot/khadas-boot.mk b/buildroot-external/package/khadas-boot/khadas-boot.mk index a3e4e036e..a9f2c506c 100644 --- a/buildroot-external/package/khadas-boot/khadas-boot.mk +++ b/buildroot-external/package/khadas-boot/khadas-boot.mk @@ -11,7 +11,6 @@ KHADAS_BOOT_LICENSE_FILES = Licenses/gpl-2.0.txt KHADAS_BOOT_INSTALL_IMAGES = YES KHADAS_BOOT_DEPENDENCIES = uboot - ifeq ($(BR2_PACKAGE_KHADAS_BOOT_VIM3),y) KHADAS_BOOT_VERSION = 251220 @@ -40,7 +39,6 @@ define KHADAS_BOOT_BUILD_CMDS cp $(KHADAS_BOOT_FIP_DIR)/aml_ddr.fw $(@D)/fip/ cp $(BINARIES_DIR)/u-boot.bin $(@D)/fip/bl33.bin - cd $(@D); $(KHADAS_BOOT_FIP_DIR)/blx_fix.sh \ fip/bl30.bin \ fip/zero_tmp \ diff --git a/buildroot-external/package/qemu-guest-agent/Config.in b/buildroot-external/package/qemu-guest-agent/Config.in index 8ec346511..cc8206ee9 100644 --- a/buildroot-external/package/qemu-guest-agent/Config.in +++ b/buildroot-external/package/qemu-guest-agent/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QEMU_GUEST_AGENT + bool "QEMU Guest Agent" depends on BR2_USE_MMU # libglib2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_ZLIB - bool "QEMU Guest Agent" help - QEMU guest agent for qemu based virtualisations \ No newline at end of file + QEMU guest agent for qemu based virtualisations diff --git a/buildroot-external/package/rpi-eeprom/rpi-eeprom.mk b/buildroot-external/package/rpi-eeprom/rpi-eeprom.mk index ad248e95e..a1ee7d0a6 100644 --- a/buildroot-external/package/rpi-eeprom/rpi-eeprom.mk +++ b/buildroot-external/package/rpi-eeprom/rpi-eeprom.mk @@ -1,8 +1,9 @@ -############################################################# +################################################################################ # # rpi-eeprom # -############################################################# +################################################################################ + RPI_EEPROM_VERSION = 16bb29427f96dc8276a7102c0526154a1084bffd RPI_EEPROM_SITE = $(call github,raspberrypi,rpi-eeprom,$(RPI_EEPROM_VERSION)) RPI_EEPROM_LICENSE = BSD-3-Clause diff --git a/buildroot-external/package/rpi-firmware/rpi-firmware.mk b/buildroot-external/package/rpi-firmware/rpi-firmware.mk index c72febbbe..aa4687488 100644 --- a/buildroot-external/package/rpi-firmware/rpi-firmware.mk +++ b/buildroot-external/package/rpi-firmware/rpi-firmware.mk @@ -1,3 +1,9 @@ +################################################################################ +# +# rpi-firmware +# +################################################################################ + ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y) RPI_FIRMWARE_BOOT_FILES = \ start4.elf \ @@ -24,4 +30,3 @@ define RPI_FIRMWARE_INSTALL_IMAGES_CMDS $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) endef - diff --git a/buildroot-external/package/rpi-rf-mod/Config.in b/buildroot-external/package/rpi-rf-mod/Config.in index d0fac83fc..d4d699d8a 100644 --- a/buildroot-external/package/rpi-rf-mod/Config.in +++ b/buildroot-external/package/rpi-rf-mod/Config.in @@ -1,43 +1,43 @@ config BR2_PACKAGE_RPI_RF_MOD - select BR2_PACKAGE_EQ3_CHAR_LOOP - select BR2_PACKAGE_GENERIC_RAW_UART - bool "Support for RPI-RF-MOD/HM-MOD-RPI-PCB GPIO HAT" + bool "Support for RPI-RF-MOD/HM-MOD-RPI-PCB GPIO HAT" + select BR2_PACKAGE_EQ3_CHAR_LOOP + select BR2_PACKAGE_GENERIC_RAW_UART if BR2_PACKAGE_RPI_RF_MOD config BR2_PACKAGE_RPI_RF_MOD_DTS - bool "Compile Device Tree Overlay" + bool "Compile Device Tree Overlay" if BR2_PACKAGE_RPI_RF_MOD_DTS choice - prompt "For Target" - default BR2_PACKAGE_RPI_RF_MOD_DTS_RPI + prompt "For Target" + default BR2_PACKAGE_RPI_RF_MOD_DTS_RPI config BR2_PACKAGE_RPI_RF_MOD_DTS_RPI - bool "RaspberryPi" - help - For the RaspberryPi + bool "RaspberryPi" + help + For the RaspberryPi config BR2_PACKAGE_RPI_RF_MOD_DTS_TINKER - bool "ASUS Tinkerboard" - help - For the ASUS Tinkerboard + bool "ASUS Tinkerboard" + help + For the ASUS Tinkerboard config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C4 - bool "Odroid-C4" - help - For the Odroid-C4 + bool "Odroid-C4" + help + For the Odroid-C4 config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-N2 - bool "Odroid-N2" - help - For the Odroid-N2 + bool "Odroid-N2" + help + For the Odroid-N2 config BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2 - bool "Odroid-C2" - help - For the Odroid-C2 + bool "Odroid-C2" + help + For the Odroid-C2 endchoice 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 8121e3338..143149175 100644 --- a/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk +++ b/buildroot-external/package/rpi-rf-mod/rpi-rf-mod.mk @@ -1,4 +1,4 @@ -############################################################# +################################################################################ # # Meta package for RPI-RF-MOD/HM-MOD-RPI-PCB device support # for HomeMatic/homematicIP connectivity. @@ -9,7 +9,7 @@ # Copyright (c) 2018-2021 Jens Maus # https://github.com/jens-maus/RaspberryMatic/tree/master/buildroot-external/package/rpi-rf-mod # -############################################################# +################################################################################ RPI_RF_MOD_VERSION = 7f5d50c8ac72e114a6b11a4ae0e92e316260fb0d RPI_RF_MOD_SITE = $(call github,jens-maus,RaspberryMatic,$(RPI_RF_MOD_VERSION)) @@ -36,21 +36,21 @@ else ifeq ($(BR2_PACKAGE_RPI_RF_MOD_DTS_ODROID-C2),y) endif define RPI_RF_MOD_BUILD_CMDS - if [[ -n "$(RPI_RF_MOD_DTS_FILE)" ]]; then \ - $(HOST_DIR)/bin/dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $(@D)/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dtbo $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE).dts; \ - fi - if [[ -n "$(RPI_RF_MOD_DTS_FILE_ALT)" ]]; then \ - $(HOST_DIR)/bin/dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dtbo $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dts; \ - fi + if [[ -n "$(RPI_RF_MOD_DTS_FILE)" ]]; then \ + $(HOST_DIR)/bin/dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $(@D)/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dtbo $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE).dts; \ + fi + if [[ -n "$(RPI_RF_MOD_DTS_FILE_ALT)" ]]; then \ + $(HOST_DIR)/bin/dtc -@ -I dts -O dtb -W no-unit_address_vs_reg -o $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dtbo $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dts; \ + fi endef define RPI_RF_MOD_INSTALL_TARGET_CMDS - if [[ -n "$(RPI_RF_MOD_DTS_FILE)" ]]; then \ - $(INSTALL) -D -m 0644 $(@D)/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dtbo $(BINARIES_DIR)/; \ - fi - if [[ -n "$(RPI_RF_MOD_DTS_FILE_ALT)" ]]; then \ - $(INSTALL) -D -m 0644 $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dtbo $(BINARIES_DIR)/; \ - fi + if [[ -n "$(RPI_RF_MOD_DTS_FILE)" ]]; then \ + $(INSTALL) -D -m 0644 $(@D)/buildroot-external/package/rpi-rf-mod/dts/rpi-rf-mod.dtbo $(BINARIES_DIR)/; \ + fi + if [[ -n "$(RPI_RF_MOD_DTS_FILE_ALT)" ]]; then \ + $(INSTALL) -D -m 0644 $(@D)/buildroot-external/package/rpi-rf-mod/dts/$(RPI_RF_MOD_DTS_FILE_ALT).dtbo $(BINARIES_DIR)/; \ + fi endef $(eval $(generic-package)) diff --git a/buildroot-external/package/rtl8812au/Config.in b/buildroot-external/package/rtl8812au/Config.in index 125d97ecf..970ada7ea 100644 --- a/buildroot-external/package/rtl8812au/Config.in +++ b/buildroot-external/package/rtl8812au/Config.in @@ -5,6 +5,6 @@ config BR2_PACKAGE_RTL8812AU bool "Realtek RTL8812AU Wi-Fi driver" depends on BR2_LINUX_KERNEL help - Install Realtek RTL8812AU Wi-Fi driver as a kernel module. + Install Realtek RTL8812AU Wi-Fi driver as a kernel module. - https://github.com/gnab/rtl8812au/ + https://github.com/gnab/rtl8812au/ 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 62df39d00..cb7ee3424 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 @@ -8,6 +8,8 @@ Currently libsystemd-login is used to inhibit poweroff, sleep and reboot. The library makes calls to systemd-logind which in turn needs quite some services to be present. This can be problematic when using udisks in early boot stages. + +Signed-off-by: Stefan Agner --- configure.ac | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch b/buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch index 88fad4342..6c5fcb61d 100644 --- a/buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch +++ b/buildroot-external/package/udisks2/0001-Isolate-authorization-specific-functions-into-new-co.patch @@ -2,11 +2,13 @@ From abcac570bfe1db867fda504942e6c782ada2aa00 Mon Sep 17 00:00:00 2001 Message-Id: From: Stefan Agner Date: Sat, 13 Mar 2021 14:39:31 +0100 -Subject: [PATCH 1/3] Isolate authorization specific functions into new compile +Subject: [PATCH] Isolate authorization specific functions into new compile unit Introduce udisksauthorization.c for authorization related functionality. This allows to make polkit optional much easier. + +Signed-off-by: Stefan Agner --- src/Makefile.am | 1 + src/udisksauthorization.c | 382 ++++++++++++++++++++++++++++++++ diff --git a/buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch b/buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch index 0fc5b97a1..fdf6316db 100644 --- a/buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch +++ b/buildroot-external/package/udisks2/0002-Make-polkit-dependency-optional.patch @@ -4,12 +4,14 @@ In-Reply-To: From: Stefan Agner Date: Sat, 13 Mar 2021 15:24:45 +0100 -Subject: [PATCH 2/3] Make polkit dependency optional +Subject: [PATCH] Make polkit dependency optional Make authorization using polkit a compile time option. This allows to build udisks2 without polkit. Fixes: #615 + +Signed-off-by: Stefan Agner --- configure.ac | 33 +++++++++++++++---- data/Makefile.am | 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 index a4083ae4b..9f1625a24 100644 --- 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 @@ -4,11 +4,13 @@ In-Reply-To: From: Stefan Agner Date: Fri, 19 Mar 2021 15:54:30 +0100 -Subject: [PATCH 3/3] Avoid autoreconf error if introspection macros are not +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/buildroot-external/package/udisks2/Config.in b/buildroot-external/package/udisks2/Config.in index 82f3ac920..0b64e3af8 100644 --- a/buildroot-external/package/udisks2/Config.in +++ b/buildroot-external/package/udisks2/Config.in @@ -24,8 +24,8 @@ config BR2_PACKAGE_UDISKS2 interfaces that can be used to query and manipulate storage devices. - o a command-line tool, udisksctl(1), that can be used to query - and use the daemon + o a command-line tool, udisksctl(1), that can be used to + query and use the daemon https://github.com/storaged-project/udisks diff --git a/buildroot-external/package/xe-guest-utilities/Config.in b/buildroot-external/package/xe-guest-utilities/Config.in index bd96a97e7..e0186a490 100644 --- a/buildroot-external/package/xe-guest-utilities/Config.in +++ b/buildroot-external/package/xe-guest-utilities/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_XE_GUEST_UTILITIES + bool "Xen guest utilities" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS - bool "Xen guest utilities" help Xen guest utilities for UNIX-like operating systems.