* [Buildroot] [PATCH 1/2] package/usbguard: improve option handling
@ 2021-06-23 16:59 Fabrice Fontaine
2021-06-23 16:59 ` [Buildroot] [PATCH 2/2] package/usbguard: fix libgcrypt build Fabrice Fontaine
2021-06-26 13:07 ` [Buildroot] [PATCH 1/2] package/usbguard: improve option handling Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-06-23 16:59 UTC (permalink / raw)
To: buildroot
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 <fontaine.fabrice@gmail.com>
---
package/usbguard/usbguard.mk | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk
index 72e9e6459a..3aff254b3e 100644
--- a/package/usbguard/usbguard.mk
+++ b/package/usbguard/usbguard.mk
@@ -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)
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] package/usbguard: fix libgcrypt build
2021-06-23 16:59 [Buildroot] [PATCH 1/2] package/usbguard: improve option handling Fabrice Fontaine
@ 2021-06-23 16:59 ` Fabrice Fontaine
2021-06-26 13:07 ` [Buildroot] [PATCH 1/2] package/usbguard: improve option handling Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2021-06-23 16:59 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/usbguard/usbguard.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk
index 3aff254b3e..ff5a311a7b 100644
--- a/package/usbguard/usbguard.mk
+++ b/package/usbguard/usbguard.mk
@@ -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
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/2] package/usbguard: improve option handling
2021-06-23 16:59 [Buildroot] [PATCH 1/2] package/usbguard: improve option handling Fabrice Fontaine
2021-06-23 16:59 ` [Buildroot] [PATCH 2/2] package/usbguard: fix libgcrypt build Fabrice Fontaine
@ 2021-06-26 13:07 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2021-06-26 13:07 UTC (permalink / raw)
To: buildroot
On Wed, 23 Jun 2021 18:59:23 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> 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 <fontaine.fabrice@gmail.com>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-26 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-23 16:59 [Buildroot] [PATCH 1/2] package/usbguard: improve option handling Fabrice Fontaine
2021-06-23 16:59 ` [Buildroot] [PATCH 2/2] package/usbguard: fix libgcrypt build Fabrice Fontaine
2021-06-26 13:07 ` [Buildroot] [PATCH 1/2] package/usbguard: improve option handling Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.