summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd.inc4
-rw-r--r--meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch15
-rw-r--r--meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch62
-rw-r--r--meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch13
-rw-r--r--meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch68
-rw-r--r--meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch32
-rw-r--r--meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch122
-rw-r--r--meta/recipes-core/systemd/systemd_230.bb (renamed from meta/recipes-core/systemd/systemd_229.bb)5
-rw-r--r--meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb29
9 files changed, 120 insertions, 230 deletions
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 824713057d..f800f42e97 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,11 +14,11 @@ LICENSE = "GPLv2 & LGPLv2.1"
14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
16 16
17SRCREV = "714c62b46379abb7558c544665522aca91691e10" 17SRCREV = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba"
18 18
19SRC_URI = "git://github.com/systemd/systemd.git;protocol=git" 19SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
20 20
21PV = "229+git${SRCPV}" 21PV = "230+git${SRCPV}"
22 22
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24 24
diff --git a/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
index f183261c8d..e62d580f18 100644
--- a/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
+++ b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
@@ -1,6 +1,3 @@
1From 699893a05edac5194f9670529bacfaeb67252edb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 00:42:49 +0000
4Subject: [PATCH 03/36] define exp10 if missing 1Subject: [PATCH 03/36] define exp10 if missing
5 2
6Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch 3Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
@@ -11,23 +8,25 @@ Upstream-Status: Pending
11 8
12Signed-off-by: Samuel Martin <s.martin49@gmail.com> 9Signed-off-by: Samuel Martin <s.martin49@gmail.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
14--- 12---
15 src/basic/missing.h | 5 +++++ 13 src/basic/missing.h | 5 +++++
16 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
17 15
18diff --git a/src/basic/missing.h b/src/basic/missing.h 16diff --git a/src/basic/missing.h b/src/basic/missing.h
19index f3d3236..ee7e7ea 100644 17index 651e414..fafa233 100644
20--- a/src/basic/missing.h 18--- a/src/basic/missing.h
21+++ b/src/basic/missing.h 19+++ b/src/basic/missing.h
22@@ -1169,3 +1169,8 @@ static inline key_serial_t request_key(const char *type, const char *description 20@@ -1013,4 +1013,9 @@ typedef int32_t key_serial_t;
23 #endif
24 21
25 #endif 22 #endif
26+ 23
27+#ifdef __UCLIBC__ 24+#ifdef __UCLIBC__
28+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ 25+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
29+#define exp10(x) (exp((x) * log(10))) 26+#define exp10(x) (exp((x) * log(10)))
30+#endif /* __UCLIBC__ */ 27+#endif /* __UCLIBC__ */
28+
29 #include "missing_syscall.h"
31-- 30--
321.8.3.1 312.8.3
33 32
diff --git a/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
index 4a576aa7d6..2eea0ff9a6 100644
--- a/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
@@ -1,6 +1,3 @@
1From 786883cfa13e21f060ee6da6cabb94845f4349a0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 05:18:20 +0000
4Subject: [PATCH 14/36] Make root's home directory configurable 1Subject: [PATCH 14/36] Make root's home directory configurable
5 2
6OpenEmbedded has a configurable home directory for root. Allow 3OpenEmbedded has a configurable home directory for root. Allow
@@ -14,6 +11,7 @@ https://github.com/systemd/systemd/issues/541
14 11
15Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> 12Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
16Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
17--- 15---
18 Makefile.am | 2 ++ 16 Makefile.am | 2 ++
19 configure.ac | 7 +++++++ 17 configure.ac | 7 +++++++
@@ -26,10 +24,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 8 files changed, 20 insertions(+), 11 deletions(-) 24 8 files changed, 20 insertions(+), 11 deletions(-)
27 25
28diff --git a/Makefile.am b/Makefile.am 26diff --git a/Makefile.am b/Makefile.am
29index b3f3343..a99e8eb 100644 27index 305099a..88c1250 100644
30--- a/Makefile.am 28--- a/Makefile.am
31+++ b/Makefile.am 29+++ b/Makefile.am
32@@ -202,6 +202,7 @@ AM_CPPFLAGS = \ 30@@ -206,6 +206,7 @@ AM_CPPFLAGS = \
33 -DLIBDIR=\"$(libdir)\" \ 31 -DLIBDIR=\"$(libdir)\" \
34 -DROOTLIBDIR=\"$(rootlibdir)\" \ 32 -DROOTLIBDIR=\"$(rootlibdir)\" \
35 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ 33 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
@@ -37,7 +35,7 @@ index b3f3343..a99e8eb 100644
37 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ 35 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
38 -I $(top_srcdir)/src \ 36 -I $(top_srcdir)/src \
39 -I $(top_builddir)/src/basic \ 37 -I $(top_builddir)/src/basic \
40@@ -5713,6 +5714,7 @@ EXTRA_DIST += \ 38@@ -5863,6 +5864,7 @@ EXTRA_DIST += \
41 substitutions = \ 39 substitutions = \
42 '|rootlibexecdir=$(rootlibexecdir)|' \ 40 '|rootlibexecdir=$(rootlibexecdir)|' \
43 '|rootbindir=$(rootbindir)|' \ 41 '|rootbindir=$(rootbindir)|' \
@@ -46,10 +44,10 @@ index b3f3343..a99e8eb 100644
46 '|SYSTEMCTL=$(rootbindir)/systemctl|' \ 44 '|SYSTEMCTL=$(rootbindir)/systemctl|' \
47 '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ 45 '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
48diff --git a/configure.ac b/configure.ac 46diff --git a/configure.ac b/configure.ac
49index c5ab9d0..16c83bb 100644 47index 329861a..01764f5 100644
50--- a/configure.ac 48--- a/configure.ac
51+++ b/configure.ac 49+++ b/configure.ac
52@@ -1470,6 +1470,11 @@ AC_ARG_WITH([rootlibdir], 50@@ -1478,6 +1478,11 @@ AC_ARG_WITH([rootlibdir],
53 [with_rootlibdir=${libdir}]) 51 [with_rootlibdir=${libdir}])
54 AX_NORMALIZE_PATH([with_rootlibdir]) 52 AX_NORMALIZE_PATH([with_rootlibdir])
55 53
@@ -61,7 +59,7 @@ index c5ab9d0..16c83bb 100644
61 AC_ARG_WITH([pamlibdir], 59 AC_ARG_WITH([pamlibdir],
62 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), 60 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
63 [], 61 [],
64@@ -1553,6 +1558,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) 62@@ -1562,6 +1567,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
65 AC_SUBST([pamconfdir], [$with_pamconfdir]) 63 AC_SUBST([pamconfdir], [$with_pamconfdir])
66 AC_SUBST([rootprefix], [$with_rootprefix]) 64 AC_SUBST([rootprefix], [$with_rootprefix])
67 AC_SUBST([rootlibdir], [$with_rootlibdir]) 65 AC_SUBST([rootlibdir], [$with_rootlibdir])
@@ -69,19 +67,19 @@ index c5ab9d0..16c83bb 100644
69 67
70 AC_CONFIG_FILES([ 68 AC_CONFIG_FILES([
71 Makefile 69 Makefile
72@@ -1643,6 +1649,7 @@ AC_MSG_RESULT([ 70@@ -1653,6 +1659,7 @@ AC_MSG_RESULT([
73 includedir: ${includedir} 71 includedir: ${includedir}
74 lib dir: ${libdir} 72 lib dir: ${libdir}
75 rootlib dir: ${with_rootlibdir} 73 rootlib dir: ${with_rootlibdir}
76+ root home dir: ${with_roothomedir} 74+ root home dir: ${with_roothomedir}
77 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} 75 SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
78 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 76 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
79 Build Python: ${PYTHON} 77 Build Python: ${PYTHON}
80diff --git a/src/basic/user-util.c b/src/basic/user-util.c 78diff --git a/src/basic/user-util.c b/src/basic/user-util.c
81index 19155bc..55672b3 100644 79index f65ca3e..da1101a 100644
82--- a/src/basic/user-util.c 80--- a/src/basic/user-util.c
83+++ b/src/basic/user-util.c 81+++ b/src/basic/user-util.c
84@@ -122,7 +122,7 @@ int get_user_creds( 82@@ -123,7 +123,7 @@ int get_user_creds(
85 *gid = 0; 83 *gid = 0;
86 84
87 if (home) 85 if (home)
@@ -90,7 +88,7 @@ index 19155bc..55672b3 100644
90 88
91 if (shell) 89 if (shell)
92 *shell = "/bin/sh"; 90 *shell = "/bin/sh";
93@@ -353,7 +353,7 @@ int get_home_dir(char **_h) { 91@@ -354,7 +354,7 @@ int get_home_dir(char **_h) {
94 /* Hardcode home directory for root to avoid NSS */ 92 /* Hardcode home directory for root to avoid NSS */
95 u = getuid(); 93 u = getuid();
96 if (u == 0) { 94 if (u == 0) {
@@ -100,10 +98,10 @@ index 19155bc..55672b3 100644
100 return -ENOMEM; 98 return -ENOMEM;
101 99
102diff --git a/src/core/namespace.c b/src/core/namespace.c 100diff --git a/src/core/namespace.c b/src/core/namespace.c
103index b573f00..0f70b14 100644 101index 203d122..45c0d11 100644
104--- a/src/core/namespace.c 102--- a/src/core/namespace.c
105+++ b/src/core/namespace.c 103+++ b/src/core/namespace.c
106@@ -409,7 +409,7 @@ int setup_namespace( 104@@ -415,7 +415,7 @@ int setup_namespace(
107 home_dir = strjoina("-", home_dir); 105 home_dir = strjoina("-", home_dir);
108 run_user_dir = prefix_roota(root_directory, "/run/user"); 106 run_user_dir = prefix_roota(root_directory, "/run/user");
109 run_user_dir = strjoina("-", run_user_dir); 107 run_user_dir = strjoina("-", run_user_dir);
@@ -113,24 +111,24 @@ index b573f00..0f70b14 100644
113 111
114 r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir), 112 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 113diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
116index 65e65ec..12f0ee8 100644 114index 8ec0584..51df00b 100644
117--- a/src/nspawn/nspawn.c 115--- a/src/nspawn/nspawn.c
118+++ b/src/nspawn/nspawn.c 116+++ b/src/nspawn/nspawn.c
119@@ -2564,7 +2564,7 @@ static int inner_child( 117@@ -2739,7 +2739,7 @@ static int inner_child(
120 if (envp[n_env]) 118 if (envp[n_env])
121 n_env ++; 119 n_env++;
122 120
123- if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) || 121- if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) ||
124+ if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) || 122+ if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) ||
125 (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) || 123 (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)) 124 (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0))
127 return log_oom(); 125 return log_oom();
128@@ -2647,7 +2647,7 @@ static int inner_child( 126@@ -2816,7 +2816,7 @@ static int inner_child(
129 #endif /* HAVE_EXECVPE */
130 else { 127 else {
131 if (!arg_chdir) 128 if (!arg_chdir)
132- chdir(home ?: "/root"); 129 /* If we cannot change the directory, we'll end up in /, that is expected. */
133+ chdir(home ?: ROOTHOMEDIR); 130- (void) chdir(home ?: "/root");
131+ (void) chdir(home ?: ROOTHOMEDIR);
134 132
135 execle("/bin/bash", "-bash", NULL, env_use); 133 execle("/bin/bash", "-bash", NULL, env_use);
136 execle("/bin/sh", "-sh", NULL, env_use); 134 execle("/bin/sh", "-sh", NULL, env_use);
@@ -150,10 +148,10 @@ index a345ec2..3caae7d 100644
150 ExecStopPost=-@SYSTEMCTL@ poweroff 148 ExecStopPost=-@SYSTEMCTL@ poweroff
151 Type=idle 149 Type=idle
152diff --git a/units/emergency.service.in b/units/emergency.service.in 150diff --git a/units/emergency.service.in b/units/emergency.service.in
153index fb390ea..5623a57 100644 151index 0de16f2..4826062 100644
154--- a/units/emergency.service.in 152--- a/units/emergency.service.in
155+++ b/units/emergency.service.in 153+++ b/units/emergency.service.in
156@@ -14,8 +14,8 @@ Conflicts=rescue.service 154@@ -15,8 +15,8 @@ Conflicts=syslog.socket
157 Before=shutdown.target 155 Before=shutdown.target
158 156
159 [Service] 157 [Service]
@@ -180,5 +178,5 @@ index 92553f6..590ae17 100644
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.' 178 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" 179 ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
182-- 180--
1831.8.3.1 1812.8.3
184 182
diff --git a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
index a351237338..f7a5b19da7 100644
--- a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
+++ b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
@@ -1,6 +1,3 @@
1From f70a1a9605cd3adac450c49a5a69da6e9acda517 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:26:25 +0000
4Subject: [PATCH 15/36] systemd-user: avoid using system-auth 1Subject: [PATCH 15/36] systemd-user: avoid using system-auth
5 2
6In OE, we don't provide system-auth, instead, we use common-* files. 3In OE, we don't provide system-auth, instead, we use common-* files.
@@ -10,15 +7,16 @@ Upstream-Status: Inappropriate [oe specific]
10 7
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
13--- 11---
14 src/login/systemd-user.m4 | 4 ++-- 12 src/login/systemd-user.m4 | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 13 1 file changed, 2 insertions(+), 2 deletions(-)
16 14
17diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 15diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
18index 7933508..16b73d2 100644 16index f188a8e..862d8d7 100644
19--- a/src/login/systemd-user.m4 17--- a/src/login/systemd-user.m4
20+++ b/src/login/systemd-user.m4 18+++ b/src/login/systemd-user.m4
21@@ -2,10 +2,10 @@ 19@@ -2,11 +2,11 @@
22 # 20 #
23 # Used by systemd --user instances. 21 # Used by systemd --user instances.
24 22
@@ -29,8 +27,9 @@ index 7933508..16b73d2 100644
29 session required pam_selinux.so close 27 session required pam_selinux.so close
30 session required pam_selinux.so nottys open 28 session required pam_selinux.so nottys open
31 )m4_dnl 29 )m4_dnl
30 session required pam_loginuid.so
32-session include system-auth 31-session include system-auth
33+session include common-session 32+session include common-account
34-- 33--
351.8.3.1 342.8.3
36 35
diff --git a/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 8e6289d4ac..642625f32f 100644
--- a/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -1,6 +1,3 @@
1From 9a3a4e16b36e762291cd1574ec71d7954f8b5363 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 05:33:32 +0000
4Subject: [PATCH 17/36] Revert "udev: remove userspace firmware loading 1Subject: [PATCH 17/36] Revert "udev: remove userspace firmware loading
5 support" 2 support"
6 3
@@ -13,21 +10,21 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 11---
15 Makefile.am | 12 +++ 12 Makefile.am | 12 +++
16 README | 6 +- 13 README | 4 +-
17 TODO | 1 + 14 TODO | 1 +
18 configure.ac | 22 ++++++ 15 configure.ac | 22 ++++++
19 src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++ 16 src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
20 src/udev/udev-builtin.c | 3 + 17 src/udev/udev-builtin.c | 3 +
21 src/udev/udev.h | 6 ++ 18 src/udev/udev.h | 6 ++
22 src/udev/udevd.c | 13 ++++ 19 src/udev/udevd.c | 13 ++++
23 8 files changed, 214 insertions(+), 3 deletions(-) 20 8 files changed, 213 insertions(+), 2 deletions(-)
24 create mode 100644 src/udev/udev-builtin-firmware.c 21 create mode 100644 src/udev/udev-builtin-firmware.c
25 22
26diff --git a/Makefile.am b/Makefile.am 23diff --git a/Makefile.am b/Makefile.am
27index a99e8eb..b5c6ba7 100644 24index 305099a..e774976 100644
28--- a/Makefile.am 25--- a/Makefile.am
29+++ b/Makefile.am 26+++ b/Makefile.am
30@@ -3573,6 +3573,18 @@ libudev_core_la_LIBADD = \ 27@@ -3706,6 +3706,18 @@ libudev_core_la_LIBADD = \
31 $(BLKID_LIBS) \ 28 $(BLKID_LIBS) \
32 $(KMOD_LIBS) 29 $(KMOD_LIBS)
33 30
@@ -47,17 +44,10 @@ index a99e8eb..b5c6ba7 100644
47 libudev_core_la_SOURCES += \ 44 libudev_core_la_SOURCES += \
48 src/udev/udev-builtin-kmod.c 45 src/udev/udev-builtin-kmod.c
49diff --git a/README b/README 46diff --git a/README b/README
50index 41fb07a..10230ac 100644 47index ca8993c..87f3297 100644
51--- a/README 48--- a/README
52+++ b/README 49+++ b/README
53@@ -50,14 +50,14 @@ REQUIREMENTS: 50@@ -56,8 +56,8 @@ REQUIREMENTS:
54 CONFIG_PROC_FS
55 CONFIG_FHANDLE (libudev, mount and bind mount handling)
56
57- udev will fail to work with the legacy sysfs layout:
58+ Udev will fail to work with the legacy layout:
59 CONFIG_SYSFS_DEPRECATED=n
60
61 Legacy hotplug slows down the system and confuses udev: 51 Legacy hotplug slows down the system and confuses udev:
62 CONFIG_UEVENT_HELPER_PATH="" 52 CONFIG_UEVENT_HELPER_PATH=""
63 53
@@ -69,11 +59,11 @@ index 41fb07a..10230ac 100644
69 59
70 Some udev rules and virtualization detection relies on it: 60 Some udev rules and virtualization detection relies on it:
71diff --git a/TODO b/TODO 61diff --git a/TODO b/TODO
72index 92cc8cc..25f6849 100644 62index fac9ccf..2645582 100644
73--- a/TODO 63--- a/TODO
74+++ b/TODO 64+++ b/TODO
75@@ -628,6 +628,7 @@ Features: 65@@ -642,6 +642,7 @@ Features:
76 * rename "userspace" to "core-os" 66 * initialize the hostname from the fs label of /, if /etc/hostname does not exist?
77 67
78 * udev: 68 * udev:
79+ - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n) 69+ - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
@@ -81,10 +71,10 @@ index 92cc8cc..25f6849 100644
81 - kill scsi_id 71 - kill scsi_id
82 - add trigger --subsystem-match=usb/usb_device device 72 - add trigger --subsystem-match=usb/usb_device device
83diff --git a/configure.ac b/configure.ac 73diff --git a/configure.ac b/configure.ac
84index 16c83bb..36d20b5 100644 74index 329861a..af85405 100644
85--- a/configure.ac 75--- a/configure.ac
86+++ b/configure.ac 76+++ b/configure.ac
87@@ -1353,6 +1353,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database 77@@ -1361,6 +1361,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database
88 AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes]) 78 AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
89 79
90 # ------------------------------------------------------------------------------ 80 # ------------------------------------------------------------------------------
@@ -103,23 +93,23 @@ index 16c83bb..36d20b5 100644
103+done 93+done
104+IFS=$OLD_IFS 94+IFS=$OLD_IFS
105+AC_SUBST(FIRMWARE_PATH) 95+AC_SUBST(FIRMWARE_PATH)
106+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ]) 96+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is availabe]) ])
107+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"]) 97+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
108+ 98+
109+# ------------------------------------------------------------------------------ 99+# ------------------------------------------------------------------------------
110 have_manpages=no 100 have_manpages=no
111 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) 101 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
112 AC_PATH_PROG([XSLTPROC], [xsltproc]) 102 AC_PATH_PROG([XSLTPROC], [xsltproc])
113@@ -1653,6 +1672,9 @@ AC_MSG_RESULT([ 103@@ -1656,6 +1675,9 @@ AC_MSG_RESULT([
114 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} 104 SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
115 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 105 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
116 Build Python: ${PYTHON} 106 Build Python: ${PYTHON}
117+ Installation Python: ${PYTHON_BINARY} 107+ Installation Python: ${PYTHON_BINARY}
118+ sphinx binary: ${SPHINX_BUILD} 108+ sphinx binary: ${SPHINX_BUILD}
119+ firmware path: ${FIRMWARE_PATH} 109+ firmware path: ${FIRMWARE_PATH}
120 PAM modules dir: ${with_pamlibdir} 110 PAM modules dir: ${with_pamlibdir}
121 PAM configuration dir: ${with_pamconfdir} 111 PAM configuration dir: ${with_pamconfdir}
122 D-Bus policy dir: ${with_dbuspolicydir} 112 D-Bus policy dir: ${with_dbuspolicydir}
123diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c 113diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
124new file mode 100644 114new file mode 100644
125index 0000000..bd8c2fb 115index 0000000..bd8c2fb
@@ -295,10 +285,10 @@ index e6b36f1..cd9947e 100644
295 [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, 285 [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
296 [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, 286 [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
297diff --git a/src/udev/udev.h b/src/udev/udev.h 287diff --git a/src/udev/udev.h b/src/udev/udev.h
298index 1f9c812..fa35a88 100644 288index 8433e8d..d32366d 100644
299--- a/src/udev/udev.h 289--- a/src/udev/udev.h
300+++ b/src/udev/udev.h 290+++ b/src/udev/udev.h
301@@ -147,6 +147,9 @@ enum udev_builtin_cmd { 291@@ -148,6 +148,9 @@ enum udev_builtin_cmd {
302 UDEV_BUILTIN_BLKID, 292 UDEV_BUILTIN_BLKID,
303 #endif 293 #endif
304 UDEV_BUILTIN_BTRFS, 294 UDEV_BUILTIN_BTRFS,
@@ -308,7 +298,7 @@ index 1f9c812..fa35a88 100644
308 UDEV_BUILTIN_HWDB, 298 UDEV_BUILTIN_HWDB,
309 UDEV_BUILTIN_INPUT_ID, 299 UDEV_BUILTIN_INPUT_ID,
310 UDEV_BUILTIN_KEYBOARD, 300 UDEV_BUILTIN_KEYBOARD,
311@@ -175,6 +178,9 @@ struct udev_builtin { 301@@ -176,6 +179,9 @@ struct udev_builtin {
312 extern const struct udev_builtin udev_builtin_blkid; 302 extern const struct udev_builtin udev_builtin_blkid;
313 #endif 303 #endif
314 extern const struct udev_builtin udev_builtin_btrfs; 304 extern const struct udev_builtin udev_builtin_btrfs;
@@ -319,7 +309,7 @@ index 1f9c812..fa35a88 100644
319 extern const struct udev_builtin udev_builtin_input_id; 309 extern const struct udev_builtin udev_builtin_input_id;
320 extern const struct udev_builtin udev_builtin_keyboard; 310 extern const struct udev_builtin udev_builtin_keyboard;
321diff --git a/src/udev/udevd.c b/src/udev/udevd.c 311diff --git a/src/udev/udevd.c b/src/udev/udevd.c
322index bb92f16..84024ac 100644 312index e9dd2f4..0abc28e 100644
323--- a/src/udev/udevd.c 313--- a/src/udev/udevd.c
324+++ b/src/udev/udevd.c 314+++ b/src/udev/udevd.c
325@@ -125,6 +125,9 @@ struct event { 315@@ -125,6 +125,9 @@ struct event {
@@ -332,7 +322,7 @@ index bb92f16..84024ac 100644
332 }; 322 };
333 323
334 static inline struct event *node_to_event(struct udev_list_node *node) { 324 static inline struct event *node_to_event(struct udev_list_node *node) {
335@@ -613,6 +616,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) { 325@@ -614,6 +617,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
336 event->devnum = udev_device_get_devnum(dev); 326 event->devnum = udev_device_get_devnum(dev);
337 event->is_block = streq("block", udev_device_get_subsystem(dev)); 327 event->is_block = streq("block", udev_device_get_subsystem(dev));
338 event->ifindex = udev_device_get_ifindex(dev); 328 event->ifindex = udev_device_get_ifindex(dev);
@@ -343,7 +333,7 @@ index bb92f16..84024ac 100644
343 333
344 log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), 334 log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
345 udev_device_get_action(dev), udev_device_get_subsystem(dev)); 335 udev_device_get_action(dev), udev_device_get_subsystem(dev));
346@@ -698,6 +705,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) { 336@@ -699,6 +706,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
347 return true; 337 return true;
348 } 338 }
349 339
@@ -357,5 +347,5 @@ index bb92f16..84024ac 100644
357 if (event->devpath[common] == '/') { 347 if (event->devpath[common] == '/') {
358 event->delaying_seqnum = loop_event->seqnum; 348 event->delaying_seqnum = loop_event->seqnum;
359-- 349--
3601.8.3.1 3502.8.3
361 351
diff --git a/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch b/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
index 5f3f2e8a5b..5d13e4af94 100644
--- a/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
@@ -1,6 +1,3 @@
1From 569cd3cf9806a02226d26c4104dbe44262f93d33 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Fri, 22 Jan 2016 16:44:11 +0800
4Subject: [PATCH 18/36] make test dir configurable 1Subject: [PATCH 18/36] make test dir configurable
5 2
6Upstream-Status: Pending 3Upstream-Status: Pending
@@ -9,16 +6,17 @@ test maybe be run on target in cross-compile environment, and test dir
9is not the compilation dir, so make it configurable 6is not the compilation dir, so make it configurable
10 7
11Signed-off-by: Roy Li <rongqing.li@windriver.com> 8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9
12--- 10---
13 Makefile.am | 2 +- 11 Makefile.am | 2 +-
14 configure.ac | 7 +++++++ 12 configure.ac | 7 +++++++
15 2 files changed, 8 insertions(+), 1 deletion(-) 13 2 files changed, 8 insertions(+), 1 deletion(-)
16 14
17diff --git a/Makefile.am b/Makefile.am 15diff --git a/Makefile.am b/Makefile.am
18index b5c6ba7..d3cd961 100644 16index a94636a..dbd3386 100644
19--- a/Makefile.am 17--- a/Makefile.am
20+++ b/Makefile.am 18+++ b/Makefile.am
21@@ -203,7 +203,7 @@ AM_CPPFLAGS = \ 19@@ -207,7 +207,7 @@ AM_CPPFLAGS = \
22 -DROOTLIBDIR=\"$(rootlibdir)\" \ 20 -DROOTLIBDIR=\"$(rootlibdir)\" \
23 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ 21 -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
24 -DROOTHOMEDIR=\"$(roothomedir)\" \ 22 -DROOTHOMEDIR=\"$(roothomedir)\" \
@@ -28,10 +26,10 @@ index b5c6ba7..d3cd961 100644
28 -I $(top_builddir)/src/basic \ 26 -I $(top_builddir)/src/basic \
29 -I $(top_srcdir)/src/basic \ 27 -I $(top_srcdir)/src/basic \
30diff --git a/configure.ac b/configure.ac 28diff --git a/configure.ac b/configure.ac
31index 36d20b5..d96dc5a 100644 29index 45aae8a..c53fae2 100644
32--- a/configure.ac 30--- a/configure.ac
33+++ b/configure.ac 31+++ b/configure.ac
34@@ -1494,6 +1494,11 @@ AC_ARG_WITH([roothomedir], 32@@ -1518,6 +1518,11 @@ AC_ARG_WITH([roothomedir],
35 [], 33 [],
36 [with_roothomedir=/root]) 34 [with_roothomedir=/root])
37 35
@@ -43,7 +41,7 @@ index 36d20b5..d96dc5a 100644
43 AC_ARG_WITH([pamlibdir], 41 AC_ARG_WITH([pamlibdir],
44 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), 42 AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
45 [], 43 [],
46@@ -1578,6 +1583,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir]) 44@@ -1603,6 +1608,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
47 AC_SUBST([rootprefix], [$with_rootprefix]) 45 AC_SUBST([rootprefix], [$with_rootprefix])
48 AC_SUBST([rootlibdir], [$with_rootlibdir]) 46 AC_SUBST([rootlibdir], [$with_rootlibdir])
49 AC_SUBST([roothomedir], [$with_roothomedir]) 47 AC_SUBST([roothomedir], [$with_roothomedir])
@@ -51,14 +49,14 @@ index 36d20b5..d96dc5a 100644
51 49
52 AC_CONFIG_FILES([ 50 AC_CONFIG_FILES([
53 Makefile 51 Makefile
54@@ -1669,6 +1675,7 @@ AC_MSG_RESULT([ 52@@ -1695,6 +1701,7 @@ AC_MSG_RESULT([
55 lib dir: ${libdir} 53 lib dir: ${libdir}
56 rootlib dir: ${with_rootlibdir} 54 rootlib dir: ${with_rootlibdir}
57 root home dir: ${with_roothomedir} 55 root home dir: ${with_roothomedir}
58+ test dir: ${with_testdir} 56+ test dir: ${with_testdir}
59 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} 57 SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
60 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 58 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
61 Build Python: ${PYTHON} 59 Build Python: ${PYTHON}
62-- 60--
631.8.3.1 612.8.3
64 62
diff --git a/meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch b/meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch
deleted file mode 100644
index 1ae3d66c78..0000000000
--- a/meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch
+++ /dev/null
@@ -1,122 +0,0 @@
1From b68f10bf1f7519e012da5e35fab3a57da7dc46d4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
3Date: Sun, 27 Mar 2016 17:33:54 -0400
4Subject: [PATCH] build-sys: fix build with libgrcypt disabled
5
6- Move gcrypt.h include inside grcrypt-util.h.
7- Allow gcrypt-util.[ch] to be compiled even without gcrypt.
8This allows the logic in files using gcrypt to be simplified.
9
10- Fix compilation of systemd-resolve without gcrypt.
11systemd-resolved already supported that.
12
13Upstream-Status: Backport [ https://github.com/systemd/systemd/pull/2905 ]
14
15Fixes [YOCTO #9219]
16
17Signed-off-by: Maxin B. John <maxin.john@intel.com>
18---
19 Makefile.am | 8 ++++----
20 src/resolve/resolve-tool.c | 3 +--
21 src/shared/gcrypt-util.c | 4 +++-
22 src/shared/gcrypt-util.h | 14 ++++++++++++++
23 4 files changed, 22 insertions(+), 7 deletions(-)
24
25diff --git a/Makefile.am b/Makefile.am
26index 2b72a53..95eaa9a 100644
27--- a/Makefile.am
28+++ b/Makefile.am
29@@ -4262,7 +4262,9 @@ libsystemd_journal_internal_la_SOURCES = \
30 src/journal/mmap-cache.h \
31 src/journal/compress.c \
32 src/journal/audit-type.h \
33- src/journal/audit-type.c
34+ src/journal/audit-type.c \
35+ src/shared/gcrypt-util.h \
36+ src/shared/gcrypt-util.c
37
38 nodist_libsystemd_journal_internal_la_SOURCES = \
39 src/journal/audit_type-to-name.h
40@@ -4294,9 +4296,7 @@ libsystemd_journal_internal_la_SOURCES += \
41 src/journal/journal-authenticate.c \
42 src/journal/journal-authenticate.h \
43 src/journal/fsprg.c \
44- src/journal/fsprg.h \
45- src/shared/gcrypt-util.c \
46- src/shared/gcrypt-util.h
47+ src/journal/fsprg.h
48
49 libsystemd_journal_internal_la_LIBADD += \
50 $(GCRYPT_LIBS)
51diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c
52index 009cc73..14ee01c 100644
53--- a/src/resolve/resolve-tool.c
54+++ b/src/resolve/resolve-tool.c
55@@ -17,7 +17,6 @@
56 along with systemd; If not, see <http://www.gnu.org/licenses/>.
57 ***/
58
59-#include <gcrypt.h>
60 #include <getopt.h>
61 #include <net/if.h>
62
63@@ -863,7 +862,7 @@ static int resolve_openpgp(sd_bus *bus, const char *address) {
64 }
65 domain++;
66
67- r = string_hashsum(address, domain - 1 - address, GCRY_MD_SHA224, &hashed);
68+ r = string_hashsum_sha224(address, domain - 1 - address, &hashed);
69 if (r < 0)
70 return log_error_errno(r, "Hashing failed: %m");
71
72diff --git a/src/shared/gcrypt-util.c b/src/shared/gcrypt-util.c
73index 4ff9452..39b544b 100644
74--- a/src/shared/gcrypt-util.c
75+++ b/src/shared/gcrypt-util.c
76@@ -19,10 +19,11 @@
77 along with systemd; If not, see <http://www.gnu.org/licenses/>.
78 ***/
79
80+#ifdef HAVE_GCRYPT
81 #include <gcrypt.h>
82
83-#include "hexdecoct.h"
84 #include "gcrypt-util.h"
85+#include "hexdecoct.h"
86
87 void initialize_libgcrypt(bool secmem) {
88 const char *p;
89@@ -67,3 +68,4 @@ int string_hashsum(const char *s, size_t len, int md_algorithm, char **out) {
90 *out = enc;
91 return 0;
92 }
93+#endif
94diff --git a/src/shared/gcrypt-util.h b/src/shared/gcrypt-util.h
95index c7652c2..cf33b3c 100644
96--- a/src/shared/gcrypt-util.h
97+++ b/src/shared/gcrypt-util.h
98@@ -19,7 +19,21 @@
99 along with systemd; If not, see <http://www.gnu.org/licenses/>.
100 ***/
101
102+#include <errno.h>
103 #include <stdbool.h>
104+#include <stddef.h>
105+
106+#ifdef HAVE_GCRYPT
107+#include <gcrypt.h>
108
109 void initialize_libgcrypt(bool secmem);
110 int string_hashsum(const char *s, size_t len, int md_algorithm, char **out);
111+#endif
112+
113+static inline int string_hashsum_sha224(const char *s, size_t len, char **out) {
114+#ifdef HAVE_GCRYPT
115+ return string_hashsum(s, len, GCRY_MD_SHA224, out);
116+#else
117+ return -EOPNOTSUPP;
118+#endif
119+}
120--
1212.4.0
122
diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_230.bb
index 4b726f3a39..374a197673 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_230.bb
@@ -35,7 +35,6 @@ SRC_URI += " \
35 file://0020-check-for-uchar.h-in-configure.patch \ 35 file://0020-check-for-uchar.h-in-configure.patch \
36 file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \ 36 file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \
37 file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ 37 file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
38 file://0023-build-sys-fix-build-with-libgrcypt-disabled.patch \
39 file://udev-re-enable-mount-propagation-for-udevd.patch \ 38 file://udev-re-enable-mount-propagation-for-udevd.patch \
40" 39"
41SRC_URI_append_libc-uclibc = "\ 40SRC_URI_append_libc-uclibc = "\
@@ -57,7 +56,6 @@ PACKAGECONFIG ??= "xz \
57 machined \ 56 machined \
58 backlight \ 57 backlight \
59 quotacheck \ 58 quotacheck \
60 bootchart \
61 hostnamed \ 59 hostnamed \
62 ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers', '', d)} \ 60 ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers', '', d)} \
63 hibernate \ 61 hibernate \
@@ -91,7 +89,6 @@ PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
91PACKAGECONFIG[machined] = "--enable-machined,--disable-machined" 89PACKAGECONFIG[machined] = "--enable-machined,--disable-machined"
92PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight" 90PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight"
93PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck" 91PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck"
94PACKAGECONFIG[bootchart] = "--enable-bootchart,--disable-bootchart"
95PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed" 92PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed"
96PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname" 93PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname"
97PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill" 94PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill"
@@ -255,6 +252,8 @@ do_install_ptest () {
255 # install data files needed for tests 252 # install data files needed for tests
256 install -d ${D}${PTEST_PATH}/tests/test 253 install -d ${D}${PTEST_PATH}/tests/test
257 cp -rfL ${S}/test/* ${D}${PTEST_PATH}/tests/test 254 cp -rfL ${S}/test/* ${D}${PTEST_PATH}/tests/test
255 # python is disabled for systemd, thus removing these python testing scripts
256 rm ${D}${PTEST_PATH}/tests/test/*.py
258 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/tests/test/udev-test.pl 257 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/tests/test/udev-test.pl
259 258
260 install -d ${D}${PTEST_PATH}/tests/catalog 259 install -d ${D}${PTEST_PATH}/tests/catalog
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb
new file mode 100644
index 0000000000..9ce629a2b2
--- /dev/null
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb
@@ -0,0 +1,29 @@
1LICENSE = "LGPLv2.1 & GPLv2"
2LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
3 file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe"
4
5SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https"
6
7# Modify these as desired
8PV = "230+git${SRCPV}"
9SRCREV = "dcb246b46239259ec99b3c6e6ab7d27e1a5a8a84"
10
11S = "${WORKDIR}/git"
12
13DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool"
14
15inherit pkgconfig autotools systemd distro_features_check
16
17REQUIRED_DISTRO_FEATURES = "systemd"
18
19SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service"
20
21do_configure_prepend() {
22 # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot
23 rm -f ${S}/m4/intltool.m4
24}
25
26FILES_${PN} += "${systemd_unitdir}/systemd-bootchart"
27
28EXTRA_OECONF = " --with-rootprefix=${base_prefix} \
29 --with-rootlibdir=${base_libdir}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 01:17:46 +0000