summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-11-28 13:26:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:29 +0000
commitf9c12adaf8b3db01a91cc1ea11369d89a3a61c41 (patch)
tree07af401695250da26f363bdc464bbc8340b22ce1 /meta/recipes-bsp
parentb71f78ed6d17432aaaa389bdfc175e2d397a3f74 (diff)
downloadpoky-f9c12adaf8b3db01a91cc1ea11369d89a3a61c41.tar.gz
systemd: Upgrade to 232
* Drop support for rcS.d SysV init scripts. These are prone to cause dependency loops, and almost all packages with rcS scripts now ship a native systemd service. * Drop mount propagation patch, it only happens with libseccomp, OE doesnt enable it * kdbus option has disappeared from configure * Ignore dev-so for PN now since systemd introduced private .so see https://github.com/systemd/systemd/issues/3810 * Add libnss* to PACKAGES_DYNAMIC for libnss-resolve to work correctly * Forward port systemd-boot patches to systemd-232 (From OE-Core rev: e6c1765a05c1321f08f3d1fb521dfe6b07bc8e92) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch55
1 files changed, 17 insertions, 38 deletions
diff --git a/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
index 103d2861e8..bc92db7468 100644
--- a/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ b/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
@@ -1,31 +1,22 @@
1From 9dcd2c80347493f73800d8c1cb539f1daef14394 Mon Sep 17 00:00:00 2001 1From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Jul 2016 03:54:42 -0400 3Date: Wed, 9 Nov 2016 19:32:14 -0800
4Subject: [PATCH] use lnr wrapper instead of looking for --relative option for ln 4Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative
5 option for ln
5 6
6Upstream-Status: Inappropriate [OE-Specific] 7Upstream-Status: Inappropriate [OE-Specific]
7 8
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10--- 10---
11 Makefile.am | 6 +++--- 11 Makefile.am | 2 +-
12 configure.ac | 2 -- 12 configure.ac | 2 --
13 2 files changed, 3 insertions(+), 5 deletions(-) 13 2 files changed, 1 insertion(+), 3 deletions(-)
14 14
15diff --git a/Makefile.am b/Makefile.am 15Index: git/Makefile.am
16index 305099a..f08d023 100644 16===================================================================
17--- a/Makefile.am 17--- git.orig/Makefile.am
18+++ b/Makefile.am 18+++ git/Makefile.am
19@@ -247,7 +247,7 @@ define move-to-rootlibdir 19@@ -320,7 +320,7 @@ define install-relative-aliases
20 $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
21 so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
22 rm -f $(DESTDIR)$(libdir)/$$libname && \
23- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
24+ lnr $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
25 mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
26 fi
27 endef
28@@ -321,7 +321,7 @@ define install-relative-aliases
29 while [ -n "$$1" ]; do \ 20 while [ -n "$$1" ]; do \
30 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ 21 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
31 rm -f $(DESTDIR)$$dir/$$2 && \ 22 rm -f $(DESTDIR)$$dir/$$2 && \
@@ -34,20 +25,11 @@ index 305099a..f08d023 100644
34 shift 2 || exit $$?; \ 25 shift 2 || exit $$?; \
35 done 26 done
36 endef 27 endef
37@@ -2906,7 +2906,7 @@ systemd_dbus1_generator_LDADD = \ 28Index: git/configure.ac
38 dbus1-generator-install-hook: 29===================================================================
39 $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) 30--- git.orig/configure.ac
40 $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator 31+++ git/configure.ac
41- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator 32@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
42+ $(AM_V_LN)lnr $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
43
44 dbus1-generator-uninstall-hook:
45 rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
46diff --git a/configure.ac b/configure.ac
47index 329861a..52c6e3d 100644
48--- a/configure.ac
49+++ b/configure.ac
50@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
51 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) 33 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
52 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) 34 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
53 35
@@ -56,6 +38,3 @@ index 329861a..52c6e3d 100644
56 M4_DEFINES= 38 M4_DEFINES=
57 39
58 AC_CHECK_TOOL(OBJCOPY, objcopy) 40 AC_CHECK_TOOL(OBJCOPY, objcopy)
59--
602.8.1
61