package/usbguard: improve option handling
PATCH 1/2 package/usbguard: improve option handling
Don't pass --disable-seccomp and --disable-systemd unconditionally While at it, also add a space and a new line when needed
--- package/usbguard/usbguard.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
package/usbguard/usbguard.mk +8 -2
@@ -8,9 +8,9 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE -USBGUARD_CONF_OPTS= --with-bundled-catch --with-bundled-pegtl \ +USBGUARD_CONF_OPTS = --with-bundled-catch --with-bundled-pegtl \ --disable-debug-build --without-dbus --without-polkit \ - --disable-seccomp --disable-umockdev --disable-systemd + --disable-umockdev USBGUARD_DEPENDENCIES += libqb protobuf
@@ -18,10 +18,12 @@ ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) USBGUARD_CONF_OPTS += --with-crypto-library=openssl USBGUARD_DEPENDENCIES += libopenssl endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) USBGUARD_CONF_OPTS += --with-crypto-library=gcrypt USBGUARD_DEPENDENCIES += libgcrypt endif + ifeq ($(BR2_PACKAGE_LIBSODIUM),y) USBGUARD_CONF_OPTS += --with-crypto-library=sodium USBGUARD_DEPENDENCIES += libsodium
@@ -30,11 +32,15 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) USBGUARD_CONF_OPTS += --enable-systemd USBGUARD_DEPENDENCIES += systemd +else +USBGUARD_CONF_OPTS += --disable-systemd endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) USBGUARD_CONF_OPTS += --enable-seccomp USBGUARD_DEPENDENCIES += libseccomp +else +USBGUARD_CONF_OPTS += --disable-seccomp endif ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
Signature · 1 line
2.30.2
PATCH 2/2 package/usbguard: fix libgcrypt build
Building with libgcrypt fails since the addition of the package in commit fbff7d7289cc95db991184f890f4ca1fcf8a101e:
checking for sparc64-buildroot-linux-gnu-libgcrypt-config... no checking for libgcrypt-config... no
checking for LIBGCRYPT - version >= 1.5.0... no
configure: error: The selected crypto backend library is not available.
Fix this build failure by helping usbguard to find libgcrypt-config
Fixes:
- http://autobuild.buildroot.org/results/4c19e50a2a5308cb31a62f1b4b538a30353022bb
--- package/usbguard/usbguard.mk | 2 ++ 1 file changed, 2 insertions(+)
package/usbguard/usbguard.mk +2 -0
@@ -20,6 +20,8 @@ USBGUARD_DEPENDENCIES += libopenssl endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +USBGUARD_CONF_ENV += \ + ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config USBGUARD_CONF_OPTS += --with-crypto-library=gcrypt USBGUARD_DEPENDENCIES += libgcrypt endif
Signature · 1 line
2.30.2
PATCH 1/2 package/usbguard: improve option handling
In reply to Fabrice FontaineQuoted 7 lines · On Wed, 23 Jun 2021 18:59:23 +0200 Fabrice Fontaine…
Don't pass --disable-seccomp and --disable-systemd unconditionally While at it, also add a space and a new line when needed
Signed-off-by Fabrice Fontaine <[email protected]>--- package/usbguard/usbguard.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Thanks, I've applied both patches. For this one, I also took this opportunity to split the initial CONF_OPTS assignment to have one option per line, each indented with one tab.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com