diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-04-18 01:16:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-20 13:56:48 +0100 |
commit | 2d07f91008a1498ce3b84ee3f4b70852677cf57c (patch) | |
tree | ba80eba7d68b3860a827a9e2ed9aa3107cc29f51 | |
parent | 397f7130e59bee486c2447c02446400afa8a7840 (diff) | |
download | poky-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.inc | 4 |
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." | |||
6 | HOMEPAGE = "https://www.cups.org/" | 6 | HOMEPAGE = "https://www.cups.org/" |
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
9 | DEPENDS = "gnutls libpng jpeg dbus zlib libusb1" | 9 | DEPENDS = "libpng jpeg dbus zlib libusb1" |
10 | 10 | ||
11 | SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ | 11 | SRC_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)}" |
44 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 44 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" |
45 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" | 45 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" |
46 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" | ||
46 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" | 47 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" |
47 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" | 48 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" |
48 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" | 49 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" |
49 | 50 | ||
50 | EXTRA_OECONF = " \ | 51 | EXTRA_OECONF = " \ |
51 | --enable-gnutls \ | ||
52 | --enable-dbus \ | 52 | --enable-dbus \ |
53 | --enable-browsing \ | 53 | --enable-browsing \ |
54 | --disable-gssapi \ | 54 | --disable-gssapi \ |