diff options
author | Christopher Larson <chris_larson@mentor.com> | 2013-05-30 19:26:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-31 08:06:56 +0100 |
commit | 291a3adfd548944fad616f6e6e2113f3b145c8aa (patch) | |
tree | 4b675eb256579d0f18ef287a9f046672da6afb6c /meta/recipes-core | |
parent | 25bf08a0e7c7b1b415f622ab68bc8b144b6a5ec0 (diff) | |
download | poky-291a3adfd548944fad616f6e6e2113f3b145c8aa.tar.gz |
systemd: obey 'tcp-wrappers' PACKAGECONFIG
(From OE-Core rev: 5ada1631ee6feb0b031b64c9fe5cf0d390c732f9)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd_204.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb index e7b9f6a2ac..5a63c7c14a 100644 --- a/meta/recipes-core/systemd/systemd_204.bb +++ b/meta/recipes-core/systemd/systemd_204.bb | |||
@@ -10,7 +10,7 @@ PROVIDES = "udev" | |||
10 | 10 | ||
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 qemu-native util-linux" | 13 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" |
14 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
15 | 15 | ||
16 | SECTION = "base/shell" | 16 | SECTION = "base/shell" |
@@ -41,7 +41,7 @@ LDFLAGS_libc-uclibc_append = " -lrt" | |||
41 | 41 | ||
42 | GTKDOC_DOCDIR = "${S}/docs/" | 42 | GTKDOC_DOCDIR = "${S}/docs/" |
43 | 43 | ||
44 | PACKAGECONFIG ??= "xz" | 44 | PACKAGECONFIG ??= "xz tcp-wrappers" |
45 | # Sign the journal for anti-tampering | 45 | # Sign the journal for anti-tampering |
46 | PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" | 46 | PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" |
47 | # regardless of PACKAGECONFIG, libgcrypt is always required to expand | 47 | # regardless of PACKAGECONFIG, libgcrypt is always required to expand |
@@ -49,6 +49,7 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" | |||
49 | DEPENDS += "libgcrypt" | 49 | DEPENDS += "libgcrypt" |
50 | # Compress the journal | 50 | # Compress the journal |
51 | PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" | 51 | PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" |
52 | PACKAGECONFIG[tcp-wrappers] = "--enable-tcpwrap,--disable-tcpwrap,tcp-wrappers" | ||
52 | 53 | ||
53 | CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" | 54 | CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill" |
54 | 55 | ||