From 94d737223bf5f8c4fd035f73b5ff2b4b11b32c57 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 12 Nov 2022 14:10:28 +0100 Subject: chrony: Remove the libcap and nss PACKAGECONFIGs There is no need for these configs on their own and they would only mess up the sechash and privdrop configs. To actually enable sechash one also had to enable nss, and to enable privdrop one also had to enable libcap. This also avoids passing --with-libcap if privdrop is enabled since the option does not exist. Signed-off-by: Peter Kjellerstedt Signed-off-by: Armin Kuster --- meta-networking/recipes-support/chrony/chrony_4.2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-networking/recipes-support/chrony/chrony_4.2.bb b/meta-networking/recipes-support/chrony/chrony_4.2.bb index dfa1ed86fd..8d12cc75e2 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.2.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.2.bb @@ -64,14 +64,14 @@ PACKAGECONFIG ??= "editline \ " PACKAGECONFIG[editline] = ",--without-editline,libedit" PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" -PACKAGECONFIG[privdrop] = "--with-libcap,--disable-privdrop --without-libcap,libcap" +PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp,libseccomp" PACKAGECONFIG[ipv6] = ",--disable-ipv6," -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -# This is left for backwards compatibility, to avoid breaking existing +# These are left for backwards compatibility, to avoid breaking existing # configurations. +PACKAGECONFIG[libcap] = "" +PACKAGECONFIG[nss] = "" PACKAGECONFIG[readline] = "" # --disable-static isn't supported by chrony's configure script. -- cgit v1.2.3-54-g00ecf