[oe-commits] Khem Raj : systemd: Drop ppc build breakage patch for test-unit-file

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: ca349b97987d1365f1e7f65960eaa7d3cd7a8c30
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ca349b97987d1365f1e7f65960eaa7d3cd7a8c30

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Jan 23 22:04:02 2013 -0800

systemd: Drop ppc build breakage patch for test-unit-file

its been fixed differently upstream in 197

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 ...it-file-Add-libsystemd-daemon.la-to-LDADD.patch |   32 --------------------
 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 4cd2ee6..0000000
--- 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 at 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 at 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 a9b3fdd..2b59ead 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"