Skip to contentSkip to conversation

systemd: Update to the latest 242 branch

PATCH In review Adrian Bunk 2 participants 2 messages Aug 23, 2019

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 systemd: Update to the latest 242 branch

Remove backported patches applied upstream.

Signed-off-by Adrian Bunk <[email protected]>
---
 meta/recipes-core/systemd/systemd.inc         |  2 +-
 ...-max-sysctl-to-LONG_MAX-rather-than-.patch | 39 --------
 .../systemd/0001-networkd-fix-link-up.patch   | 66 -------------
 .../0002-network-do-not-send-ipv6.patch       | 96 -------------------
 ...remove-redunant-link-name-in-message.patch | 41 --------
 meta/recipes-core/systemd/systemd_242.bb      |  4 -
 6 files changed, 1 insertion(+), 247 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch
meta/recipes-core/systemd/systemd.inc +1 -1
index 3a353b009b..491361ccca 100644
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "db2e367bfc3b119609f837eb973d915f6c550b2f"
+SRCREV = "07f0549ffe3413f0e78b656dd34d64681cbd8f00"
 SRCBRANCH = "v242-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch deleted +0 -39
deleted file mode 100644
index ff64f58c9c..0000000000
@@ -1,39 +0,0 @@
-From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <[email protected]>
-Date: Mon, 17 Jun 2019 10:51:25 +0200
-Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than
- ULONG_MAX
-
-Since kernel 5.2 the kernel thankfully returns proper errors when we
-write a value out of range to the sysctl. Which however breaks writing
-ULONG_MAX to request the maximum value. Hence let's write the new
-maximum value instead, LONG_MAX.
-
-/cc @brauner
-
-Fixes: #12803
-
-Upstream-Status: Backport
-
-Signed-off-by: Matthias Schiffer <[email protected]>
----
- src/core/main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/main.c b/src/core/main.c
-index b33ea1b5b5..e7f51815f0 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) {
- #endif
- 
- #if BUMP_PROC_SYS_FS_FILE_MAX
--        /* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as glibc/gcc define that as
--         * "(0x7fffffffffffffffL * 2UL + 1UL)". Seriously. 😢 */
--        if (asprintf(&t, "%lu\n", ULONG_MAX) < 0) {
-+        /* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously thing where
-+         * different but the operation would fail silently.) */
-+        if (asprintf(&t, "%li\n", LONG_MAX) < 0) {
-                 log_oom();
-                 return;
-         }
meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch deleted +0 -66

66 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch deleted +0 -96

96 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-core/systemd/systemd_242.bb +0 -4
index b368ca8a2c..ceee3aa0cb 100644
@@ -22,12 +22,8 @@ SRC_URI += "file://touchscreen.rules \
            file://0003-implment-systemd-sysv-install-for-OE.patch \
            file://0004-rules-whitelist-hd-devices.patch \
            file://0005-rules-watch-metadata-changes-in-ide-devices.patch \
-           file://0006-network-remove-redunant-link-name-in-message.patch \
            file://99-default.preset \
            file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \
-           file://0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch \
-           file://0001-networkd-fix-link-up.patch \
-           file://0002-network-do-not-send-ipv6.patch \
            "
 
 # patches needed by musl
Signature · 1 line
2.17.1
#1 lore raw

✗ patchtest: failure for systemd: Update to the latest 242 branch

== Series Details ==

Series: systemd: Update to the latest 242 branch
Revision: 1
URL : https://patchwork.openembedded.org/series/19451/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series cannot be parsed correctly due to malformed diff lines [test_mbox_format]
Suggested fix Create the series again using git-format-patch and ensure it can be applied using git am
Diff line Hunk is shorter than expected

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 64f9fd2a1e)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe