From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file
Date: Mon, 28 Jan 2013 11:58:27 -0800 [thread overview]
Message-ID: <25339fa58dfb08985df8f6b602e00df5d9d576c9.1359402980.git.raj.khem@gmail.com> (raw)
In-Reply-To: <9496d315c6d89dd6e4147cbdfd7b974fa4ed1d43.1359402980.git.raj.khem@gmail.com>
In-Reply-To: <cover.1359402980.git.raj.khem@gmail.com>
its been fixed differently upstream in 197
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...it-file-Add-libsystemd-daemon.la-to-LDADD.patch | 32 --------------------
meta/recipes-core/systemd/systemd_197.bb | 3 --
2 files changed, 35 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch
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@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 500c3ec..d4fee45 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
PROVIDES = "udev"
-PR = "r1"
-
DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -24,7 +22,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"
--
1.7.9.5
next prev parent reply other threads:[~2013-01-28 20:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 19:58 [PATCH 0/3] rpcbind, module bbclass and systemd fix Khem Raj
2013-01-28 19:58 ` [PATCH 1/3] rpcbind: Dont use nss with uclibc Khem Raj
2013-01-28 19:58 ` Khem Raj [this message]
2013-01-28 20:10 ` [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file Martin Jansa
2013-01-28 20:26 ` Khem Raj
2013-01-28 19:58 ` [PATCH 3/3] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25339fa58dfb08985df8f6b602e00df5d9d576c9.1359402980.git.raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox