From: Ross Burton <ross.burton@intel.com>
Date: Thu, 21 Feb 2013 16:44:36 +0000 (+0000)
Subject: systemd: make gcrypt support (for signing the journal) optional
X-Git-Tag: rev_ivi_2015_02_04~13456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=117d24586aa256a1077e8e4c1001c0642d684e0a;p=scm%2Fbb%2Ftizen-distro.git

systemd: make gcrypt support (for signing the journal) optional

(From OE-Core rev: 9ca041ccc6af1378a1072bdde678c0e97faedde6)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 880fbcd..7a31705 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -11,7 +11,7 @@ PROVIDES = "udev"
 PE = "1"
 PR = "r4"
 
-DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt"
+DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SECTION = "base/shell"
@@ -49,6 +49,10 @@ CACHED_CONFIGUREVARS = "ac_cv_file__usr_share_pci_ids=no \
 
 GTKDOC_DOCDIR = "${S}/docs/"
 
+PACKAGECONFIG ??= ""
+# Sign the journal for anti-tampering
+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
+
 # The gtk+ tools should get built as a separate recipe e.g. systemd-tools
 EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \
                  --with-rootprefix=${base_prefix} \