diff options
author | Ross Burton <ross.burton@intel.com> | 2013-02-21 16:44:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:14:34 +0000 |
commit | 1d1d8f50b770d2cb8628ebb40f055d238edc6dd7 (patch) | |
tree | 1a5697a0ec34620a41d98899cceaf447b47fcdcf | |
parent | 58b1ccf046ad55bb2bdeb64cdea80c0339d891fa (diff) | |
download | poky-1d1d8f50b770d2cb8628ebb40f055d238edc6dd7.tar.gz |
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>
-rw-r--r-- | meta/recipes-core/systemd/systemd_197.bb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index 880fbcdd67..7a31705eaf 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb | |||
@@ -11,7 +11,7 @@ PROVIDES = "udev" | |||
11 | PE = "1" | 11 | PE = "1" |
12 | PR = "r4" | 12 | PR = "r4" |
13 | 13 | ||
14 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt" | 14 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0" |
15 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 15 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
16 | 16 | ||
17 | SECTION = "base/shell" | 17 | SECTION = "base/shell" |
@@ -49,6 +49,10 @@ CACHED_CONFIGUREVARS = "ac_cv_file__usr_share_pci_ids=no \ | |||
49 | 49 | ||
50 | GTKDOC_DOCDIR = "${S}/docs/" | 50 | GTKDOC_DOCDIR = "${S}/docs/" |
51 | 51 | ||
52 | PACKAGECONFIG ??= "" | ||
53 | # Sign the journal for anti-tampering | ||
54 | PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" | ||
55 | |||
52 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools | 56 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools |
53 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ | 57 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ |
54 | --with-rootprefix=${base_prefix} \ | 58 | --with-rootprefix=${base_prefix} \ |