Skip to contentSkip to conversation

package/systemd: bump version to 241

PATCH New aduskett at gmail.com 2 participants 2 messages Feb 26, 2019 – Mar 14, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/systemd: bump version to 241

From: Adam Duskett <[email protected]>

In addition:
- Remove patches that have been committed upstream.
- Update hash for the README file. (Meson and Dbus dependency version updates)

./support/testing/run-tests -d dl -o output -k tests.init.test_systemd

14:18:20 TestInitSystemSystemdRwNetworkd          Starting
14:18:21 TestInitSystemSystemdRwNetworkd          Building
14:26:20 TestInitSystemSystemdRwNetworkd          Building done
14:27:01 TestInitSystemSystemdRwNetworkd          Cleaning up
.14:27:01 TestInitSystemSystemdRwIfupdown         Starting
14:27:01 TestInitSystemSystemdRwIfupdown          Building
14:28:35 TestInitSystemSystemdRwIfupdown          Building done
14:29:03 TestInitSystemSystemdRwIfupdown          Cleaning up
.14:29:03 TestInitSystemSystemdRwFull             Starting
14:29:04 TestInitSystemSystemdRwFull              Building
14:44:35 TestInitSystemSystemdRwFull              Building done
14:45:18 TestInitSystemSystemdRwFull              Cleaning up
.14:45:18 TestInitSystemSystemdRoNetworkd         Starting
14:45:19 TestInitSystemSystemdRoNetworkd          Building
14:55:59 TestInitSystemSystemdRoNetworkd          Building done
14:56:23 TestInitSystemSystemdRoNetworkd          Cleaning up
.14:56:23 TestInitSystemSystemdRoIfupdown         Starting
14:56:24 TestInitSystemSystemdRoIfupdown          Building
15:06:42 TestInitSystemSystemdRoIfupdown          Building done
15:07:09 TestInitSystemSystemdRoIfupdown          Cleaning up
.15:07:09 TestInitSystemSystemdRoFull             Starting
15:07:10 TestInitSystemSystemdRoFull              Building
15:21:17 TestInitSystemSystemdRoFull              Building done
15:21:46 TestInitSystemSystemdRoFull              Cleaning up

.
----------------------------------------------------------------------
Ran 6 tests in 3806.472s

OK

---
Changes v1 -> v2:
- Update hash for the README file.
- Modify commit message to explain updated hash for README file.

Changes v2 -> v3:
- Remove even more patches that were added after this patch was submitted.

 ...cross-compilation-compatible-c-check.patch |  60 -----
 ...ity-fix-build-without-PR_CAP_AMBIENT.patch |  61 ------
 ...e-util.c-fix-build-without-O_TMPFILE.patch |  34 ---
 ...missing_if_link.h-add-IFLA_BOND_MODE.patch |  49 -----
 ...07-missing_syscall.h-include-errno.h.patch |  28 ---
 ...util.c-fix-build-without-F_OFD_SETLK.patch |  34 ---
 ...store-the-iovec-entry-for-process-co.patch | 205 ------------------
 ...t-a-limit-on-the-number-of-fields-1k.patch |  57 -----
 ...mote-verify-entry-length-from-header.patch | 112 ----------
 ...et-a-limit-on-the-number-of-fields-i.patch |  81 -------
 ...var-to-device_path_parse_major_minor.patch | 116 ----------
 ...c-fix-build-without-BRIDGE_VLAN_INFO.patch |  34 ---
 ...-fix-build-without-IFA_F_NOPREFIXROU.patch |  33 ---
 ....c-fix-build-without-IFA_F_NOPREFIXR.patch |  33 ---
 ...-fix-build-without-IFA_F_NOPREFIXROU.patch |  33 ---
 package/systemd/systemd.hash                  |   4 +-
 package/systemd/systemd.mk                    |   2 +-
 17 files changed, 3 insertions(+), 973 deletions(-)
 delete mode 100644 package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch
 delete mode 100644 package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch
 delete mode 100644 package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch
 delete mode 100644 package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch
 delete mode 100644 package/systemd/0007-missing_syscall.h-include-errno.h.patch
 delete mode 100644 package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch
 delete mode 100644 package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch
 delete mode 100644 package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch
 delete mode 100644 package/systemd/0011-journal-remote-verify-entry-length-from-header.patch
 delete mode 100644 package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch
 delete mode 100644 package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch
 delete mode 100644 package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch
 delete mode 100644 package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch
 delete mode 100644 package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch
 delete mode 100644 package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch
package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch deleted +0 -60
deleted file mode 100644
index 70d816fae2..0000000000
@@ -1,60 +0,0 @@
-From 180a940333c84495015bd5b24d41c1dbfff509f2 Mon Sep 17 00:00:00 2001
-From: James Hilliard <[email protected]>
-Date: Thu, 27 Dec 2018 09:16:20 +0800
-Subject: [PATCH] meson: use cross compilation compatible c++ check
-
-[james.hilliard1 at gmail.com: backport from upstream commit
-46e63a2a3ed46ce97430ce38e4cc0798c57900eb]
-Signed-off-by: James Hilliard <[email protected]>
----
- meson.build             | 4 +---
- src/systemd/meson.build | 3 +--
- src/test/meson.build    | 2 +-
- 3 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index b338886..1964b1a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -287,10 +287,8 @@ want_tests = get_option('tests')
- slow_tests = want_tests != 'false' and get_option('slow-tests')
- install_tests = get_option('install-tests')
- 
--cxx = find_program('c++', required : fuzzer_build)
--if cxx.found()
-+if add_languages('cpp', required : fuzzer_build)
-         #  Used only for tests
--        add_languages('cpp')
-         cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
- else
-         cxx_cmd = ''
-diff --git a/src/systemd/meson.build b/src/systemd/meson.build
-index e0c967e..75c48b0 100644
---- a/src/systemd/meson.build
-+++ b/src/systemd/meson.build
-@@ -52,8 +52,7 @@ if cc.has_argument('-std=iso9899:2017')
-         opts += [['c', '-std=iso9899:2017']]
- endif
- 
--cxx = find_program('c++', required : false)
--if cxx.found()
-+if add_languages('cpp', required : false)
-         opts += [['c++'],
-                  ['c++', '-std=c++98'],
-                  ['c++', '-std=c++11']]
-diff --git a/src/test/meson.build b/src/test/meson.build
-index ea049a6..d9d87e0 100644
---- a/src/test/meson.build
-+++ b/src/test/meson.build
-@@ -957,7 +957,7 @@ tests += [
- 
- ]
- 
--if cxx.found()
-+if cxx_cmd != ''
-         tests += [
-                 [['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'],
-                  [],
--- 
-2.7.4
-
package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch deleted +0 -61

61 lines not on this page · raw message

package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch deleted +0 -34
deleted file mode 100644
index 300fc544fd..0000000000
@@ -1,34 +0,0 @@
-From b1ca50178b97b3b827b0420ec7bdf9cb1d6fec56 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 11 Jan 2019 16:36:06 +0100
-Subject: [PATCH] basic/tmpfile-util.c: fix build without O_TMPFILE
-
-systemd fails to build on kernel without O_TMPFILE (< 3.11) since
-https://github.com/systemd/systemd/commit/dea72eda9cdbfeedd24cbe8c734ad0639bf96cde
-
-To fix this error, include missing_fcntl.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/systemd/systemd/pull/11400]
----
- src/basic/tmpfile-util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c
-index 669eb2666..bc92d6a6d 100644
---- a/src/basic/tmpfile-util.c
-+++ b/src/basic/tmpfile-util.c
-@@ -8,6 +8,7 @@
- #include "hexdecoct.h"
- #include "macro.h"
- #include "memfd-util.h"
-+#include "missing_fcntl.h"
- #include "missing_syscall.h"
- #include "path-util.h"
- #include "process-util.h"
--- 
-2.14.1
-
package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch deleted +0 -49

49 lines not on this page · raw message

package/systemd/0007-missing_syscall.h-include-errno.h.patch deleted +0 -28
deleted file mode 100644
index eb5d9eacb7..0000000000
@@ -1,28 +0,0 @@
-From 985d15d636b4d2c7086dbd305369c02756cdbe19 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 11 Jan 2019 17:24:21 +0100
-Subject: [PATCH] missing_syscall.h: include errno.h
-
-This include is needed for errno and ENOSYS
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/systemd/systemd/pull/11400]
----
- src/basic/missing_syscall.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
-index d5d4b26ac..d1aa32218 100644
---- a/src/basic/missing_syscall.h
-+++ b/src/basic/missing_syscall.h
-@@ -3,6 +3,7 @@
- 
- /* Missing glibc definitions to access certain kernel APIs */
- 
-+#include <errno.h>
- #include <fcntl.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
--- 
-2.14.1
-
package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch deleted +0 -34
deleted file mode 100644
index 1a1542c706..0000000000
@@ -1,34 +0,0 @@
-From badb5dafa9efc89384d9d2bea5648f7b017204d7 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 11 Jan 2019 17:30:32 +0100
-Subject: [PATCH] lockfile-util.c: fix build without F_OFD_SETLK
-
-systemd fails to build on kernel without F_OFD_SETLK since
-https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25
-
-So put include missing_fcntl.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/systemd/systemd/pull/11400]
----
- src/shared/lockfile-util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/shared/lockfile-util.c b/src/shared/lockfile-util.c
-index 4bae23b24..260c2088d 100644
---- a/src/shared/lockfile-util.c
-+++ b/src/shared/lockfile-util.c
-@@ -12,6 +12,7 @@
- #include "fs-util.h"
- #include "lockfile-util.h"
- #include "macro.h"
-+#include "missing_fcntl.h"
- #include "path-util.h"
- 
- int make_lock_file(const char *p, int operation, LockFile *ret) {
--- 
-2.14.1
-
package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch deleted +0 -205

205 lines not on this page · raw message

package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch deleted +0 -57

57 lines not on this page · raw message

package/systemd/0011-journal-remote-verify-entry-length-from-header.patch deleted +0 -112

112 lines not on this page · raw message

package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch deleted +0 -81

81 lines not on this page · raw message

package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch deleted +0 -116

116 lines not on this page · raw message

package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch deleted +0 -34
deleted file mode 100644
index 7a91aac519..0000000000
@@ -1,34 +0,0 @@
-From 7bd188b1e628d11011cc6c98456e2e4ed72c645b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 3 Feb 2019 17:32:46 +0100
-Subject: [PATCH] networkd-brvlan.c: fix build without
- BRIDGE_VLAN_INFO_RANGE_END
-
-systemd fails to build on kernel without BRIDGE_VLAN_INFO_RANGE_END
-since 9714c02
-
-So put include missing_if_bridge.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- src/network/networkd-brvlan.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
-index 8f9103f14..8377623da 100644
---- a/src/network/networkd-brvlan.c
-+++ b/src/network/networkd-brvlan.c
-@@ -9,6 +9,7 @@
- 
- #include "alloc-util.h"
- #include "conf-parser.h"
-+#include "missing_if_bridge.h"
- #include "netlink-util.h"
- #include "networkd-brvlan.h"
- #include "networkd-link.h"
--- 
-2.14.1
-
package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch deleted +0 -33
deleted file mode 100644
index 6351f05eb3..0000000000
@@ -1,33 +0,0 @@
-From d909e4af6ac61f6777d429a0c84ab5b3d1907c6d Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 3 Feb 2019 18:28:16 +0100
-Subject: [PATCH] networkd-ndisc.c: fix build without IFA_F_NOPREFIXROUTE
-
-systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
-since 9714c02
-
-So put include missing_network.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- src/network/networkd-ndisc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
-index 80bfd2cba..e5b8d1155 100644
---- a/src/network/networkd-ndisc.c
-+++ b/src/network/networkd-ndisc.c
-@@ -8,6 +8,7 @@
- 
- #include "sd-ndisc.h"
- 
-+#include "missing_network.h"
- #include "networkd-ndisc.h"
- #include "networkd-route.h"
- #include "strv.h"
--- 
-2.14.1
-
package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch deleted +0 -33
deleted file mode 100644
index 33d3328a89..0000000000
@@ -1,33 +0,0 @@
-From 081aea25022a987d349394ada2d6a959bf3ce4cd Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 3 Feb 2019 18:33:39 +0100
-Subject: [PATCH] networkd-address.c: fix build without IFA_F_NOPREFIXROUTE
-
-systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
-since 9714c02
-
-So put include missing_network.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- src/network/networkd-address.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
-index fa7f9b8d7..3cdbd9e37 100644
---- a/src/network/networkd-address.c
-+++ b/src/network/networkd-address.c
-@@ -5,6 +5,7 @@
- #include "alloc-util.h"
- #include "conf-parser.h"
- #include "firewall-util.h"
-+#include "missing_network.h"
- #include "netlink-util.h"
- #include "networkd-address.h"
- #include "networkd-manager.h"
--- 
-2.14.1
-
package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch deleted +0 -33
deleted file mode 100644
index 2b7ae1898a..0000000000
@@ -1,33 +0,0 @@
-From aeed8332afa88728ed914b2917ce758d9c2218a4 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 3 Feb 2019 18:38:10 +0100
-Subject: [PATCH] networkd-dhcp6.c: fix build without IFA_F_NOPREFIXROUTE
-
-systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
-since 9714c02
-
-So put include missing_network.h
-
-Fixes:
- - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- src/network/networkd-dhcp6.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
-index f9df26d75..c1fba03f9 100644
---- a/src/network/networkd-dhcp6.c
-+++ b/src/network/networkd-dhcp6.c
-@@ -11,6 +11,7 @@
- 
- #include "hashmap.h"
- #include "hostname-util.h"
-+#include "missing_network.h"
- #include "network-internal.h"
- #include "networkd-link.h"
- #include "networkd-manager.h"
--- 
-2.14.1
-
package/systemd/systemd.hash +2 -2
index 9c1a512ce7..c769d48959 100644
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256	8f15aec1ac926e13a21a04d0ca3fe371f7004951448142a6f8952075c5b5f0b5  	systemd-240.tar.gz
+sha256	b2561a8e1d10a2c248253f0dda31a85dd6d69f2b54177de55e02cd1d2778316e  	systemd-241.tar.gz
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	LICENSE.GPL2
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	LICENSE.LGPL2.1
-sha256	a693f8f654fdf016e2aefe6b30aa6e1211728b8269ab325408a152c6c9b6ebe8	README
+sha256	d9356b277440f21730426592c27170d034a39954ab5154dfba1cc3cbf7b22935	README
package/systemd/systemd.mk +1 -1
index 7a46a50ed3..79ab0e0556 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 240
+SYSTEMD_VERSION = 241
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
 SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/1 package/systemd: bump version to 241

Quoted 31 lines · On Tue, 26 Feb 2019 15:28:12 -0500 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

In addition:
- Remove patches that have been committed upstream.
- Update hash for the README file. (Meson and Dbus dependency version updates)

./support/testing/run-tests -d dl -o output -k tests.init.test_systemd

14:18:20 TestInitSystemSystemdRwNetworkd          Starting
14:18:21 TestInitSystemSystemdRwNetworkd          Building
14:26:20 TestInitSystemSystemdRwNetworkd          Building done
14:27:01 TestInitSystemSystemdRwNetworkd          Cleaning up
.14:27:01 TestInitSystemSystemdRwIfupdown         Starting
14:27:01 TestInitSystemSystemdRwIfupdown          Building
14:28:35 TestInitSystemSystemdRwIfupdown          Building done
14:29:03 TestInitSystemSystemdRwIfupdown          Cleaning up
.14:29:03 TestInitSystemSystemdRwFull             Starting
14:29:04 TestInitSystemSystemdRwFull              Building
14:44:35 TestInitSystemSystemdRwFull              Building done
14:45:18 TestInitSystemSystemdRwFull              Cleaning up
.14:45:18 TestInitSystemSystemdRoNetworkd         Starting
14:45:19 TestInitSystemSystemdRoNetworkd          Building
14:55:59 TestInitSystemSystemdRoNetworkd          Building done
14:56:23 TestInitSystemSystemdRoNetworkd          Cleaning up
.14:56:23 TestInitSystemSystemdRoIfupdown         Starting
14:56:24 TestInitSystemSystemdRoIfupdown          Building
15:06:42 TestInitSystemSystemdRoIfupdown          Building done
15:07:09 TestInitSystemSystemdRoIfupdown          Cleaning up
.15:07:09 TestInitSystemSystemdRoFull             Starting
15:07:10 TestInitSystemSystemdRoFull              Building
15:21:17 TestInitSystemSystemdRoFull              Building done
15:21:46 TestInitSystemSystemdRoFull              Cleaning up
Quoted 3 lines

.
----------------------------------------------------------------------
Ran 6 tests in 3806.472s

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com