From c95b18822728171c80eb1b93e0e094d6b3b686b3ab1041ea2d67a1a4cf7231ed Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 9 Dec 2020 17:11:15 +0000 Subject: [PATCH] - Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) 450792497e sd-event: fix delays assert brain-o (#17790) 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 - Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) 450792497e sd-event: fix delays assert brain-o (#17790) 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1128 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 4 ++-- systemd-v246.6+suse.45.gf6104ea5f5.tar.xz | 3 --- systemd-v246.7+suse.50.gd5e7958d35.tar.xz | 3 +++ systemd.changes | 12 ++++++++++++ systemd.spec | 4 ++-- 6 files changed, 31 insertions(+), 7 deletions(-) delete mode 100644 systemd-v246.6+suse.45.gf6104ea5f5.tar.xz create mode 100644 systemd-v246.7+suse.50.gd5e7958d35.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 47b80da..9ffd13a 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Dec 9 16:08:26 UTC 2020 - Franck Bui + +- Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) + + 450792497e sd-event: fix delays assert brain-o (#17790) + 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' + a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 + ------------------------------------------------------------------- Tue Dec 1 09:42:11 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 7489539..742760c 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.45.gf6104ea5f5 +%define suse_version +suse.50.gd5e7958d35 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.6 +Version: 246.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later diff --git a/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz b/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz deleted file mode 100644 index 15741d2..0000000 --- a/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3d33530b2e48912244b0848b179234ff46cb15c57508d5b0910ab3d668dc29b -size 6554804 diff --git a/systemd-v246.7+suse.50.gd5e7958d35.tar.xz b/systemd-v246.7+suse.50.gd5e7958d35.tar.xz new file mode 100644 index 0000000..db7bf6c --- /dev/null +++ b/systemd-v246.7+suse.50.gd5e7958d35.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3c1a83d6d456c3d2f14d2942a3b85b6044ae52c5385cfb4074c23ec8bdebab6 +size 6564004 diff --git a/systemd.changes b/systemd.changes index 47b80da..9ffd13a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Dec 9 16:08:26 UTC 2020 - Franck Bui + +- Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) + + 450792497e sd-event: fix delays assert brain-o (#17790) + 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' + a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 + ------------------------------------------------------------------- Tue Dec 1 09:42:11 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3de69d3..00a4afd 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.45.gf6104ea5f5 +%define suse_version +suse.50.gd5e7958d35 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.6 +Version: 246.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later