summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-06 10:35:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:03 +0000
commit23c88bb151bfcc8b4e50f6c0543b22ecbc7923b5 (patch)
treeae303a178f9114716a5e465eb78db42dcd35b344
parentaf7cf9566ebf12db8bd04bef54fb4dbfadc64e1f (diff)
downloadpoky-23c88bb151bfcc8b4e50f6c0543b22ecbc7923b5.tar.gz
systemd: remove libsystemd-daemon linkage in libudev
libudev was statically linking to libsystemd-shared, which was linking to libsystemd-daemon (via libtool). This is a spurious dependency so backport a commit from upstream to remove it. (From OE-Core rev: 3348e113d1e77bbe3b78abb7cddf866250421e06) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/udev-linkage.patch62
-rw-r--r--meta/recipes-core/systemd/systemd_197.bb1
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/udev-linkage.patch b/meta/recipes-core/systemd/systemd/udev-linkage.patch
new file mode 100644
index 0000000000..a0d9b4c876
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/udev-linkage.patch
@@ -0,0 +1,62 @@
1Don't cause libudev to link against libsystemd-daemon.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 8ee37c2bed1d452d566abf85b0cdf732b7ca029a Mon Sep 17 00:00:00 2001
7From: Kay Sievers <kay@vrfy.org>
8Date: Thu, 7 Feb 2013 13:47:46 +0100
9Subject: [PATCH] build-sys: at least for now, never link libudev against
10 systemd's shared libraries
11
12---
13 Makefile.am | 12 +++++++++---
14 1 file changed, 9 insertions(+), 3 deletions(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 474110a..0e6c88f 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -811,8 +811,6 @@ libsystemd_shared_la_SOURCES = \
21 src/shared/calendarspec.c \
22 src/shared/calendarspec.h
23
24-libsystemd_shared_la_LIBADD = libsystemd-daemon.la
25-
26 #-------------------------------------------------------------------------------
27 noinst_LTLIBRARIES += \
28 libsystemd-dbus.la
29@@ -1662,6 +1660,9 @@ systemd_tty_ask_password_agent_LDADD = \
30 libsystemd_daemon_la_SOURCES = \
31 src/libsystemd-daemon/sd-daemon.c
32
33+libsystemd_daemon_internal_la_SOURCES = \
34+ $(libsystemd_daemon_la_SOURCES)
35+
36 libsystemd_daemon_la_CFLAGS = \
37 $(AM_CFLAGS) \
38 -fvisibility=hidden \
39@@ -1689,6 +1690,9 @@ UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
40 lib_LTLIBRARIES += \
41 libsystemd-daemon.la
42
43+noinst_LTLIBRARIES += \
44+ libsystemd-daemon-internal.la
45+
46 pkgconfiglib_DATA += \
47 src/libsystemd-daemon/libsystemd-daemon.pc
48
49@@ -1768,7 +1772,9 @@ libudev_la_LDFLAGS = \
50 -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
51
52 libudev_la_LIBADD = \
53- libsystemd-shared.la
54+ libsystemd-shared.la \
55+ libsystemd-daemon-internal.la \
56+ libsystemd-id128-internal.la
57
58 pkgconfiglib_DATA += \
59 src/libudev/libudev.pc
60--
611.7.10.4
62
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index e2bf4159a1..5180eef2b3 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -25,6 +25,7 @@ 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://udev-linkage.patch \
28 " 29 "
29SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" 30SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743"
30SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" 31SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5"