diff options
| author | Khem Raj <raj.khem@gmail.com> | 2013-01-23 22:04:02 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-01 15:51:31 +0000 |
| commit | 97b8958b194add71f281651be1ab1a825029977d (patch) | |
| tree | 394f4f1291e90a624ce5290f7f7b53c604fda103 /meta | |
| parent | 71ae1992ee79672556b0fb1e066d317044a214cc (diff) | |
| download | openembedded-core-97b8958b194add71f281651be1ab1a825029977d.tar.gz openembedded-core-97b8958b194add71f281651be1ab1a825029977d.tar.bz2 openembedded-core-97b8958b194add71f281651be1ab1a825029977d.zip | |
systemd: Drop ppc build breakage patch for test-unit-file
its been fixed differently upstream in 197
(From OE-Core rev: 50a8bc8cf32f0cf38f0a910b0ae6bba03a2d58d7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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_197.bb | 1 |
2 files changed, 0 insertions, 33 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 deleted file mode 100644 index 4cd2ee63ed..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Submitted - -From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Jan 2013 18:25:46 -0800 -Subject: [PATCH] test-unit-file: Add libsystemd-daemon.la to LDADD - -test-unit-file links with libsystemd-core which needs -sd_* symbols from libsystemd-daemon - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7d5bd5a..884227a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1270,7 +1270,8 @@ test_unit_file_CFLAGS = \ - $(DBUS_CFLAGS) - - test_unit_file_LDADD = \ -- libsystemd-core.la -+ libsystemd-core.la \ -+ libsystemd-daemon.la - - test_log_SOURCES = \ - src/test/test-log.c --- -1.7.9.5 - diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index a9b3fdded9..2b59eadd22 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb @@ -25,7 +25,6 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ ${UCLIBCPATCHES} \ file://00-create-volatile.conf \ file://0001-systemd-analyze-rewrite-in-C.patch \ - file://0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch \ " SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" |