diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-27 13:00:31 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-19 15:53:32 +0100 |
| commit | ded32eb59dd43e56b3b6f9dfe270d8cbde58f31a (patch) | |
| tree | 6793060e29097f1a15765e899720fa75bada4fd4 /meta-oe/recipes-connectivity | |
| parent | acd60a9825a629d8fdfe33634f559a17309c7b9d (diff) | |
| download | meta-openembedded-ded32eb59dd43e56b3b6f9dfe270d8cbde58f31a.tar.gz | |
networkmanager: make it compatible with systemd-209
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch new file mode 100644 index 0000000000..e356e9b25b --- /dev/null +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch @@ -0,0 +1,30 @@ +From 10427a19302e871daeeb245581e930dc58195492 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Thu, 27 Feb 2014 12:59:03 +0100 +Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login + +* they were merged into libsystemd in systemd-209 + +Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cc66e9b..3fe958e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -283,7 +283,7 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$" + AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit") + AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd") + if test "$with_session_tracking" = "systemd"; then +- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd]) + AC_SUBST(SYSTEMD_LOGIN_CFLAGS) + AC_SUBST(SYSTEMD_LOGIN_LIBS) + fi +-- +1.9.0 + diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb index 46b3cc700c..3c7944dcc2 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb @@ -12,6 +12,7 @@ SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ file://0002-NetworkManager.service-remove-reference-to-NetworkMa.patch \ + file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ " SRC_URI[md5sum] = "38d28f6bd9220d85dfff47210706195c" SRC_URI[sha256sum] = "c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b" |