Patchwork [2/3] systemd: Drop ppc build breakage patch for test-unit-file

login
register
mail settings
Submitter Khem Raj
Date Jan. 28, 2013, 7:58 p.m.
Message ID <25339fa58dfb08985df8f6b602e00df5d9d576c9.1359402980.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/43571/
State New
Headers show

Comments

Khem Raj - Jan. 28, 2013, 7:58 p.m.
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
Martin Jansa - Jan. 28, 2013, 8:10 p.m.
On Mon, Jan 28, 2013 at 11:58:27AM -0800, Khem Raj wrote:
> 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"
> -

^ PR going backwards

>  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
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - Jan. 28, 2013, 8:26 p.m.
On Mon, Jan 28, 2013 at 12:10 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> -PR = "r1"
>> -
>
> ^ PR going backwards

bah merge did not tell me that too bad fixed now in branch

Thanks

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"