From a205ad69a93761370a89f9533883be60e52fa9e282d0713852a19914363aa03d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 20 Aug 2020 12:11:43 +0000 Subject: [PATCH] - Import commit 6d6d92930acad63f9b9029c305a672c32c550d2d (include merge of v245.7) 797ad47d3e vconsole-setup: downgrade log message when setting font fails on dummy console (bsc#1172195 bsc#1173539) [...] For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/b12cd8b89b4bccfcf972b47153a2b01cd7775932...6d6d92930acad63f9b9029c305a672c32c550d2d - Drop 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch Upstream finally reverted it and it's part of both v245.7 and master. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1108 --- ...-mark-as-redundant-if-deps-are-relev.patch | 155 ------------------ systemd-mini.changes | 17 +- systemd-mini.spec | 5 +- systemd-v245.6+suse.48.gb12cd8b89b.tar.xz | 3 - systemd-v245.7+suse.49.g6d6d92930a.tar.xz | 3 + systemd.changes | 15 ++ systemd.spec | 5 +- 7 files changed, 38 insertions(+), 165 deletions(-) delete mode 100644 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch delete mode 100644 systemd-v245.6+suse.48.gb12cd8b89b.tar.xz create mode 100644 systemd-v245.7+suse.49.g6d6d92930a.tar.xz diff --git a/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch b/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch deleted file mode 100644 index 8208646..0000000 --- a/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +++ /dev/null @@ -1,155 +0,0 @@ -From a9906d1f4aeeaa39a2d57563d23cb7cdd9283bf8 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Wed, 18 Mar 2020 16:18:46 +0100 -Subject: [PATCH 1/1] Revert "job: Don't mark as redundant if deps are - relevant" - -This reverts commit 097537f07a2fab3cb73aef7bc59f2a66aa93f533, which involves a -significant behavior change which at least impacts plymouth [1] and some of the -services shipped by systemd (systemd-vconsole-setup.service). - -Of course some other units shipped by other packages might rely on the old -behavior [2], which makes me wonder why this patch wasn't simply reverted until -the situation gets clarified, at least that what the author of the change -thinks too [3]. - -[1] https://bugzilla.redhat.com/show_bug.cgi?id=1807771 -[2] https://github.com/systemd/systemd/issues/15091#issuecomment-598238061 -[3] https://github.com/systemd/systemd/pull/14086#issuecomment-598600479 ---- - src/core/job.c | 51 +++++++------------------------------------------- - src/core/job.h | 3 +-- - src/core/transaction.c | 8 ++++---- - 3 files changed, 12 insertions(+), 50 deletions(-) - -diff --git a/src/core/job.c b/src/core/job.c -index 9fe30359df..8610496109 100644 ---- a/src/core/job.c -+++ b/src/core/job.c -@@ -383,62 +383,25 @@ JobType job_type_lookup_merge(JobType a, JobType b) { - return job_merging_table[(a - 1) * a / 2 + b]; - } - --bool job_later_link_matters(Job *j, JobType type, unsigned generation) { -- JobDependency *l; -- -- assert(j); -- -- j->generation = generation; -- -- LIST_FOREACH(subject, l, j->subject_list) { -- UnitActiveState state = _UNIT_ACTIVE_STATE_INVALID; -- -- /* Have we seen this before? */ -- if (l->object->generation == generation) -- continue; -- -- state = unit_active_state(l->object->unit); -- switch (type) { -- -- case JOB_START: -- return IN_SET(state, UNIT_INACTIVE, UNIT_FAILED) || -- job_later_link_matters(l->object, type, generation); -- -- case JOB_STOP: -- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING) || -- job_later_link_matters(l->object, type, generation); -- -- default: -- assert_not_reached("Invalid job type"); -- } -- } -- -- return false; --} -- --bool job_is_redundant(Job *j, unsigned generation) { -- -- assert(j); -- -- UnitActiveState state = unit_active_state(j->unit); -- switch (j->type) { -+bool job_type_is_redundant(JobType a, UnitActiveState b) { -+ switch (a) { - - case JOB_START: -- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING) && !job_later_link_matters(j, JOB_START, generation); -+ return IN_SET(b, UNIT_ACTIVE, UNIT_RELOADING); - - case JOB_STOP: -- return IN_SET(state, UNIT_INACTIVE, UNIT_FAILED) && !job_later_link_matters(j, JOB_STOP, generation); -+ return IN_SET(b, UNIT_INACTIVE, UNIT_FAILED); - - case JOB_VERIFY_ACTIVE: -- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING); -+ return IN_SET(b, UNIT_ACTIVE, UNIT_RELOADING); - - case JOB_RELOAD: - return -- state == UNIT_RELOADING; -+ b == UNIT_RELOADING; - - case JOB_RESTART: - return -- state == UNIT_ACTIVATING; -+ b == UNIT_ACTIVATING; - - case JOB_NOP: - return true; -diff --git a/src/core/job.h b/src/core/job.h -index 02b057ee06..03ad640618 100644 ---- a/src/core/job.h -+++ b/src/core/job.h -@@ -196,8 +196,7 @@ _pure_ static inline bool job_type_is_superset(JobType a, JobType b) { - return a == job_type_lookup_merge(a, b); - } - --bool job_later_link_matters(Job *j, JobType type, unsigned generation); --bool job_is_redundant(Job *j, unsigned generation); -+bool job_type_is_redundant(JobType a, UnitActiveState b) _pure_; - - /* Collapses a state-dependent job type into a simpler type by observing - * the state of the unit which it is going to be applied to. */ -diff --git a/src/core/transaction.c b/src/core/transaction.c -index 49f43e0327..6dc4e95beb 100644 ---- a/src/core/transaction.c -+++ b/src/core/transaction.c -@@ -279,7 +279,7 @@ static int transaction_merge_jobs(Transaction *tr, sd_bus_error *e) { - return 0; - } - --static void transaction_drop_redundant(Transaction *tr, unsigned generation) { -+static void transaction_drop_redundant(Transaction *tr) { - bool again; - - /* Goes through the transaction and removes all jobs of the units whose jobs are all noops. If not -@@ -299,7 +299,7 @@ static void transaction_drop_redundant(Transaction *tr, unsigned generation) { - - LIST_FOREACH(transaction, k, j) - if (tr->anchor_job == k || -- !job_is_redundant(k, generation) || -+ !job_type_is_redundant(k->type, unit_active_state(k->unit)) || - (k->unit->job && job_type_is_conflicting(k->type, k->unit->job->type))) { - keep = true; - break; -@@ -732,7 +732,7 @@ int transaction_activate( - transaction_minimize_impact(tr); - - /* Third step: Drop redundant jobs */ -- transaction_drop_redundant(tr, generation++); -+ transaction_drop_redundant(tr); - - for (;;) { - /* Fourth step: Let's remove unneeded jobs that might -@@ -774,7 +774,7 @@ int transaction_activate( - } - - /* Eights step: Drop redundant jobs again, if the merging now allows us to drop more. */ -- transaction_drop_redundant(tr, generation++); -+ transaction_drop_redundant(tr); - - /* Ninth step: check whether we can actually apply this */ - r = transaction_is_destructive(tr, mode, e); --- -2.16.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index c66c030..6d682aa 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,7 +1,22 @@ +------------------------------------------------------------------- +Thu Aug 20 10:24:37 UTC 2020 - Franck Bui + +- Import commit 6d6d92930acad63f9b9029c305a672c32c550d2d (include merge of v245.7) + + 797ad47d3e vconsole-setup: downgrade log message when setting font fails on dummy console (bsc#1172195 bsc#1173539) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b12cd8b89b4bccfcf972b47153a2b01cd7775932...6d6d92930acad63f9b9029c305a672c32c550d2d + +- Drop 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch + + Upstream finally reverted it and it's part of both v245.7 and master. + ------------------------------------------------------------------- Tue Jul 28 13:38:09 UTC 2020 - Richard Brown -- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) +- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) ------------------------------------------------------------------- Wed Jun 24 06:33:33 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 8c1676f..2f2981e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.48.gb12cd8b89b +%define suse_version +suse.49.g6d6d92930a %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245.6 +Version: 245.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -166,7 +166,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz b/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz deleted file mode 100644 index 5f55a69..0000000 --- a/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc34032d49edabf9df4d2342063084b79040abbebcb56fc417449d0e08f2815e -size 6175556 diff --git a/systemd-v245.7+suse.49.g6d6d92930a.tar.xz b/systemd-v245.7+suse.49.g6d6d92930a.tar.xz new file mode 100644 index 0000000..1d62bee --- /dev/null +++ b/systemd-v245.7+suse.49.g6d6d92930a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:309ed00d37594c68875d38be600ae9b51614a2958af6c5b73d0d5bad5ece96e3 +size 6302108 diff --git a/systemd.changes b/systemd.changes index c80f6f6..6d682aa 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Aug 20 10:24:37 UTC 2020 - Franck Bui + +- Import commit 6d6d92930acad63f9b9029c305a672c32c550d2d (include merge of v245.7) + + 797ad47d3e vconsole-setup: downgrade log message when setting font fails on dummy console (bsc#1172195 bsc#1173539) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b12cd8b89b4bccfcf972b47153a2b01cd7775932...6d6d92930acad63f9b9029c305a672c32c550d2d + +- Drop 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch + + Upstream finally reverted it and it's part of both v245.7 and master. + ------------------------------------------------------------------- Tue Jul 28 13:38:09 UTC 2020 - Richard Brown diff --git a/systemd.spec b/systemd.spec index 39003f7..12d8473 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.48.gb12cd8b89b +%define suse_version +suse.49.g6d6d92930a %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245.6 +Version: 245.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -164,7 +164,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB