diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-03-06 10:35:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-15 01:53:03 +0000 |
| commit | 23c88bb151bfcc8b4e50f6c0543b22ecbc7923b5 (patch) | |
| tree | ae303a178f9114716a5e465eb78db42dcd35b344 | |
| parent | af7cf9566ebf12db8bd04bef54fb4dbfadc64e1f (diff) | |
| download | ast2050-yocto-poky-23c88bb151bfcc8b4e50f6c0543b22ecbc7923b5.zip ast2050-yocto-poky-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.patch | 62 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_197.bb | 1 |
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 0000000..a0d9b4c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/udev-linkage.patch @@ -0,0 +1,62 @@ +Don't cause libudev to link against libsystemd-daemon. + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 8ee37c2bed1d452d566abf85b0cdf732b7ca029a Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay@vrfy.org> +Date: Thu, 7 Feb 2013 13:47:46 +0100 +Subject: [PATCH] build-sys: at least for now, never link libudev against + systemd's shared libraries + +--- + Makefile.am | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 474110a..0e6c88f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -811,8 +811,6 @@ libsystemd_shared_la_SOURCES = \ + src/shared/calendarspec.c \ + src/shared/calendarspec.h + +-libsystemd_shared_la_LIBADD = libsystemd-daemon.la +- + #------------------------------------------------------------------------------- + noinst_LTLIBRARIES += \ + libsystemd-dbus.la +@@ -1662,6 +1660,9 @@ systemd_tty_ask_password_agent_LDADD = \ + libsystemd_daemon_la_SOURCES = \ + src/libsystemd-daemon/sd-daemon.c + ++libsystemd_daemon_internal_la_SOURCES = \ ++ $(libsystemd_daemon_la_SOURCES) ++ + libsystemd_daemon_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden \ +@@ -1689,6 +1690,9 @@ UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook + lib_LTLIBRARIES += \ + libsystemd-daemon.la + ++noinst_LTLIBRARIES += \ ++ libsystemd-daemon-internal.la ++ + pkgconfiglib_DATA += \ + src/libsystemd-daemon/libsystemd-daemon.pc + +@@ -1768,7 +1772,9 @@ libudev_la_LDFLAGS = \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym + + libudev_la_LIBADD = \ +- libsystemd-shared.la ++ libsystemd-shared.la \ ++ libsystemd-daemon-internal.la \ ++ libsystemd-id128-internal.la + + pkgconfiglib_DATA += \ + src/libudev/libudev.pc +-- +1.7.10.4 + diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index e2bf415..5180eef 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 \ ${UCLIBCPATCHES} \ file://00-create-volatile.conf \ file://0001-systemd-analyze-rewrite-in-C.patch \ + file://udev-linkage.patch \ " SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743" SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5" |
