summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-23 22:04:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-01 15:54:29 +0000
commit9926eb599605f00910623ac1baa3ac134256a891 (patch)
treec09fa1a5f312af18612e76e9bcac2d2d5d93ce75 /meta/recipes-core
parentf95bbe35b2aab929e50471db8ba50781d5027a01 (diff)
downloadpoky-9926eb599605f00910623ac1baa3ac134256a891.tar.gz
systemd: Drop ppc build breakage patch for test-unit-file
its been fixed differently upstream in 197 (From OE-Core rev: 50a8bc8cf32f0cf38f0a910b0ae6bba03a2d58d7) (From OE-Core rev: 97b8958b194add71f281651be1ab1a825029977d) 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/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch32
-rw-r--r--meta/recipes-core/systemd/systemd_197.bb1
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 @@
1Upstream-Status: Submitted
2
3From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001
4From: Khem Raj <raj.khem@gmail.com>
5Date: Tue, 22 Jan 2013 18:25:46 -0800
6Subject: [PATCH] test-unit-file: Add libsystemd-daemon.la to LDADD
7
8test-unit-file links with libsystemd-core which needs
9sd_* symbols from libsystemd-daemon
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 Makefile.am | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 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--
311.7.9.5
32
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 \
25 ${UCLIBCPATCHES} \ 25 ${UCLIBCPATCHES} \
26 file://00-create-volatile.conf \ 26 file://00-create-volatile.conf \
27 file://0001-systemd-analyze-rewrite-in-C.patch \ 27 file://0001-systemd-analyze-rewrite-in-C.patch \
28 file://0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch \
29 " 28 "
30SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" 29SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743"
31SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" 30SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5"