summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-22 21:36:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-26 17:16:24 +0000
commit64ab17b707dc431aaed880d6d8615971243f46f8 (patch)
tree8eaf41c6096122e95c83e0ee42f0a346ca1455c1 /meta/recipes-core
parent44248af1735e95dc636619200c25eb7250e77d95 (diff)
downloadpoky-64ab17b707dc431aaed880d6d8615971243f46f8.tar.gz
systemd: Upgrade to 229
Forward port all existing patches and arrange them such such uclibc-only and qemu-only patches appear first Add new patches to fix build on uclibc ( 0019-0022 ) Convert the lnr sed operation into a static patch Use PACKAGECONFIG setting to disable features for muls and uclibc instead of modifying EXTRA_OECONF manually Drop compat from PACKAGECONFIG, this options has been removed from systemd Tested/booted sato iamge on all qemus and qemux86-64 on uclibc (From OE-Core rev: 50743301bd8c0c4817d039d08c9567d15243a74d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch (renamed from meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch)10
-rw-r--r--meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch (renamed from meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch)14
-rw-r--r--meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch (renamed from meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch)23
-rw-r--r--meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch8
-rw-r--r--meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch61
-rw-r--r--meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch (renamed from meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch)18
-rw-r--r--meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch (renamed from meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch)10
-rw-r--r--meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch (renamed from meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch)6
-rw-r--r--meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch (renamed from meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch)12
-rw-r--r--meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch (renamed from meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch)6
-rw-r--r--meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch (renamed from meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch)40
-rw-r--r--meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch (renamed from meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch)64
-rw-r--r--meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch (renamed from meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch)6
-rw-r--r--meta/recipes-core/systemd/systemd/0016-Revert-rules-remove-firmware-loading-rules.patch (renamed from meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch)6
-rw-r--r--meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch (renamed from meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch)48
-rw-r--r--meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch (renamed from meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch)18
-rw-r--r--meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch42
-rw-r--r--meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch44
-rw-r--r--meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch27
-rw-r--r--meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch36
-rw-r--r--meta/recipes-core/systemd/systemd_229.bb (renamed from meta/recipes-core/systemd/systemd_228.bb)65
23 files changed, 389 insertions, 191 deletions
diff --git a/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
index 74629fc82a..f7ef7a3219 100644
--- a/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
+++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -1,7 +1,7 @@
1From ef867afd27e8fed558e82430759d8d2c7efb6608 Mon Sep 17 00:00:00 2001 1From 3bc4552117879f57522b5972b724729ca993f1ea Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 04:09:19 +0000 3Date: Mon, 14 Dec 2015 04:09:19 +0000
4Subject: [PATCH 04/16] core/device.c: Change the default device timeout to 240 4Subject: [PATCH 01/36] core/device.c: Change the default device timeout to 240
5 sec. 5 sec.
6MIME-Version: 1.0 6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 7Content-Type: text/plain; charset=UTF-8
@@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/src/core/device.c b/src/core/device.c 18diff --git a/src/core/device.c b/src/core/device.c
19index bcd4d11..f41bb54 100644 19index d201dc5..340d62a 100644
20--- a/src/core/device.c 20--- a/src/core/device.c
21+++ b/src/core/device.c 21+++ b/src/core/device.c
22@@ -114,7 +114,7 @@ static void device_init(Unit *u) { 22@@ -112,7 +112,7 @@ static void device_init(Unit *u) {
23 * indefinitely for plugged in devices, something which cannot 23 * indefinitely for plugged in devices, something which cannot
24 * happen for the other units since their operations time out 24 * happen for the other units since their operations time out
25 * anyway. */ 25 * anyway. */
@@ -29,5 +29,5 @@ index bcd4d11..f41bb54 100644
29 u->ignore_on_isolate = true; 29 u->ignore_on_isolate = true;
30 } 30 }
31-- 31--
322.6.4 321.8.3.1
33 33
diff --git a/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
index 55ff0ce15f..28939eb021 100644
--- a/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
+++ b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
@@ -1,7 +1,7 @@
1From bfb6562cdbec73d03765ce707e9e0cac138fd223 Mon Sep 17 00:00:00 2001 1From e5f405aba347d216e7f2b73d7dd681b13be442e3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:29:15 +0000 3Date: Fri, 20 Feb 2015 05:29:15 +0000
4Subject: [PATCH 02/16] units: Prefer getty to agetty in console setup systemd 4Subject: [PATCH 02/36] units: Prefer getty to agetty in console setup systemd
5 units 5 units
6 6
7Upstream-Status: Inappropriate [configuration specific] 7Upstream-Status: Inappropriate [configuration specific]
@@ -40,5 +40,5 @@ index 4522d0d..e6d499d 100644
40 Restart=always 40 Restart=always
41 UtmpIdentifier=%I 41 UtmpIdentifier=%I
42-- 42--
432.6.4 431.8.3.1
44 44
diff --git a/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
index 8bb775ffa5..f183261c8d 100644
--- a/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
+++ b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
@@ -1,7 +1,7 @@
1From ddad25c809846e08ea39bef49cc668f95d53304a Mon Sep 17 00:00:00 2001 1From 699893a05edac5194f9670529bacfaeb67252edb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 00:42:49 +0000 3Date: Mon, 14 Dec 2015 00:42:49 +0000
4Subject: [PATCH 01/16] define exp10 if missing 4Subject: [PATCH 03/36] define exp10 if missing
5 5
6Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch 6Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
7 7
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 5 insertions(+) 16 1 file changed, 5 insertions(+)
17 17
18diff --git a/src/basic/missing.h b/src/basic/missing.h 18diff --git a/src/basic/missing.h b/src/basic/missing.h
19index d539ed0..09a233b 100644 19index f3d3236..ee7e7ea 100644
20--- a/src/basic/missing.h 20--- a/src/basic/missing.h
21+++ b/src/basic/missing.h 21+++ b/src/basic/missing.h
22@@ -1125,3 +1125,8 @@ static inline key_serial_t request_key(const char *type, const char *description 22@@ -1169,3 +1169,8 @@ static inline key_serial_t request_key(const char *type, const char *description
23 #ifndef KEY_SPEC_USER_KEYRING 23 #endif
24 #define KEY_SPEC_USER_KEYRING -4 24
25 #endif 25 #endif
26+ 26+
27+#ifdef __UCLIBC__ 27+#ifdef __UCLIBC__
@@ -29,5 +29,5 @@ index d539ed0..09a233b 100644
29+#define exp10(x) (exp((x) * log(10))) 29+#define exp10(x) (exp((x) * log(10)))
30+#endif /* __UCLIBC__ */ 30+#endif /* __UCLIBC__ */
31-- 31--
322.6.4 321.8.3.1
33 33
diff --git a/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
index cbf69d109a..989a1fa1df 100644
--- a/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
+++ b/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
@@ -1,7 +1,7 @@
1From 9e79bb4bea758f25803e9f7ff2c5835ac4204230 Mon Sep 17 00:00:00 2001 1From bb8d8148b16572ae17d3c308552cf73915386b05 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 12 Sep 2015 19:10:04 +0000 3Date: Sat, 12 Sep 2015 19:10:04 +0000
4Subject: [PATCH 03/16] Use getenv when secure versions are not available 4Subject: [PATCH 04/36] Use getenv when secure versions are not available
5 5
6musl doesnt implement secure version, so we default 6musl doesnt implement secure version, so we default
7to it if configure does not detect a secure imeplementation 7to it if configure does not detect a secure imeplementation
@@ -9,30 +9,27 @@ to it if configure does not detect a secure imeplementation
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Denied 10Upstream-Status: Denied
11--- 11---
12 src/basic/missing.h | 5 +++-- 12 src/basic/missing.h | 3 +--
13 1 file changed, 3 insertions(+), 2 deletions(-) 13 1 file changed, 1 insertion(+), 2 deletions(-)
14 14
15diff --git a/src/basic/missing.h b/src/basic/missing.h 15diff --git a/src/basic/missing.h b/src/basic/missing.h
16index 09a233b..3c37466 100644 16index ee7e7ea..3170429 100644
17--- a/src/basic/missing.h 17--- a/src/basic/missing.h
18+++ b/src/basic/missing.h 18+++ b/src/basic/missing.h
19@@ -582,13 +582,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle 19@@ -585,12 +585,11 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
20 return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags); 20 return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
21 } 21 }
22 #endif 22 #endif
23- 23-
24-#ifndef HAVE_SECURE_GETENV 24 #ifndef HAVE_SECURE_GETENV
25+#ifdef HAVE_SECURE_GETENV
26 # ifdef HAVE___SECURE_GETENV 25 # ifdef HAVE___SECURE_GETENV
27 # define secure_getenv __secure_getenv 26 # define secure_getenv __secure_getenv
28 # else 27 # else
29 # error "neither secure_getenv nor __secure_getenv are available" 28-# error "neither secure_getenv nor __secure_getenv are available"
29+# define secure_getenv getenv
30 # endif 30 # endif
31+#else
32+# define secure_getenv getenv
33 #endif 31 #endif
34 32
35 #ifndef CIFS_MAGIC_NUMBER
36-- 33--
372.6.4 341.8.3.1
38 35
diff --git a/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index 0b75facbaa..f69e26ec5c 100644
--- a/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,7 +1,7 @@
1From 319873d22a6b1225ae41aa38bc976e723326ba20 Mon Sep 17 00:00:00 2001 1From 3436b12d40bf4f4ab7e3e16600e5f6c35a470da4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:03:44 +0000 3Date: Fri, 20 Feb 2015 05:03:44 +0000
4Subject: [PATCH 05/16] binfmt: Don't install dependency links at install time 4Subject: [PATCH 05/36] binfmt: Don't install dependency links at install time
5 for the binfmt services 5 for the binfmt services
6 6
7use [Install] blocks so that they get created when the service is enabled 7use [Install] blocks so that they get created when the service is enabled
@@ -24,10 +24,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
24 3 files changed, 8 insertions(+), 4 deletions(-) 24 3 files changed, 8 insertions(+), 4 deletions(-)
25 25
26diff --git a/Makefile.am b/Makefile.am 26diff --git a/Makefile.am b/Makefile.am
27index 00a92e3..4c1143a 100644 27index 03341fc..629740f 100644
28--- a/Makefile.am 28--- a/Makefile.am
29+++ b/Makefile.am 29+++ b/Makefile.am
30@@ -4455,10 +4455,6 @@ INSTALL_DIRS += \ 30@@ -4387,10 +4387,6 @@ INSTALL_DIRS += \
31 $(prefix)/lib/binfmt.d \ 31 $(prefix)/lib/binfmt.d \
32 $(sysconfdir)/binfmt.d 32 $(sysconfdir)/binfmt.d
33 33
@@ -70,5 +70,5 @@ index d53073e..8c57ee0 100644
70+[Install] 70+[Install]
71+WantedBy=sysinit.target 71+WantedBy=sysinit.target
72-- 72--
732.6.4 731.8.3.1
74 74
diff --git a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
index a2c40b55f6..0d63755731 100644
--- a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
+++ b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
@@ -1,7 +1,7 @@
1From d1fe5d2dd38cdef984296f453c65ccaebb71d1a9 Mon Sep 17 00:00:00 2001 1From bb6f1d8a000b337280541afde7cccdcfe03cdeb1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:05:45 +0000 3Date: Fri, 20 Feb 2015 05:05:45 +0000
4Subject: [PATCH 06/16] configure: Check for additional features that uclibc 4Subject: [PATCH 06/36] configure: Check for additional features that uclibc
5 doesnt support 5 doesnt support
6 6
7This helps in supporting uclibc which does not have all features that 7This helps in supporting uclibc which does not have all features that
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 18 insertions(+) 15 1 file changed, 18 insertions(+)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
18index 3128ca8..49f73a4 100644 18index f51533c..0239fd0 100644
19--- a/configure.ac 19--- a/configure.ac
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -112,6 +112,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin] 21@@ -112,6 +112,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]
@@ -44,5 +44,5 @@ index 3128ca8..49f73a4 100644
44 44
45 AC_CHECK_TOOL(OBJCOPY, objcopy) 45 AC_CHECK_TOOL(OBJCOPY, objcopy)
46-- 46--
472.6.4 471.8.3.1
48 48
diff --git a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
new file mode 100644
index 0000000000..12f6ace93d
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
@@ -0,0 +1,61 @@
1From fa5e137fbd2fb081ae897575377d718ee8cb6349 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 Dec 2015 04:20:28 +0000
4Subject: [PATCH 07/36] use lnr wrapper instead of looking for --relative
5 option for ln
6
7Upstream-Status: Inappropriate [OE-Specific]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Makefile.am | 6 +++---
12 configure.ac | 2 --
13 2 files changed, 3 insertions(+), 5 deletions(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index 629740f..82b6553 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -243,7 +243,7 @@ define move-to-rootlibdir
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@@ -317,7 +317,7 @@ define install-relative-aliases
29 while [ -n "$$1" ]; do \
30 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
31 rm -f $(DESTDIR)$$dir/$$2 && \
32- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
33+ lnr $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
34 shift 2 || exit $$?; \
35 done
36 endef
37@@ -2781,7 +2781,7 @@ systemd_dbus1_generator_LDADD = \
38 dbus1-generator-install-hook:
39 $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
40 $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
41- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
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 0239fd0..c5ab9d0 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])
52 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
53
54-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
55-
56 # check for few functions not implemented in uClibc
57
58 AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate)
59--
601.8.3.1
61
diff --git a/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
index 85d39078ff..6e6f199ef1 100644
--- a/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
+++ b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
@@ -1,7 +1,7 @@
1From 529e7e2f7f6a5dc0e4527ff5c2237b19ece2f112 Mon Sep 17 00:00:00 2001 1From ae999ff50efb9cc82537adef7696c6f732afcfc8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:10:37 +0000 3Date: Fri, 20 Feb 2015 05:10:37 +0000
4Subject: [PATCH 07/16] nspawn: Use execvpe only when libc supports it 4Subject: [PATCH 08/36] nspawn: Use execvpe only when libc supports it
5 5
6Upstream-Status: Denied [no desire for uclibc support] 6Upstream-Status: Denied [no desire for uclibc support]
7 7
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 7 insertions(+) 11 1 file changed, 7 insertions(+)
12 12
13diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 13diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
14index a4e13bd..4def6ba 100644 14index 5a68fec..65e65ec 100644
15--- a/src/nspawn/nspawn.c 15--- a/src/nspawn/nspawn.c
16+++ b/src/nspawn/nspawn.c 16+++ b/src/nspawn/nspawn.c
17@@ -112,6 +112,8 @@ typedef enum LinkJournal { 17@@ -111,6 +111,8 @@ typedef enum LinkJournal {
18 LINK_GUEST 18 LINK_GUEST
19 } LinkJournal; 19 } LinkJournal;
20 20
@@ -22,8 +22,8 @@ index a4e13bd..4def6ba 100644
22+ 22+
23 static char *arg_directory = NULL; 23 static char *arg_directory = NULL;
24 static char *arg_template = NULL; 24 static char *arg_template = NULL;
25 static char *arg_user = NULL; 25 static char *arg_chdir = NULL;
26@@ -2595,7 +2597,12 @@ static int inner_child( 26@@ -2637,7 +2639,12 @@ static int inner_child(
27 a[0] = (char*) "/sbin/init"; 27 a[0] = (char*) "/sbin/init";
28 execve(a[0], a, env_use); 28 execve(a[0], a, env_use);
29 } else if (!strv_isempty(arg_parameters)) 29 } else if (!strv_isempty(arg_parameters))
@@ -34,8 +34,8 @@ index a4e13bd..4def6ba 100644
34+ execvp(arg_parameters[0], arg_parameters); 34+ execvp(arg_parameters[0], arg_parameters);
35+#endif /* HAVE_EXECVPE */ 35+#endif /* HAVE_EXECVPE */
36 else { 36 else {
37 chdir(home ?: "/root"); 37 if (!arg_chdir)
38 execle("/bin/bash", "-bash", NULL, env_use); 38 chdir(home ?: "/root");
39-- 39--
402.6.4 401.8.3.1
41 41
diff --git a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
index 8d71ecbc0f..116f3d4de6 100644
--- a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
+++ b/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
@@ -1,7 +1,7 @@
1From 83944758dc0703afea81f3c7aa0ad926bc5df757 Mon Sep 17 00:00:00 2001 1From 3498f488b27f90398d7c8d1d06aac5ab684370e8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 00:47:53 +0000 3Date: Mon, 14 Dec 2015 00:47:53 +0000
4Subject: [PATCH 08/16] util: bypass unimplemented _SC_PHYS_PAGES system 4Subject: [PATCH 09/36] util: bypass unimplemented _SC_PHYS_PAGES system
5 configuration API on uclibc 5 configuration API on uclibc
6 6
7Upstream-Status: Inappropriate [uclibc-specific] 7Upstream-Status: Inappropriate [uclibc-specific]
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 15 insertions(+) 12 1 file changed, 15 insertions(+)
13 13
14diff --git a/src/basic/util.c b/src/basic/util.c 14diff --git a/src/basic/util.c b/src/basic/util.c
15index 9e0b576..65f0edf 100644 15index ea1bed7..fdaf340 100644
16--- a/src/basic/util.c 16--- a/src/basic/util.c
17+++ b/src/basic/util.c 17+++ b/src/basic/util.c
18@@ -769,10 +769,25 @@ uint64_t physical_memory(void) { 18@@ -767,10 +767,25 @@ uint64_t physical_memory(void) {
19 /* We return this as uint64_t in case we are running as 32bit 19 /* We return this as uint64_t in case we are running as 32bit
20 * process on a 64bit kernel with huge amounts of memory */ 20 * process on a 64bit kernel with huge amounts of memory */
21 21
@@ -42,5 +42,5 @@ index 9e0b576..65f0edf 100644
42 42
43 int update_reboot_param_file(const char *param) { 43 int update_reboot_param_file(const char *param) {
44-- 44--
452.6.4 451.8.3.1
46 46
diff --git a/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
index a1396849c4..75fa3a54eb 100644
--- a/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
+++ b/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
@@ -1,7 +1,7 @@
1From 81c3d92b5bc5786cbd93b1e5ed82884e8caf2254 Mon Sep 17 00:00:00 2001 1From 5f94f5ad46c1ded54c3797979d384e4c1eb77bb0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Sep 2015 06:31:47 +0000 3Date: Sat, 5 Sep 2015 06:31:47 +0000
4Subject: [PATCH 09/16] implment systemd-sysv-install for OE 4Subject: [PATCH 10/36] implment systemd-sysv-install for OE
5 5
6Use update-rc.d for enabling/disabling and status command 6Use update-rc.d for enabling/disabling and status command
7to check the status of the sysv service 7to check the status of the sysv service
@@ -39,5 +39,5 @@ index a53a3e6..5d877b0 100755
39 *) 39 *)
40 usage ;; 40 usage ;;
41-- 41--
422.6.4 421.8.3.1
43 43
diff --git a/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch b/meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
index 8cec071244..34ae64535d 100644
--- a/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
+++ b/meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
@@ -1,7 +1,7 @@
1From d4b7f9b771a538c2356c4c77461f3b4790043556 Mon Sep 17 00:00:00 2001 1From 2b2450f6b7197bff4637c0283e8784500471d083 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 00:50:01 +0000 3Date: Mon, 14 Dec 2015 00:50:01 +0000
4Subject: [PATCH 10/16] nss-mymachines: Build conditionally when 4Subject: [PATCH 11/36] nss-mymachines: Build conditionally when
5 HAVE_MYHOSTNAME is set 5 HAVE_MYHOSTNAME is set
6 6
7Fixes build failures when building with --disable-myhostname 7Fixes build failures when building with --disable-myhostname
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
15 15
16diff --git a/Makefile.am b/Makefile.am 16diff --git a/Makefile.am b/Makefile.am
17index 4c1143a..cf559be 100644 17index 82b6553..b3f3343 100644
18--- a/Makefile.am 18--- a/Makefile.am
19+++ b/Makefile.am 19+++ b/Makefile.am
20@@ -4961,6 +4961,7 @@ SYSTEM_UNIT_ALIASES += \ 20@@ -4876,6 +4876,7 @@ SYSTEM_UNIT_ALIASES += \
21 BUSNAMES_TARGET_WANTS += \ 21 BUSNAMES_TARGET_WANTS += \
22 org.freedesktop.machine1.busname 22 org.freedesktop.machine1.busname
23 23
@@ -25,7 +25,7 @@ index 4c1143a..cf559be 100644
25 libnss_mymachines_la_SOURCES = \ 25 libnss_mymachines_la_SOURCES = \
26 src/nss-mymachines/nss-mymachines.sym \ 26 src/nss-mymachines/nss-mymachines.sym \
27 src/nss-mymachines/nss-mymachines.c 27 src/nss-mymachines/nss-mymachines.c
28@@ -4981,6 +4982,7 @@ lib_LTLIBRARIES += \ 28@@ -4896,6 +4897,7 @@ lib_LTLIBRARIES += \
29 libnss_mymachines.la 29 libnss_mymachines.la
30 30
31 endif 31 endif
@@ -34,5 +34,5 @@ index 4c1143a..cf559be 100644
34 polkitpolicy_in_files += \ 34 polkitpolicy_in_files += \
35 src/machine/org.freedesktop.machine1.policy.in 35 src/machine/org.freedesktop.machine1.policy.in
36-- 36--
372.6.4 371.8.3.1
38 38
diff --git a/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
index 03fdbff316..6143088e8c 100644
--- a/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
+++ b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
@@ -1,7 +1,7 @@
1From ae6c9dcb00919e1dd2793fd1b82125d123f69a90 Mon Sep 17 00:00:00 2001 1From 5ebc0d87565a73710dea602c00b1586d5a1364e5 Mon Sep 17 00:00:00 2001
2From: Patrick Ohly <patrick.ohly@intel.com> 2From: Patrick Ohly <patrick.ohly@intel.com>
3Date: Wed, 16 Sep 2015 13:55:58 +0200 3Date: Wed, 16 Sep 2015 13:55:58 +0200
4Subject: [PATCH 11/16] rules: whitelist hd* devices 4Subject: [PATCH 12/36] rules: whitelist hd* devices
5 5
6qemu by default emulates IDE and the linux-yocto kernel(s) use 6qemu by default emulates IDE and the linux-yocto kernel(s) use
7CONFIG_IDE instead of the more modern libsata, so disks appear as 7CONFIG_IDE instead of the more modern libsata, so disks appear as
@@ -28,5 +28,5 @@ index 0b14bb4..1c4d97a 100644
28 # ignore partitions that span the entire disk 28 # ignore partitions that span the entire disk
29 TEST=="whole_disk", GOTO="persistent_storage_end" 29 TEST=="whole_disk", GOTO="persistent_storage_end"
30-- 30--
312.6.4 311.8.3.1
32 32
diff --git a/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
index 82feff0eb9..ac67f65685 100644
--- a/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
+++ b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
@@ -1,7 +1,7 @@
1From 9e6c907ff1f17deb96c66a607653db4c7da34289 Mon Sep 17 00:00:00 2001 1From 6736de4a3caf9a0b3c888c6cc05103ab1b86907d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 05:09:53 +0000 3Date: Mon, 14 Dec 2015 05:09:53 +0000
4Subject: [PATCH 12/16] sysv-generator: add support for executing scripts under 4Subject: [PATCH 13/36] sysv-generator: add support for executing scripts under
5 /etc/rcS.d/ 5 /etc/rcS.d/
6 6
7To be compatible, all services translated from scripts under /etc/rcS.d would 7To be compatible, all services translated from scripts under /etc/rcS.d would
@@ -12,14 +12,14 @@ Upstream-Status: Inappropriate [OE specific]
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14---
15 src/sysv-generator/sysv-generator.c | 50 +++++++++++++++++++++++++++++-------- 15 src/sysv-generator/sysv-generator.c | 47 ++++++++++++++++++++++++++++---------
16 1 file changed, 39 insertions(+), 11 deletions(-) 16 1 file changed, 36 insertions(+), 11 deletions(-)
17 17
18diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c 18diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
19index 5075548..32d3687 100644 19index b5925a4..ea06d6a 100644
20--- a/src/sysv-generator/sysv-generator.c 20--- a/src/sysv-generator/sysv-generator.c
21+++ b/src/sysv-generator/sysv-generator.c 21+++ b/src/sysv-generator/sysv-generator.c
22@@ -46,7 +46,8 @@ 22@@ -44,7 +44,8 @@
23 23
24 typedef enum RunlevelType { 24 typedef enum RunlevelType {
25 RUNLEVEL_UP, 25 RUNLEVEL_UP,
@@ -29,7 +29,7 @@ index 5075548..32d3687 100644
29 } RunlevelType; 29 } RunlevelType;
30 30
31 static const struct { 31 static const struct {
32@@ -61,6 +62,9 @@ static const struct { 32@@ -59,6 +60,9 @@ static const struct {
33 { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP }, 33 { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
34 { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP }, 34 { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
35 35
@@ -39,7 +39,7 @@ index 5075548..32d3687 100644
39 /* Standard SysV runlevels for shutdown */ 39 /* Standard SysV runlevels for shutdown */
40 { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, 40 { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
41 { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN } 41 { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }
42@@ -69,7 +73,7 @@ static const struct { 42@@ -67,7 +71,7 @@ static const struct {
43 directories in this order, and we want to make sure that 43 directories in this order, and we want to make sure that
44 sysv_start_priority is known when we first load the 44 sysv_start_priority is known when we first load the
45 unit. And that value we only know from S links. Hence 45 unit. And that value we only know from S links. Hence
@@ -47,8 +47,8 @@ index 5075548..32d3687 100644
47+ UP/SYSINIT must be read before DOWN */ 47+ UP/SYSINIT must be read before DOWN */
48 }; 48 };
49 49
50 const char *arg_dest = "/tmp"; 50 static const char *arg_dest = "/tmp";
51@@ -88,6 +92,8 @@ typedef struct SysvStub { 51@@ -86,6 +90,8 @@ typedef struct SysvStub {
52 bool has_lsb; 52 bool has_lsb;
53 bool reload; 53 bool reload;
54 bool loaded; 54 bool loaded;
@@ -57,17 +57,7 @@ index 5075548..32d3687 100644
57 } SysvStub; 57 } SysvStub;
58 58
59 static void free_sysvstub(SysvStub *s) { 59 static void free_sysvstub(SysvStub *s) {
60@@ -204,6 +210,9 @@ static int generate_unit_file(SysvStub *s) { 60@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
61 if (s->description)
62 fprintf(f, "Description=%s\n", s->description);
63
64+ if (!s->default_dependencies)
65+ fprintf(f, "DefaultDependencies=no\n");
66+
67 if (!isempty(before))
68 fprintf(f, "Before=%s\n", before);
69 if (!isempty(after))
70@@ -722,17 +731,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
71 if (s->has_lsb && other->has_lsb) 61 if (s->has_lsb && other->has_lsb)
72 continue; 62 continue;
73 63
@@ -105,7 +95,7 @@ index 5075548..32d3687 100644
105 95
106 /* FIXME: Maybe we should compare the name here lexicographically? */ 96 /* FIXME: Maybe we should compare the name here lexicographically? */
107 } 97 }
108@@ -799,6 +822,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { 98@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
109 return log_oom(); 99 return log_oom();
110 100
111 service->sysv_start_priority = -1; 101 service->sysv_start_priority = -1;
@@ -114,7 +104,7 @@ index 5075548..32d3687 100644
114 service->name = name; 104 service->name = name;
115 service->path = fpath; 105 service->path = fpath;
116 name = fpath = NULL; 106 name = fpath = NULL;
117@@ -882,9 +907,11 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic 107@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
118 108
119 if (de->d_name[0] == 'S') { 109 if (de->d_name[0] == 'S') {
120 110
@@ -128,7 +118,7 @@ index 5075548..32d3687 100644
128 r = set_ensure_allocated(&runlevel_services[i], NULL); 118 r = set_ensure_allocated(&runlevel_services[i], NULL);
129 if (r < 0) { 119 if (r < 0) {
130 log_oom(); 120 log_oom();
131@@ -898,7 +925,8 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic 121@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
132 } 122 }
133 123
134 } else if (de->d_name[0] == 'K' && 124 } else if (de->d_name[0] == 'K' &&
@@ -139,5 +129,5 @@ index 5075548..32d3687 100644
139 r = set_ensure_allocated(&shutdown_services, NULL); 129 r = set_ensure_allocated(&shutdown_services, NULL);
140 if (r < 0) { 130 if (r < 0) {
141-- 131--
1422.6.4 1321.8.3.1
143 133
diff --git a/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
index ea0b3e250f..4a576aa7d6 100644
--- a/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
@@ -1,7 +1,7 @@
1From 1ba00ff6ed3f0626892f57cdd8d9788692c7bf14 Mon Sep 17 00:00:00 2001 1From 786883cfa13e21f060ee6da6cabb94845f4349a0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 05:18:20 +0000 3Date: Mon, 14 Dec 2015 05:18:20 +0000
4Subject: [PATCH 13/16] Make root's home directory configurable 4Subject: [PATCH 14/36] Make root's home directory configurable
5 5
6OpenEmbedded has a configurable home directory for root. Allow 6OpenEmbedded has a configurable home directory for root. Allow
7systemd to be built using its idea of what root's home directory 7systemd to be built using its idea of what root's home directory
@@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 8 files changed, 20 insertions(+), 11 deletions(-) 26 8 files changed, 20 insertions(+), 11 deletions(-)
27 27
28diff --git a/Makefile.am b/Makefile.am 28diff --git a/Makefile.am b/Makefile.am
29index cf559be..a511c3d 100644 29index b3f3343..a99e8eb 100644
30--- a/Makefile.am 30--- a/Makefile.am
31+++ b/Makefile.am 31+++ b/Makefile.am
32@@ -210,6 +210,7 @@ AM_CPPFLAGS = \ 32@@ -202,6 +202,7 @@ AM_CPPFLAGS = \
33 -DLIBDIR=\"$(libdir)\" \ 33 -DLIBDIR=\"$(libdir)\" \
34 -DROOTLIBDIR=\"$(rootlibdir)\" \ 34 -DROOTLIBDIR=\"$(rootlibdir)\" \
35 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ 35 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
@@ -37,7 +37,7 @@ index cf559be..a511c3d 100644
37 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ 37 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
38 -I $(top_srcdir)/src \ 38 -I $(top_srcdir)/src \
39 -I $(top_builddir)/src/basic \ 39 -I $(top_builddir)/src/basic \
40@@ -5876,6 +5877,7 @@ EXTRA_DIST += \ 40@@ -5713,6 +5714,7 @@ EXTRA_DIST += \
41 substitutions = \ 41 substitutions = \
42 '|rootlibexecdir=$(rootlibexecdir)|' \ 42 '|rootlibexecdir=$(rootlibexecdir)|' \
43 '|rootbindir=$(rootbindir)|' \ 43 '|rootbindir=$(rootbindir)|' \
@@ -46,10 +46,10 @@ index cf559be..a511c3d 100644
46 '|SYSTEMCTL=$(rootbindir)/systemctl|' \ 46 '|SYSTEMCTL=$(rootbindir)/systemctl|' \
47 '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ 47 '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
48diff --git a/configure.ac b/configure.ac 48diff --git a/configure.ac b/configure.ac
49index 49f73a4..a3e639d 100644 49index c5ab9d0..16c83bb 100644
50--- a/configure.ac 50--- a/configure.ac
51+++ b/configure.ac 51+++ b/configure.ac
52@@ -1434,6 +1434,11 @@ AC_ARG_WITH([rootlibdir], 52@@ -1470,6 +1470,11 @@ AC_ARG_WITH([rootlibdir],
53 [with_rootlibdir=${libdir}]) 53 [with_rootlibdir=${libdir}])
54 AX_NORMALIZE_PATH([with_rootlibdir]) 54 AX_NORMALIZE_PATH([with_rootlibdir])
55 55
@@ -61,7 +61,7 @@ index 49f73a4..a3e639d 100644
61 AC_ARG_WITH([pamlibdir], 61 AC_ARG_WITH([pamlibdir],
62 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), 62 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
63 [], 63 [],
64@@ -1517,6 +1522,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) 64@@ -1553,6 +1558,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
65 AC_SUBST([pamconfdir], [$with_pamconfdir]) 65 AC_SUBST([pamconfdir], [$with_pamconfdir])
66 AC_SUBST([rootprefix], [$with_rootprefix]) 66 AC_SUBST([rootprefix], [$with_rootprefix])
67 AC_SUBST([rootlibdir], [$with_rootlibdir]) 67 AC_SUBST([rootlibdir], [$with_rootlibdir])
@@ -69,7 +69,7 @@ index 49f73a4..a3e639d 100644
69 69
70 AC_CONFIG_FILES([ 70 AC_CONFIG_FILES([
71 Makefile 71 Makefile
72@@ -1606,6 +1612,7 @@ AC_MSG_RESULT([ 72@@ -1643,6 +1649,7 @@ AC_MSG_RESULT([
73 includedir: ${includedir} 73 includedir: ${includedir}
74 lib dir: ${libdir} 74 lib dir: ${libdir}
75 rootlib dir: ${with_rootlibdir} 75 rootlib dir: ${with_rootlibdir}
@@ -78,10 +78,10 @@ index 49f73a4..a3e639d 100644
78 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 78 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
79 Build Python: ${PYTHON} 79 Build Python: ${PYTHON}
80diff --git a/src/basic/user-util.c b/src/basic/user-util.c 80diff --git a/src/basic/user-util.c b/src/basic/user-util.c
81index 56e1a3b..c3d0ec3 100644 81index 19155bc..55672b3 100644
82--- a/src/basic/user-util.c 82--- a/src/basic/user-util.c
83+++ b/src/basic/user-util.c 83+++ b/src/basic/user-util.c
84@@ -124,7 +124,7 @@ int get_user_creds( 84@@ -122,7 +122,7 @@ int get_user_creds(
85 *gid = 0; 85 *gid = 0;
86 86
87 if (home) 87 if (home)
@@ -90,7 +90,7 @@ index 56e1a3b..c3d0ec3 100644
90 90
91 if (shell) 91 if (shell)
92 *shell = "/bin/sh"; 92 *shell = "/bin/sh";
93@@ -355,7 +355,7 @@ int get_home_dir(char **_h) { 93@@ -353,7 +353,7 @@ int get_home_dir(char **_h) {
94 /* Hardcode home directory for root to avoid NSS */ 94 /* Hardcode home directory for root to avoid NSS */
95 u = getuid(); 95 u = getuid();
96 if (u == 0) { 96 if (u == 0) {
@@ -100,10 +100,10 @@ index 56e1a3b..c3d0ec3 100644
100 return -ENOMEM; 100 return -ENOMEM;
101 101
102diff --git a/src/core/namespace.c b/src/core/namespace.c 102diff --git a/src/core/namespace.c b/src/core/namespace.c
103index 81ba09e..1a1f276 100644 103index b573f00..0f70b14 100644
104--- a/src/core/namespace.c 104--- a/src/core/namespace.c
105+++ b/src/core/namespace.c 105+++ b/src/core/namespace.c
106@@ -494,7 +494,7 @@ int setup_namespace( 106@@ -409,7 +409,7 @@ int setup_namespace(
107 home_dir = strjoina("-", home_dir); 107 home_dir = strjoina("-", home_dir);
108 run_user_dir = prefix_roota(root_directory, "/run/user"); 108 run_user_dir = prefix_roota(root_directory, "/run/user");
109 run_user_dir = strjoina("-", run_user_dir); 109 run_user_dir = strjoina("-", run_user_dir);
@@ -113,10 +113,10 @@ index 81ba09e..1a1f276 100644
113 113
114 r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir), 114 r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir),
115diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 115diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
116index 4def6ba..2081953 100644 116index 65e65ec..12f0ee8 100644
117--- a/src/nspawn/nspawn.c 117--- a/src/nspawn/nspawn.c
118+++ b/src/nspawn/nspawn.c 118+++ b/src/nspawn/nspawn.c
119@@ -2530,7 +2530,7 @@ static int inner_child( 119@@ -2564,7 +2564,7 @@ static int inner_child(
120 if (envp[n_env]) 120 if (envp[n_env])
121 n_env ++; 121 n_env ++;
122 122
@@ -125,17 +125,17 @@ index 4def6ba..2081953 100644
125 (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) || 125 (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) ||
126 (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) 126 (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0))
127 return log_oom(); 127 return log_oom();
128@@ -2604,7 +2604,7 @@ static int inner_child( 128@@ -2647,7 +2647,7 @@ static int inner_child(
129 execvp(arg_parameters[0], arg_parameters);
130 #endif /* HAVE_EXECVPE */ 129 #endif /* HAVE_EXECVPE */
131 else { 130 else {
132- chdir(home ?: "/root"); 131 if (!arg_chdir)
133+ chdir(home ?: ROOTHOMEDIR); 132- chdir(home ?: "/root");
133+ chdir(home ?: ROOTHOMEDIR);
134
134 execle("/bin/bash", "-bash", NULL, env_use); 135 execle("/bin/bash", "-bash", NULL, env_use);
135 execle("/bin/sh", "-sh", NULL, env_use); 136 execle("/bin/sh", "-sh", NULL, env_use);
136 }
137diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in 137diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
138index 5c80722..efde5f0 100644 138index a345ec2..3caae7d 100644
139--- a/units/console-shell.service.m4.in 139--- a/units/console-shell.service.m4.in
140+++ b/units/console-shell.service.m4.in 140+++ b/units/console-shell.service.m4.in
141@@ -15,8 +15,8 @@ After=rc-local.service 141@@ -15,8 +15,8 @@ After=rc-local.service
@@ -143,14 +143,14 @@ index 5c80722..efde5f0 100644
143 143
144 [Service] 144 [Service]
145-Environment=HOME=/root 145-Environment=HOME=/root
146-WorkingDirectory=/root 146-WorkingDirectory=-/root
147+Environment=HOME=@roothomedir@ 147+Environment=HOME=@roothomedir@
148+WorkingDirectory=@roothomedir@ 148+WorkingDirectory=-@roothomedir@
149 ExecStart=-@SULOGIN@ 149 ExecStart=-@SULOGIN@
150 ExecStopPost=-@SYSTEMCTL@ poweroff 150 ExecStopPost=-@SYSTEMCTL@ poweroff
151 Type=idle 151 Type=idle
152diff --git a/units/emergency.service.in b/units/emergency.service.in 152diff --git a/units/emergency.service.in b/units/emergency.service.in
153index 8dc3cbd..eb046c2 100644 153index fb390ea..5623a57 100644
154--- a/units/emergency.service.in 154--- a/units/emergency.service.in
155+++ b/units/emergency.service.in 155+++ b/units/emergency.service.in
156@@ -14,8 +14,8 @@ Conflicts=rescue.service 156@@ -14,8 +14,8 @@ Conflicts=rescue.service
@@ -158,14 +158,14 @@ index 8dc3cbd..eb046c2 100644
158 158
159 [Service] 159 [Service]
160-Environment=HOME=/root 160-Environment=HOME=/root
161-WorkingDirectory=/root 161-WorkingDirectory=-/root
162+Environment=HOME=@roothomedir@ 162+Environment=HOME=@roothomedir@
163+WorkingDirectory=@roothomedir@ 163+WorkingDirectory=-@roothomedir@
164 ExecStartPre=-/bin/plymouth --wait quit 164 ExecStartPre=-/bin/plymouth --wait quit
165 ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' 165 ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
166 ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default" 166 ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
167diff --git a/units/rescue.service.in b/units/rescue.service.in 167diff --git a/units/rescue.service.in b/units/rescue.service.in
168index 432e4f3..afa3e82 100644 168index 92553f6..590ae17 100644
169--- a/units/rescue.service.in 169--- a/units/rescue.service.in
170+++ b/units/rescue.service.in 170+++ b/units/rescue.service.in
171@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service 171@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
@@ -173,12 +173,12 @@ index 432e4f3..afa3e82 100644
173 173
174 [Service] 174 [Service]
175-Environment=HOME=/root 175-Environment=HOME=/root
176-WorkingDirectory=/root 176-WorkingDirectory=-/root
177+Environment=HOME=@roothomedir@ 177+Environment=HOME=@roothomedir@
178+WorkingDirectory=@roothomedir@ 178+WorkingDirectory=-@roothomedir@
179 ExecStartPre=-/bin/plymouth quit 179 ExecStartPre=-/bin/plymouth quit
180 ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.' 180 ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
181 ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default" 181 ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
182-- 182--
1832.6.4 1831.8.3.1
184 184
diff --git a/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
index 11be097661..a351237338 100644
--- a/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
+++ b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
@@ -1,7 +1,7 @@
1From 548a8d5d456c531444498b3ce8cec3f3dd374cf8 Mon Sep 17 00:00:00 2001 1From f70a1a9605cd3adac450c49a5a69da6e9acda517 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:26:25 +0000 3Date: Fri, 20 Feb 2015 05:26:25 +0000
4Subject: [PATCH 14/16] systemd-user: avoid using system-auth 4Subject: [PATCH 15/36] systemd-user: avoid using system-auth
5 5
6In OE, we don't provide system-auth, instead, we use common-* files. 6In OE, we don't provide system-auth, instead, we use common-* files.
7So modify systemd-user file to use common-* files. 7So modify systemd-user file to use common-* files.
@@ -32,5 +32,5 @@ index 7933508..16b73d2 100644
32-session include system-auth 32-session include system-auth
33+session include common-session 33+session include common-session
34-- 34--
352.6.4 351.8.3.1
36 36
diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0016-Revert-rules-remove-firmware-loading-rules.patch
index 7cc3922cd9..66905b5c57 100644
--- a/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Revert-rules-remove-firmware-loading-rules.patch
@@ -1,7 +1,7 @@
1From 6b2b8d20f884bd5a3d928175e422023f6c9d056b Mon Sep 17 00:00:00 2001 1From 7311ecc745c17d6ed9fd9cf43039648483a87605 Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com> 2From: Jonathan Liu <net147@gmail.com>
3Date: Thu, 19 Mar 2015 15:01:29 +1100 3Date: Thu, 19 Mar 2015 15:01:29 +1100
4Subject: [PATCH 15/16] Revert "rules: remove firmware loading rules" 4Subject: [PATCH 16/36] Revert "rules: remove firmware loading rules"
5 5
6This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19. 6This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
7Userspace firmware loading support is needed for Linux < 3.7. 7Userspace firmware loading support is needed for Linux < 3.7.
@@ -24,5 +24,5 @@ index 0000000..f0ae684
24+ 24+
25+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware" 25+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
26-- 26--
272.6.4 271.8.3.1
28 28
diff --git a/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 6e5a8fb813..8e6289d4ac 100644
--- a/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -1,7 +1,7 @@
1From d3661ec7fb4557c47f001986cbb8a684b8dbae4a Mon Sep 17 00:00:00 2001 1From 9a3a4e16b36e762291cd1574ec71d7954f8b5363 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 05:33:32 +0000 3Date: Mon, 14 Dec 2015 05:33:32 +0000
4Subject: [PATCH 16/16] Revert "udev: remove userspace firmware loading 4Subject: [PATCH 17/36] Revert "udev: remove userspace firmware loading
5 support" 5 support"
6 6
7This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca. 7This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
@@ -15,19 +15,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 Makefile.am | 12 +++ 15 Makefile.am | 12 +++
16 README | 6 +- 16 README | 6 +-
17 TODO | 1 + 17 TODO | 1 +
18 configure.ac | 25 +++++++ 18 configure.ac | 22 ++++++
19 src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++ 19 src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
20 src/udev/udev-builtin.c | 3 + 20 src/udev/udev-builtin.c | 3 +
21 src/udev/udev.h | 6 ++ 21 src/udev/udev.h | 6 ++
22 src/udev/udevd.c | 13 ++++ 22 src/udev/udevd.c | 13 ++++
23 8 files changed, 217 insertions(+), 3 deletions(-) 23 8 files changed, 214 insertions(+), 3 deletions(-)
24 create mode 100644 src/udev/udev-builtin-firmware.c 24 create mode 100644 src/udev/udev-builtin-firmware.c
25 25
26diff --git a/Makefile.am b/Makefile.am 26diff --git a/Makefile.am b/Makefile.am
27index a511c3d..6181e55 100644 27index a99e8eb..b5c6ba7 100644
28--- a/Makefile.am 28--- a/Makefile.am
29+++ b/Makefile.am 29+++ b/Makefile.am
30@@ -3650,6 +3650,18 @@ libudev_core_la_LIBADD = \ 30@@ -3573,6 +3573,18 @@ libudev_core_la_LIBADD = \
31 $(BLKID_LIBS) \ 31 $(BLKID_LIBS) \
32 $(KMOD_LIBS) 32 $(KMOD_LIBS)
33 33
@@ -47,10 +47,10 @@ index a511c3d..6181e55 100644
47 libudev_core_la_SOURCES += \ 47 libudev_core_la_SOURCES += \
48 src/udev/udev-builtin-kmod.c 48 src/udev/udev-builtin-kmod.c
49diff --git a/README b/README 49diff --git a/README b/README
50index bf67f8c..87b6f70 100644 50index 41fb07a..10230ac 100644
51--- a/README 51--- a/README
52+++ b/README 52+++ b/README
53@@ -51,14 +51,14 @@ REQUIREMENTS: 53@@ -50,14 +50,14 @@ REQUIREMENTS:
54 CONFIG_PROC_FS 54 CONFIG_PROC_FS
55 CONFIG_FHANDLE (libudev, mount and bind mount handling) 55 CONFIG_FHANDLE (libudev, mount and bind mount handling)
56 56
@@ -69,10 +69,10 @@ index bf67f8c..87b6f70 100644
69 69
70 Some udev rules and virtualization detection relies on it: 70 Some udev rules and virtualization detection relies on it:
71diff --git a/TODO b/TODO 71diff --git a/TODO b/TODO
72index 369805f..ce97674 100644 72index 92cc8cc..25f6849 100644
73--- a/TODO 73--- a/TODO
74+++ b/TODO 74+++ b/TODO
75@@ -635,6 +635,7 @@ Features: 75@@ -628,6 +628,7 @@ Features:
76 * rename "userspace" to "core-os" 76 * rename "userspace" to "core-os"
77 77
78 * udev: 78 * udev:
@@ -81,10 +81,10 @@ index 369805f..ce97674 100644
81 - kill scsi_id 81 - kill scsi_id
82 - add trigger --subsystem-match=usb/usb_device device 82 - add trigger --subsystem-match=usb/usb_device device
83diff --git a/configure.ac b/configure.ac 83diff --git a/configure.ac b/configure.ac
84index a3e639d..00736f5 100644 84index 16c83bb..36d20b5 100644
85--- a/configure.ac 85--- a/configure.ac
86+++ b/configure.ac 86+++ b/configure.ac
87@@ -1317,6 +1317,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database 87@@ -1353,6 +1353,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database
88 AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes]) 88 AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
89 89
90 # ------------------------------------------------------------------------------ 90 # ------------------------------------------------------------------------------
@@ -109,8 +109,8 @@ index a3e639d..00736f5 100644
109+# ------------------------------------------------------------------------------ 109+# ------------------------------------------------------------------------------
110 have_manpages=no 110 have_manpages=no
111 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) 111 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
112 AS_IF([test "x$enable_manpages" != xno], [ 112 AC_PATH_PROG([XSLTPROC], [xsltproc])
113@@ -1616,6 +1635,9 @@ AC_MSG_RESULT([ 113@@ -1653,6 +1672,9 @@ AC_MSG_RESULT([
114 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} 114 SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
115 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 115 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
116 Build Python: ${PYTHON} 116 Build Python: ${PYTHON}
@@ -281,10 +281,10 @@ index 0000000..bd8c2fb
281+ .run_once = true, 281+ .run_once = true,
282+}; 282+};
283diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c 283diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
284index 18fb661..d0280bf 100644 284index e6b36f1..cd9947e 100644
285--- a/src/udev/udev-builtin.c 285--- a/src/udev/udev-builtin.c
286+++ b/src/udev/udev-builtin.c 286+++ b/src/udev/udev-builtin.c
287@@ -33,6 +33,9 @@ static const struct udev_builtin *builtins[] = { 287@@ -31,6 +31,9 @@ static const struct udev_builtin *builtins[] = {
288 [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, 288 [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
289 #endif 289 #endif
290 [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, 290 [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
@@ -295,10 +295,10 @@ index 18fb661..d0280bf 100644
295 [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, 295 [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
296 [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, 296 [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
297diff --git a/src/udev/udev.h b/src/udev/udev.h 297diff --git a/src/udev/udev.h b/src/udev/udev.h
298index 4f40020..8f3560f 100644 298index 1f9c812..fa35a88 100644
299--- a/src/udev/udev.h 299--- a/src/udev/udev.h
300+++ b/src/udev/udev.h 300+++ b/src/udev/udev.h
301@@ -149,6 +149,9 @@ enum udev_builtin_cmd { 301@@ -147,6 +147,9 @@ enum udev_builtin_cmd {
302 UDEV_BUILTIN_BLKID, 302 UDEV_BUILTIN_BLKID,
303 #endif 303 #endif
304 UDEV_BUILTIN_BTRFS, 304 UDEV_BUILTIN_BTRFS,
@@ -308,7 +308,7 @@ index 4f40020..8f3560f 100644
308 UDEV_BUILTIN_HWDB, 308 UDEV_BUILTIN_HWDB,
309 UDEV_BUILTIN_INPUT_ID, 309 UDEV_BUILTIN_INPUT_ID,
310 UDEV_BUILTIN_KEYBOARD, 310 UDEV_BUILTIN_KEYBOARD,
311@@ -177,6 +180,9 @@ struct udev_builtin { 311@@ -175,6 +178,9 @@ struct udev_builtin {
312 extern const struct udev_builtin udev_builtin_blkid; 312 extern const struct udev_builtin udev_builtin_blkid;
313 #endif 313 #endif
314 extern const struct udev_builtin udev_builtin_btrfs; 314 extern const struct udev_builtin udev_builtin_btrfs;
@@ -319,10 +319,10 @@ index 4f40020..8f3560f 100644
319 extern const struct udev_builtin udev_builtin_input_id; 319 extern const struct udev_builtin udev_builtin_input_id;
320 extern const struct udev_builtin udev_builtin_keyboard; 320 extern const struct udev_builtin udev_builtin_keyboard;
321diff --git a/src/udev/udevd.c b/src/udev/udevd.c 321diff --git a/src/udev/udevd.c b/src/udev/udevd.c
322index 366e7fb..7ca1b51 100644 322index bb92f16..84024ac 100644
323--- a/src/udev/udevd.c 323--- a/src/udev/udevd.c
324+++ b/src/udev/udevd.c 324+++ b/src/udev/udevd.c
325@@ -127,6 +127,9 @@ struct event { 325@@ -125,6 +125,9 @@ struct event {
326 bool is_block; 326 bool is_block;
327 sd_event_source *timeout_warning; 327 sd_event_source *timeout_warning;
328 sd_event_source *timeout; 328 sd_event_source *timeout;
@@ -332,7 +332,7 @@ index 366e7fb..7ca1b51 100644
332 }; 332 };
333 333
334 static inline struct event *node_to_event(struct udev_list_node *node) { 334 static inline struct event *node_to_event(struct udev_list_node *node) {
335@@ -615,6 +618,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) { 335@@ -613,6 +616,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
336 event->devnum = udev_device_get_devnum(dev); 336 event->devnum = udev_device_get_devnum(dev);
337 event->is_block = streq("block", udev_device_get_subsystem(dev)); 337 event->is_block = streq("block", udev_device_get_subsystem(dev));
338 event->ifindex = udev_device_get_ifindex(dev); 338 event->ifindex = udev_device_get_ifindex(dev);
@@ -343,7 +343,7 @@ index 366e7fb..7ca1b51 100644
343 343
344 log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), 344 log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
345 udev_device_get_action(dev), udev_device_get_subsystem(dev)); 345 udev_device_get_action(dev), udev_device_get_subsystem(dev));
346@@ -700,6 +707,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) { 346@@ -698,6 +705,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
347 return true; 347 return true;
348 } 348 }
349 349
@@ -357,5 +357,5 @@ index 366e7fb..7ca1b51 100644
357 if (event->devpath[common] == '/') { 357 if (event->devpath[common] == '/') {
358 event->delaying_seqnum = loop_event->seqnum; 358 event->delaying_seqnum = loop_event->seqnum;
359-- 359--
3602.6.4 3601.8.3.1
361 361
diff --git a/meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch b/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
index 7d06371c95..5f3f2e8a5b 100644
--- a/meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
@@ -1,7 +1,7 @@
1From 3eeec270d3af166e3bc09537626850562487742b Mon Sep 17 00:00:00 2001 1From 569cd3cf9806a02226d26c4104dbe44262f93d33 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com> 2From: Roy Li <rongqing.li@windriver.com>
3Date: Fri, 22 Jan 2016 16:44:11 +0800 3Date: Fri, 22 Jan 2016 16:44:11 +0800
4Subject: [PATCH] make test dir configurable 4Subject: [PATCH 18/36] make test dir configurable
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -15,10 +15,10 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
15 2 files changed, 8 insertions(+), 1 deletion(-) 15 2 files changed, 8 insertions(+), 1 deletion(-)
16 16
17diff --git a/Makefile.am b/Makefile.am 17diff --git a/Makefile.am b/Makefile.am
18index 931d13f..7155ec7 100644 18index b5c6ba7..d3cd961 100644
19--- a/Makefile.am 19--- a/Makefile.am
20+++ b/Makefile.am 20+++ b/Makefile.am
21@@ -209,7 +209,7 @@ AM_CPPFLAGS = \ 21@@ -203,7 +203,7 @@ AM_CPPFLAGS = \
22 -DROOTLIBDIR=\"$(rootlibdir)\" \ 22 -DROOTLIBDIR=\"$(rootlibdir)\" \
23 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ 23 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
24 -DROOTHOMEDIR=\"$(roothomedir)\" \ 24 -DROOTHOMEDIR=\"$(roothomedir)\" \
@@ -28,10 +28,10 @@ index 931d13f..7155ec7 100644
28 -I $(top_builddir)/src/basic \ 28 -I $(top_builddir)/src/basic \
29 -I $(top_srcdir)/src/basic \ 29 -I $(top_srcdir)/src/basic \
30diff --git a/configure.ac b/configure.ac 30diff --git a/configure.ac b/configure.ac
31index 76090a1..b02968d 100644 31index 36d20b5..d96dc5a 100644
32--- a/configure.ac 32--- a/configure.ac
33+++ b/configure.ac 33+++ b/configure.ac
34@@ -1411,6 +1411,11 @@ AC_ARG_WITH([roothomedir], 34@@ -1494,6 +1494,11 @@ AC_ARG_WITH([roothomedir],
35 [], 35 [],
36 [with_roothomedir=/root]) 36 [with_roothomedir=/root])
37 37
@@ -43,7 +43,7 @@ index 76090a1..b02968d 100644
43 AC_ARG_WITH([pamlibdir], 43 AC_ARG_WITH([pamlibdir],
44 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), 44 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
45 [], 45 [],
46@@ -1503,6 +1508,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir]) 46@@ -1578,6 +1583,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
47 AC_SUBST([rootprefix], [$with_rootprefix]) 47 AC_SUBST([rootprefix], [$with_rootprefix])
48 AC_SUBST([rootlibdir], [$with_rootlibdir]) 48 AC_SUBST([rootlibdir], [$with_rootlibdir])
49 AC_SUBST([roothomedir], [$with_roothomedir]) 49 AC_SUBST([roothomedir], [$with_roothomedir])
@@ -51,7 +51,7 @@ index 76090a1..b02968d 100644
51 51
52 AC_CONFIG_FILES([ 52 AC_CONFIG_FILES([
53 Makefile 53 Makefile
54@@ -1593,6 +1599,7 @@ AC_MSG_RESULT([ 54@@ -1669,6 +1675,7 @@ AC_MSG_RESULT([
55 lib dir: ${libdir} 55 lib dir: ${libdir}
56 rootlib dir: ${with_rootlibdir} 56 rootlib dir: ${with_rootlibdir}
57 root home dir: ${with_roothomedir} 57 root home dir: ${with_roothomedir}
@@ -60,5 +60,5 @@ index 76090a1..b02968d 100644
60 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 60 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
61 Build Python: ${PYTHON} 61 Build Python: ${PYTHON}
62-- 62--
631.9.1 631.8.3.1
64 64
diff --git a/meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch b/meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch
new file mode 100644
index 0000000000..17592f8aa6
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch
@@ -0,0 +1,42 @@
1From 3ca534935460647fed66e31aaa90b364e29eab5c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 22 Feb 2016 05:59:01 +0000
4Subject: [PATCH 1/2] remove duplicate include uchar.h
5
6missing.h already includes it
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 src/basic/escape.h | 1 -
13 src/basic/utf8.h | 1 -
14 2 files changed, 2 deletions(-)
15
16diff --git a/src/basic/escape.h b/src/basic/escape.h
17index deaa4de..36d437c 100644
18--- a/src/basic/escape.h
19+++ b/src/basic/escape.h
20@@ -23,7 +23,6 @@
21 #include <stddef.h>
22 #include <stdint.h>
23 #include <sys/types.h>
24-#include <uchar.h>
25
26 #include "string-util.h"
27 #include "missing.h"
28diff --git a/src/basic/utf8.h b/src/basic/utf8.h
29index 12c272d..bea93a6 100644
30--- a/src/basic/utf8.h
31+++ b/src/basic/utf8.h
32@@ -22,7 +22,6 @@
33 #include <stdbool.h>
34 #include <stddef.h>
35 #include <stdint.h>
36-#include <uchar.h>
37
38 #include "macro.h"
39 #include "missing.h"
40--
411.8.3.1
42
diff --git a/meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch b/meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch
new file mode 100644
index 0000000000..a027fad1d9
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch
@@ -0,0 +1,44 @@
1From e06eec89a22719c38e257fe07afff18e359114cb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 22 Feb 2016 06:02:38 +0000
4Subject: [PATCH 2/2] check for uchar.h in configure
5
6Use ifdef to include uchar.h
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 configure.ac | 1 +
13 src/basic/missing.h | 2 ++
14 2 files changed, 3 insertions(+)
15
16diff --git a/configure.ac b/configure.ac
17index ecc3e6b..62f934e 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -297,6 +297,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
21
22 # ------------------------------------------------------------------------------
23
24+AC_CHECK_HEADERS([uchar.h], [], [])
25 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
26 AC_CHECK_HEADERS([linux/btrfs.h], [], [])
27 AC_CHECK_HEADERS([linux/memfd.h], [], [])
28diff --git a/src/basic/missing.h b/src/basic/missing.h
29index f704422..a1baa95 100644
30--- a/src/basic/missing.h
31+++ b/src/basic/missing.h
32@@ -34,7 +34,9 @@
33 #include <stdlib.h>
34 #include <sys/resource.h>
35 #include <sys/syscall.h>
36+#ifdef HAVE_UCHAR_H
37 #include <uchar.h>
38+#endif
39 #include <unistd.h>
40
41 #ifdef HAVE_AUDIT
42--
431.8.3.1
44
diff --git a/meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch b/meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
new file mode 100644
index 0000000000..5797a29e60
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
@@ -0,0 +1,27 @@
1From 6cedbaee7964f6a6c61b9f2c8f0b87cef9370424 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 15 Dec 2015 22:51:55 +0000
4Subject: [PATCH 26/38] include missing.h for getting secure_getenv definition
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 src/basic/user-util.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/src/basic/user-util.c b/src/basic/user-util.c
14index 55672b3..22c4a23 100644
15--- a/src/basic/user-util.c
16+++ b/src/basic/user-util.c
17@@ -38,6 +38,7 @@
18 #include "path-util.h"
19 #include "string-util.h"
20 #include "user-util.h"
21+#include "missing.h"
22
23 bool uid_is_valid(uid_t uid) {
24
25--
261.8.3.1
27
diff --git a/meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch b/meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
new file mode 100644
index 0000000000..96fc3d8448
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
@@ -0,0 +1,36 @@
1From 71e710a6c8a3879af7d50c4cb995e0615deba5c3 Mon Sep 17 00:00:00 2001
2From: Emil Renner Berthing <systemd@esmil.dk>
3Date: Sat, 12 Sep 2015 19:56:52 +0000
4Subject: [PATCH 29/38] socket-util: don't fail if libc doesn't support IDN
5
6Signed-off-by: Emil Renner Berthing <systemd@esmil.dk>
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9Upstream-Status: Pending
10
11 src/basic/socket-util.c | 9 +++++++++
12 1 file changed, 9 insertions(+)
13
14diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
15index 5851268..aefaca5 100644
16--- a/src/basic/socket-util.c
17+++ b/src/basic/socket-util.c
18@@ -44,6 +44,15 @@
19 #include "string-util.h"
20 #include "user-util.h"
21 #include "util.h"
22+/* Don't fail if the standard library
23+ * doesn't support IDN */
24+#ifndef NI_IDN
25+#define NI_IDN 0
26+#endif
27+
28+#ifndef NI_IDN_USE_STD3_ASCII_RULES
29+#define NI_IDN_USE_STD3_ASCII_RULES 0
30+#endif
31
32 int socket_address_parse(SocketAddress *a, const char *s) {
33 char *e, *n;
34--
351.8.3.1
36
diff --git a/meta/recipes-core/systemd/systemd_228.bb b/meta/recipes-core/systemd/systemd_229.bb
index b160816f07..16af0acc3b 100644
--- a/meta/recipes-core/systemd/systemd_228.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -24,35 +24,40 @@ SECTION = "base/shell"
24 24
25inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion 25inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion
26 26
27SRCREV = "dd050decb6ad131ebdeabb71c4f9ecb4733269c0" 27SRCREV = "714c62b46379abb7558c544665522aca91691e10"
28 28
29PV = "228+git${SRCPV}" 29PV = "229+git${SRCPV}"
30 30
31SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ 31SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
32 file://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
33 file://0006-configure-Check-for-additional-features-that-uclibc-.patch \
34 file://0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch \
35 file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \
36 file://0009-implment-systemd-sysv-install-for-OE.patch \
37 file://0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
38 file://0011-rules-whitelist-hd-devices.patch \
39 file://0012-sysv-generator-add-support-for-executing-scripts-und.patch \
40 file://0013-Make-root-s-home-directory-configurable.patch \
41 file://0014-systemd-user-avoid-using-system-auth.patch \
42 file://0015-Revert-rules-remove-firmware-loading-rules.patch \
43 file://0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
44 file://touchscreen.rules \ 32 file://touchscreen.rules \
45 file://00-create-volatile.conf \ 33 file://00-create-volatile.conf \
46 file://init \ 34 file://init \
47 file://run-ptest \ 35 file://run-ptest \
48 file://0001-make-test-dir-configurable.patch \ 36 file://0003-define-exp10-if-missing.patch \
49 " 37 file://0004-Use-getenv-when-secure-versions-are-not-available.patch \
38 file://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
39 file://0006-configure-Check-for-additional-features-that-uclibc-.patch \
40 file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
41 file://0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch \
42 file://0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \
43 file://0010-implment-systemd-sysv-install-for-OE.patch \
44 file://0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
45 file://0012-rules-whitelist-hd-devices.patch \
46 file://0013-sysv-generator-add-support-for-executing-scripts-und.patch \
47 file://0014-Make-root-s-home-directory-configurable.patch \
48 file://0015-systemd-user-avoid-using-system-auth.patch \
49 file://0016-Revert-rules-remove-firmware-loading-rules.patch \
50 file://0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
51 file://0018-make-test-dir-configurable.patch \
52 file://0019-remove-duplicate-include-uchar.h.patch \
53 file://0020-check-for-uchar.h-in-configure.patch \
54 file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \
55 file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
56"
50SRC_URI_append_libc-uclibc = "\ 57SRC_URI_append_libc-uclibc = "\
51 file://0001-define-exp10-if-missing.patch \ 58 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
52 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ 59"
53 file://0003-Use-getenv-when-secure-versions-are-not-available.patch \ 60SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
54 "
55SRC_URI_append_qemuall = " file://0004-core-device.c-Change-the-default-device-timeout-to-2.patch "
56 61
57S = "${WORKDIR}/git" 62S = "${WORKDIR}/git"
58 63
@@ -60,13 +65,13 @@ LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
60 65
61GTKDOC_DOCDIR = "${S}/docs/" 66GTKDOC_DOCDIR = "${S}/docs/"
62 67
63PACKAGECONFIG ??= "compat xz ldconfig \ 68PACKAGECONFIG ??= "xz \
69 ldconfig \
64 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 70 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
65 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ 71 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
66 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ 72 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
67 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ 73 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
68 ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'efi', '', d)} \ 74 ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'efi', '', d)} \
69 sysusers \
70 binfmt \ 75 binfmt \
71 randomseed \ 76 randomseed \
72 machined \ 77 machined \
@@ -74,7 +79,7 @@ PACKAGECONFIG ??= "compat xz ldconfig \
74 quotacheck \ 79 quotacheck \
75 bootchart \ 80 bootchart \
76 hostnamed \ 81 hostnamed \
77 myhostname \ 82 ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers', '', d)} \
78 hibernate \ 83 hibernate \
79 timedated \ 84 timedated \
80 timesyncd \ 85 timesyncd \
@@ -86,7 +91,10 @@ PACKAGECONFIG ??= "compat xz ldconfig \
86 firstboot \ 91 firstboot \
87 utmp \ 92 utmp \
88 polkit \ 93 polkit \
89 " 94"
95PACKAGECONFIG_remove_libc-musl = "selinux"
96PACKAGECONFIG_remove_libc-musl = "smack"
97
90PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl" 98PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
91# Sign the journal for anti-tampering 99# Sign the journal for anti-tampering
92PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" 100PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
@@ -133,7 +141,6 @@ PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
133PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" 141PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
134PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" 142PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind"
135PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" 143PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
136PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs"
137PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 144PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
138PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump" 145PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump"
139PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" 146PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
@@ -173,9 +180,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
173 --with-firmware-path=/lib/firmware \ 180 --with-firmware-path=/lib/firmware \
174 --with-testdir=${PTEST_PATH} \ 181 --with-testdir=${PTEST_PATH} \
175 " 182 "
176# uclibc does not have NSS
177EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname --disable-sysusers"
178
179# per the systemd README, define VALGRIND=1 to run under valgrind 183# per the systemd README, define VALGRIND=1 to run under valgrind
180CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}" 184CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"
181 185
@@ -192,9 +196,6 @@ do_configure_prepend() {
192 else 196 else
193 cp -r ${S}/units ${S}/units.pre_sed 197 cp -r ${S}/units ${S}/units.pre_sed
194 fi 198 fi
195 sed -i '/ln --relative --help/d' ${S}/configure.ac
196 sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
197 sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am
198} 199}
199 200
200do_install() { 201do_install() {