summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-09-03 15:08:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-03 11:09:04 +0100
commit6301fde8956245e0b7e702788701eed3aa8811bb (patch)
tree91b7586c15fde16854f9df817226a9363fa98aa7
parentb2a93ca8e853d6479983408e6294c7fb38159c92 (diff)
downloadpoky-6301fde8956245e0b7e702788701eed3aa8811bb.tar.gz
systemd: upgrade to 216
Upgrade systemd from 213 to 216. systemd-older-kernel.patch is removed as it's fixed in 216. 0001-uClibc-doesn-t-implement-pwritev-preadv.patch is removed because the file it patches has been removed from the project. 0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch is removed because it has been merged. 0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch is backported to fix compilation error for mips. Below are the required kernel versions for systemd 216. Linux kernel >= 3.0 Linux kernel >= 3.3 for loop device partition support features with nspawn Linux kernel >= 3.8 for Smack support (From OE-Core rev: 58c432b2725ad8b78d02cb91a6ab405d425c01cc) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch29
-rw-r--r--meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch34
-rw-r--r--meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch29
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-older-kernel.patch56
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb (renamed from meta/recipes-core/systemd/systemd_213.bb)15
5 files changed, 38 insertions, 125 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch b/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
new file mode 100644
index 0000000000..448ef1a917
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
@@ -0,0 +1,29 @@
1Upstream-Status: Backport
2
3Subject: missing.h: add fake __NR_memfd_create for MIPS
4
5We don't have the correct __NR_memfd_create syscall number yet, so set it to
60xffffffff for now to prevent compile time errors.
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 src/shared/missing.h | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/src/shared/missing.h b/src/shared/missing.h
14index 3ff1a21..3051cb5 100644
15--- a/src/shared/missing.h
16+++ b/src/shared/missing.h
17@@ -167,6 +167,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
18 # define __NR_fanotify_mark 5296
19 # endif
20 # endif
21+# ifndef __NR_memfd_create
22+# define __NR_memfd_create 0xffffffff /* FIXME */
23+# endif
24 #else
25 # ifndef __NR_fanotify_init
26 # define __NR_fanotify_init 338
27--
281.9.1
29
diff --git a/meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch b/meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch
deleted file mode 100644
index 9fdb3c9ab3..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Inappropriate [uclibc specific]
2
3From 7be9273548bcb1f57d011fc252965e45dd2a058c Mon Sep 17 00:00:00 2001
4From: Khem Raj <raj.khem@gmail.com>
5Date: Wed, 21 Aug 2013 19:09:27 -0700
6Subject: [PATCH] uClibc doesn't implement pwritev/preadv
7
8Lets stub out the testcase for building.
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/libsystemd-bus/test-bus-memfd.c | 2 ++
13 1 file changed, 2 insertions(+)
14
15Index: systemd-209/src/libsystemd/sd-bus/test-bus-memfd.c
16===================================================================
17--- systemd-209.orig/src/libsystemd/sd-bus/test-bus-memfd.c 2014-02-19 15:03:09.983254602 -0800
18+++ systemd-209/src/libsystemd/sd-bus/test-bus-memfd.c 2014-02-19 23:42:10.636652864 -0800
19@@ -151,6 +151,7 @@
20 /* check content */
21 assert_se(memcmp(buf, "ll", 2) == 0);
22
23+#ifndef __UCLIBC__
24 /* writev it out*/
25 iov[0].iov_base = (char *)"ABC";
26 iov[0].iov_len = 3;
27@@ -173,6 +174,7 @@
28 assert_se(memcmp(bufv[0], "ABC", 3) == 0);
29 assert_se(memcmp(bufv[1], "DEF", 3) == 0);
30 assert_se(memcmp(bufv[2], "GHI", 3) == 0);
31+#endif /* __UCLIBC__ */
32
33 sd_memfd_free(m);
34
diff --git a/meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch b/meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch
deleted file mode 100644
index ba4a21ba9f..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 764ecbeda4813f33eafd45fdc3ccb9376356f475 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Aug 2014 15:40:31 -0700
4Subject: [PATCH] util: Including missing.h to get MAX_HANDLE_SZ
5
6Helps compiling on uclibc
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: [Backport]
11---
12 src/shared/util.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/shared/util.h b/src/shared/util.h
16index 62eb604..036fc59 100644
17--- a/src/shared/util.h
18+++ b/src/shared/util.h
19@@ -84,6 +84,7 @@
20 #endif
21
22 #include "macro.h"
23+#include "missing.h"
24 #include "time-util.h"
25
26 /* What is interpreted as whitespace? */
27--
281.7.10.4
29
diff --git a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch b/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch
deleted file mode 100644
index 18b50e797a..0000000000
--- a/meta/recipes-core/systemd/systemd/systemd-older-kernel.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 6109f02dcc4f2d7a461c5772bab494f5753a2203 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 29 May 2014 08:09:07 +0000
4Subject: [PATCH] rtnl-types.c: check IFLA_VLAN_PROTOCOL
5
6The older kernel's linux/if_link.h doesn't have IFLA_VLAN_PROTOCOL, we need
7check whether it has been defined or not.
8
9The maintainer said that he would fix it:
10
11http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/18200
12
13Also we need redefine IFLA_MAX from 34 to 35 when define IFLA_CARRIER,
14otherwise there would be error:
15
16| src/libsystemd/sd-rtnl/rtnl-types.c:233:9: error: array index in initializer exceeds array bounds
17| [IFLA_CARRIER] = { .type = NLA_U8 },
18
19Upstream-Status: Pending
20
21Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
22---
23 src/libsystemd/sd-rtnl/rtnl-types.c | 2 ++
24 src/shared/missing.h | 2 ++
25 2 files changed, 4 insertions(+)
26
27diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c
28index 44ac5ec..ab6161f 100644
29--- a/src/libsystemd/sd-rtnl/rtnl-types.c
30+++ b/src/libsystemd/sd-rtnl/rtnl-types.c
31@@ -67,7 +67,9 @@ static const NLType rtnl_link_info_data_vlan_types[IFLA_VLAN_MAX + 1] = {
32 [IFLA_VLAN_EGRESS_QOS] = { .type = NLA_NESTED },
33 [IFLA_VLAN_INGRESS_QOS] = { .type = NLA_NESTED },
34 */
35+#ifdef IFLA_VLAN_PROTOCOL
36 [IFLA_VLAN_PROTOCOL] = { .type = NLA_U16 },
37+#endif
38 };
39
40 static const NLType rtnl_link_info_data_bond_types[IFLA_BOND_MAX + 1] = {
41diff --git a/src/shared/missing.h b/src/shared/missing.h
42index d5ec2f8..732853f 100644
43--- a/src/shared/missing.h
44+++ b/src/shared/missing.h
45@@ -94,6 +94,8 @@
46
47 #ifndef IFLA_CARRIER
48 #define IFLA_CARRIER 33
49+ #undef IFLA_MAX
50+ #define IFLA_MAX 35
51 #ifndef IFLA_NUM_RX_QUEUES
52 #define IFLA_NUM_RX_QUEUES 32
53 #ifndef IFLA_NUM_TX_QUEUES
54--
551.8.3.4
56
diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_216.bb
index ca071c156c..df4a217686 100644
--- a/meta/recipes-core/systemd/systemd_213.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -17,9 +17,9 @@ SECTION = "base/shell"
17 17
18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext 18inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
19 19
20SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95" 20SRCREV = "5d0ae62c665262c4c55536457e84e278c252cc0b"
21 21
22PV = "213+git${SRCPV}" 22PV = "216+git${SRCPV}"
23 23
24SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ 24SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
25 file://binfmt-install.patch \ 25 file://binfmt-install.patch \
@@ -28,15 +28,13 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
28 file://systemd-pam-fix-fallocate.patch \ 28 file://systemd-pam-fix-fallocate.patch \
29 file://systemd-pam-fix-mkostemp.patch \ 29 file://systemd-pam-fix-mkostemp.patch \
30 file://optional_secure_getenv.patch \ 30 file://optional_secure_getenv.patch \
31 file://0001-uClibc-doesn-t-implement-pwritev-preadv.patch \
32 file://uclibc-sysinfo_h.patch \ 31 file://uclibc-sysinfo_h.patch \
33 file://uclibc-get-physmem.patch \ 32 file://uclibc-get-physmem.patch \
34 file://0001-util-Including-missing.h-to-get-MAX_HANDLE_SZ.patch \ 33 file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \
35 file://touchscreen.rules \ 34 file://touchscreen.rules \
36 file://00-create-volatile.conf \ 35 file://00-create-volatile.conf \
37 file://init \ 36 file://init \
38 file://run-ptest \ 37 file://run-ptest \
39 file://systemd-older-kernel.patch \
40 " 38 "
41 39
42S = "${WORKDIR}/git" 40S = "${WORKDIR}/git"
@@ -126,6 +124,9 @@ do_install() {
126 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd 124 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
127 fi 125 fi
128 126
127 # Move libgudev back to ${rootlibdir} to keep backward compatibility
128 [ ${rootlibdir} != ${exec_prefix}/lib ] && mv -t ${D}${rootlibdir} ${D}${exec_prefix}/lib/libgudev*
129
129 # Delete journal README, as log can be symlinked inside volatile. 130 # Delete journal README, as log can be symlinked inside volatile.
130 rm -f ${D}/${localstatedir}/log/README 131 rm -f ${D}/${localstatedir}/log/README
131} 132}
@@ -208,6 +209,7 @@ FILES_${PN} = " ${base_bindir}/* \
208 ${datadir}/dbus-1/system-services \ 209 ${datadir}/dbus-1/system-services \
209 ${datadir}/polkit-1 \ 210 ${datadir}/polkit-1 \
210 ${datadir}/${BPN} \ 211 ${datadir}/${BPN} \
212 ${datadir}/factory \
211 ${sysconfdir}/bash_completion.d/ \ 213 ${sysconfdir}/bash_completion.d/ \
212 ${sysconfdir}/dbus-1/ \ 214 ${sysconfdir}/dbus-1/ \
213 ${sysconfdir}/machine-id \ 215 ${sysconfdir}/machine-id \
@@ -220,7 +222,7 @@ FILES_${PN} = " ${base_bindir}/* \
220 ${rootlibexecdir}/systemd/* \ 222 ${rootlibexecdir}/systemd/* \
221 ${systemd_unitdir}/* \ 223 ${systemd_unitdir}/* \
222 ${base_libdir}/security/*.so \ 224 ${base_libdir}/security/*.so \
223 ${libdir}/libnss_myhostname.so.2 \ 225 ${exec_prefix}/lib/libnss_* \
224 /cgroup \ 226 /cgroup \
225 ${bindir}/systemd* \ 227 ${bindir}/systemd* \
226 ${bindir}/busctl \ 228 ${bindir}/busctl \
@@ -233,6 +235,7 @@ FILES_${PN} = " ${base_bindir}/* \
233 ${exec_prefix}/lib/systemd \ 235 ${exec_prefix}/lib/systemd \
234 ${exec_prefix}/lib/modules-load.d \ 236 ${exec_prefix}/lib/modules-load.d \
235 ${exec_prefix}/lib/sysctl.d \ 237 ${exec_prefix}/lib/sysctl.d \
238 ${exec_prefix}/lib/sysusers.d \
236 ${localstatedir} \ 239 ${localstatedir} \
237 /lib/udev/rules.d/70-uaccess.rules \ 240 /lib/udev/rules.d/70-uaccess.rules \
238 /lib/udev/rules.d/71-seat.rules \ 241 /lib/udev/rules.d/71-seat.rules \