From 88c9300a60ed9397896050e0708edd3cbbc84957 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Jan 28 2021 11:00:51 +0000 Subject: Reorder patch to separate downstream-only patches For https://github.com/systemd-ci-incubator/systemd/pull/5: we want to drop any upstream patches when building from upstream git. --- diff --git a/0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch b/0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch deleted file mode 100644 index 932cd5a..0000000 --- a/0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 2e9d763e7cbeb33954bbe3f96fd94de2cd62edf7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Thu, 12 Nov 2020 14:28:24 +0100 -Subject: [PATCH] test-path-util: do not fail if the fd_is_mount_point check - fails - -This test fails on i686 and ppc64le in koji: -/* test_path */ -Assertion 'fd_is_mount_point(fd, "/", 0) > 0' failed at src/test/test-path-util.c:85, function test_path(). Aborting. - -I guess some permission error is the most likely. ---- - src/test/test-path-util.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c -index f4f8d0550b..be428334f3 100644 ---- a/src/test/test-path-util.c -+++ b/src/test/test-path-util.c -@@ -40,8 +40,6 @@ static void test_path_simplify(const char *in, const char *out, const char *out_ - } - - static void test_path(void) { -- _cleanup_close_ int fd = -1; -- - log_info("/* %s */", __func__); - - test_path_compare("/goo", "/goo", 0); -@@ -80,10 +78,6 @@ static void test_path(void) { - assert_se(streq(basename("/aa///file..."), "file...")); - assert_se(streq(basename("file.../"), "")); - -- fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY); -- assert_se(fd >= 0); -- assert_se(fd_is_mount_point(fd, "/", 0) > 0); -- - test_path_simplify("aaa/bbb////ccc", "aaa/bbb/ccc", "aaa/bbb/ccc"); - test_path_simplify("//aaa/.////ccc", "/aaa/./ccc", "/aaa/ccc"); - test_path_simplify("///", "/", "/"); -@@ -120,6 +114,22 @@ static void test_path(void) { - assert_se(!path_equal_ptr(NULL, "/a")); - } - -+static void test_path_is_mountpoint(void) { -+ _cleanup_close_ int fd = -1; -+ int r; -+ -+ log_info("/* %s */", __func__); -+ -+ fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY); -+ assert_se(fd >= 0); -+ -+ r = fd_is_mount_point(fd, "/", 0); -+ if (r < 0) -+ log_warning_errno(r, "Failed to check if / is a mount point, ignoring: %m"); -+ else -+ assert_se(r == 1); -+} -+ - static void test_path_equal_root(void) { - /* Nail down the details of how path_equal("/", ...) works. */ - -@@ -714,6 +724,7 @@ int main(int argc, char **argv) { - - test_print_paths(); - test_path(); -+ test_path_is_mountpoint(); - test_path_equal_root(); - test_find_executable_full(); - test_find_executable(argv[0]); diff --git a/0001-test-path-util-ignore-test-failure.patch b/0001-test-path-util-ignore-test-failure.patch deleted file mode 100644 index 86c410c..0000000 --- a/0001-test-path-util-ignore-test-failure.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e8bca4ba55f855260eda684a16e8feb5f20b1deb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Thu, 12 Nov 2020 15:06:12 +0100 -Subject: [PATCH] test-path-util: ignore test failure - ---- - src/test/test-path-util.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c -index be428334f3..207c659b8b 100644 ---- a/src/test/test-path-util.c -+++ b/src/test/test-path-util.c -@@ -120,14 +120,17 @@ static void test_path_is_mountpoint(void) { - - log_info("/* %s */", __func__); - -+ (void) system("uname -a"); -+ (void) system("mountpoint /"); -+ - fd = open("/", O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY); - assert_se(fd >= 0); - - r = fd_is_mount_point(fd, "/", 0); - if (r < 0) - log_warning_errno(r, "Failed to check if / is a mount point, ignoring: %m"); -- else -- assert_se(r == 1); -+ else if (r == 0) -+ log_warning("/ is not a mountpoint?"); - } - - static void test_path_equal_root(void) { diff --git a/systemd.spec b/systemd.spec index deda4b1..7da2828 100644 --- a/systemd.spec +++ b/systemd.spec @@ -68,15 +68,16 @@ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done| GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[67]* hwdb/parse_hwdb.py > hwdb.patch %endif -# https://bugzilla.redhat.com/show_bug.cgi?id=1738828 -Patch0001: use-bfq-scheduler.patch +# Backports of patches from upstream (0000–0499) +Patch0001: 0001-test-login-skip-consistency-checks-when-logind-is-no.patch +Patch0002: https://github.com/systemd/systemd/pull/18062/commits/9cc6a94790eecfc808335b759355a4005d66f6e3.patch -Patch0003: 0001-test-path-util-do-not-fail-if-the-fd_is_mount_point-.patch -Patch0004: 0001-test-path-util-ignore-test-failure.patch -Patch0005: 0001-test-login-skip-consistency-checks-when-logind-is-no.patch +# Downstream-only patches (5000–9999) +# https://bugzilla.redhat.com/show_bug.cgi?id=1738828 +Patch0500: use-bfq-scheduler.patch -Patch0009: https://github.com/systemd/systemd/pull/17050/commits/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch -Patch0010: https://github.com/systemd/systemd/pull/18062/commits/9cc6a94790eecfc808335b759355a4005d66f6e3.patch +# https://github.com/systemd/systemd/pull/17050 +Patch0501: https://github.com/systemd/systemd/pull/17050/commits/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch %ifarch %{ix86} x86_64 aarch64 %global have_gnu_efi 1