summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-04-18 01:16:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-20 13:56:48 +0100
commit2d07f91008a1498ce3b84ee3f4b70852677cf57c (patch)
treeba80eba7d68b3860a827a9e2ed9aa3107cc29f51
parent397f7130e59bee486c2447c02446400afa8a7840 (diff)
downloadpoky-2d07f91008a1498ce3b84ee3f4b70852677cf57c.tar.gz
cups: Turn gnutls into a packageconfig knob
Disable it by default (From OE-Core rev: 438d00af14a0cc108a25b36bf37502f1383865be) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cups/cups.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 244c87001f..9faac08104 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -6,7 +6,7 @@ document types."
6HOMEPAGE = "https://www.cups.org/" 6HOMEPAGE = "https://www.cups.org/"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "Apache-2.0" 8LICENSE = "Apache-2.0"
9DEPENDS = "gnutls libpng jpeg dbus zlib libusb1" 9DEPENDS = "libpng jpeg dbus zlib libusb1"
10 10
11SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ 11SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \
12 file://0001-use-echo-only-in-init.patch \ 12 file://0001-use-echo-only-in-init.patch \
@@ -43,12 +43,12 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi',
43 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" 43 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
44PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" 44PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
45PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" 45PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
46PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
46PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" 47PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam"
47PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" 48PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd"
48PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" 49PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd"
49 50
50EXTRA_OECONF = " \ 51EXTRA_OECONF = " \
51 --enable-gnutls \
52 --enable-dbus \ 52 --enable-dbus \
53 --enable-browsing \ 53 --enable-browsing \
54 --disable-gssapi \ 54 --disable-gssapi \