diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_196.bb | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch b/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch new file mode 100644 index 0000000000..4cd2ee63ed --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | Upstream-Status: Submitted | ||
| 2 | |||
| 3 | From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Khem Raj <raj.khem@gmail.com> | ||
| 5 | Date: Tue, 22 Jan 2013 18:25:46 -0800 | ||
| 6 | Subject: [PATCH] test-unit-file: Add libsystemd-daemon.la to LDADD | ||
| 7 | |||
| 8 | test-unit-file links with libsystemd-core which needs | ||
| 9 | sd_* symbols from libsystemd-daemon | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Makefile.am | 3 ++- | ||
| 14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/Makefile.am b/Makefile.am | ||
| 17 | index 7d5bd5a..884227a 100644 | ||
| 18 | --- a/Makefile.am | ||
| 19 | +++ b/Makefile.am | ||
| 20 | @@ -1270,7 +1270,8 @@ test_unit_file_CFLAGS = \ | ||
| 21 | $(DBUS_CFLAGS) | ||
| 22 | |||
| 23 | test_unit_file_LDADD = \ | ||
| 24 | - libsystemd-core.la | ||
| 25 | + libsystemd-core.la \ | ||
| 26 | + libsystemd-daemon.la | ||
| 27 | |||
| 28 | test_log_SOURCES = \ | ||
| 29 | src/test/test-log.c | ||
| 30 | -- | ||
| 31 | 1.7.9.5 | ||
| 32 | |||
diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb index a78a8a6c5b..9801fc567e 100644 --- a/meta/recipes-core/systemd/systemd_196.bb +++ b/meta/recipes-core/systemd/systemd_196.bb | |||
| @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ | |||
| 8 | 8 | ||
| 9 | PROVIDES = "udev" | 9 | PROVIDES = "udev" |
| 10 | 10 | ||
| 11 | PR = "r1" | ||
| 12 | |||
| 11 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt" | 13 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt" |
| 12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
| 13 | 15 | ||
| @@ -23,6 +25,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | |||
| 23 | file://var-run.conf \ | 25 | file://var-run.conf \ |
| 24 | ${UCLIBCPATCHES} \ | 26 | ${UCLIBCPATCHES} \ |
| 25 | file://00-create-volatile.conf \ | 27 | file://00-create-volatile.conf \ |
| 28 | file://0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch \ | ||
| 26 | " | 29 | " |
| 27 | SRC_URI[md5sum] = "05ebd7f108e420e2b4e4810ea4b3c810" | 30 | SRC_URI[md5sum] = "05ebd7f108e420e2b4e4810ea4b3c810" |
| 28 | SRC_URI[sha256sum] = "6bd4a658a5dd8198235b17ad1b1f0cc56d9e6f00d646ddcffdfc6f058b55e4bf" | 31 | SRC_URI[sha256sum] = "6bd4a658a5dd8198235b17ad1b1f0cc56d9e6f00d646ddcffdfc6f058b55e4bf" |
