From acfe5cbc537d14eb202de387cf2438751abd2505b66a7978ed8214d175c4a165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Thu, 5 Apr 2018 07:13:09 +0000 Subject: [PATCH] Adjust patch headers to match openSUSE guidelines. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=96 --- ...s-Add-option-to-fall-back-to-KEXEC_LOAD.patch | 11 +++++------ ...h => kexec-tools-Add-option-to-revert-s.patch | 9 ++++----- ...-tools-Do-not-special-case-the-s-option.patch | 9 ++++----- ...ument-s-c-and-a-options-in-the-man-page.patch | 9 ++++----- ...x-option-checks-to-take-KEXEC_FILE_LOAD.patch | 10 ++++------ ...-Return-ENOSYS-when-kexec-does-not-know.patch | 8 ++++---- ...-ppc64-leverage-kexec_file_load-support.patch | 6 ++++-- kexec-tools.changes | 16 ++++++++-------- kexec-tools.spec | 14 +++++++------- 9 files changed, 44 insertions(+), 48 deletions(-) rename kexec-Add-option-to-fall-back-to-KEXEC_LOAD-when-KEX.patch => kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch (92%) rename kexec-Add-option-to-revert-s.patch => kexec-tools-Add-option-to-revert-s.patch (85%) rename kexec-Do-not-special-case-the-s-option.patch => kexec-tools-Do-not-special-case-the-s-option.patch (83%) rename kexec-Document-s-c-and-a-options-in-the-man-page.patch => kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch (77%) rename kexec-Fix-option-checks-to-take-KEXEC_FILE_LOAD-into.patch => kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch (76%) rename kexec-Return-ENOSYS-when-kexec-does-not-know-how-to-.patch => kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch (74%) rename kexec-ppc64-leverage-kexec_file_load-support.patch => kexec-tools-ppc64-leverage-kexec_file_load-support.patch (96%) diff --git a/kexec-Add-option-to-fall-back-to-KEXEC_LOAD-when-KEX.patch b/kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch similarity index 92% rename from kexec-Add-option-to-fall-back-to-KEXEC_LOAD-when-KEX.patch rename to kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch index 84e2b77..a7950fb 100644 --- a/kexec-Add-option-to-fall-back-to-KEXEC_LOAD-when-KEX.patch +++ b/kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch @@ -1,11 +1,10 @@ -From 9fa99c42cb911727a962b358c5b1d36d0fe338ab Mon Sep 17 00:00:00 2001 -Message-Id: <9fa99c42cb911727a962b358c5b1d36d0fe338ab.1522755494.git.msuchanek@suse.de> -In-Reply-To: -References: From: Michal Suchanek Date: Mon, 26 Feb 2018 12:24:44 +0100 -Subject: [PATCH v6 5/6] kexec: Add option to fall back to KEXEC_LOAD when - KEXEC_FILE_LOAD is not supported +Subject: kexec: Add option to fall back to KEXEC_LOAD when KEXEC_FILE_LOAD + is not supported +References: bsc#1080916, boo#1076839 +Upstream: merged +Git-commit: 9fa99c42cb911727a962b358c5b1d36d0fe338ab Not all architectures implement KEXEC_FILE_LOAD. However, on some archiectures KEXEC_FILE_LOAD is required when secure boot is enabled in diff --git a/kexec-Add-option-to-revert-s.patch b/kexec-tools-Add-option-to-revert-s.patch similarity index 85% rename from kexec-Add-option-to-revert-s.patch rename to kexec-tools-Add-option-to-revert-s.patch index 5c31a86..c5f509c 100644 --- a/kexec-Add-option-to-revert-s.patch +++ b/kexec-tools-Add-option-to-revert-s.patch @@ -1,10 +1,9 @@ -From a8639a304b7b62384fc1c747c35eee7728ce583f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: From: Michal Suchanek Date: Mon, 26 Feb 2018 12:24:44 +0100 -Subject: [PATCH v6 4/6] kexec: Add option to revert -s +Subject: kexec: Add option to revert -s +References: bsc#1080916, boo#1076839 +Upstream: merged +Git-commit: a8639a304b7b62384fc1c747c35eee7728ce583f The undocumented -s option selects KEXEC_FILE_LOAD syscall but there is no option to select KEXEC_LOAD syscall. Add it so -s can be reverted. diff --git a/kexec-Do-not-special-case-the-s-option.patch b/kexec-tools-Do-not-special-case-the-s-option.patch similarity index 83% rename from kexec-Do-not-special-case-the-s-option.patch rename to kexec-tools-Do-not-special-case-the-s-option.patch index f516e1e..7c6f070 100644 --- a/kexec-Do-not-special-case-the-s-option.patch +++ b/kexec-tools-Do-not-special-case-the-s-option.patch @@ -1,10 +1,9 @@ -From 1ce7ef9717b1e1a721a1012d1de1ed2b4eae9485 Mon Sep 17 00:00:00 2001 -Message-Id: <1ce7ef9717b1e1a721a1012d1de1ed2b4eae9485.1522755494.git.msuchanek@suse.de> -In-Reply-To: -References: From: Michal Suchanek Date: Mon, 26 Feb 2018 12:17:01 +0100 -Subject: [PATCH v6 3/6] kexec: Do not special-case the -s option +Subject: kexec: Do not special-case the -s option +References: bsc#1080916, boo#1076839 +Upstream: merged +Git-commit: 1ce7ef9717b1e1a721a1012d1de1ed2b4eae9485 It is parsed separately to save a few CPU cycles when setting up other options but it just complicates the code. So fold it back and set up all diff --git a/kexec-Document-s-c-and-a-options-in-the-man-page.patch b/kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch similarity index 77% rename from kexec-Document-s-c-and-a-options-in-the-man-page.patch rename to kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch index dabb40c..5f95588 100644 --- a/kexec-Document-s-c-and-a-options-in-the-man-page.patch +++ b/kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch @@ -1,10 +1,9 @@ -From 1ded8729a29ff36880fc5169e93361971f4cab35 Mon Sep 17 00:00:00 2001 -Message-Id: <1ded8729a29ff36880fc5169e93361971f4cab35.1522755494.git.msuchanek@suse.de> -In-Reply-To: -References: From: Michal Suchanek Date: Mon, 26 Feb 2018 12:51:21 +0100 -Subject: [PATCH v6 6/6] kexec: Document -s, -c and -a options in the man page +Subject: kexec: Document -s, -c and -a options in the man page +References: bsc#1080916, boo#1076839 +Upstream: merged +Git-commit: 1ded8729a29ff36880fc5169e93361971f4cab35 Signed-off-by: Michal Suchanek --- diff --git a/kexec-Fix-option-checks-to-take-KEXEC_FILE_LOAD-into.patch b/kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch similarity index 76% rename from kexec-Fix-option-checks-to-take-KEXEC_FILE_LOAD-into.patch rename to kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch index 78d6ef3..3e378be 100644 --- a/kexec-Fix-option-checks-to-take-KEXEC_FILE_LOAD-into.patch +++ b/kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch @@ -1,11 +1,9 @@ -From bf36a4623b5ef67b3ae9722972fc135c608df963 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: From: Michal Suchanek Date: Fri, 16 Mar 2018 16:40:27 +0100 -Subject: [PATCH v6 2/6] kexec: Fix option checks to take KEXEC_FILE_LOAD into - account +Subject: kexec: Fix option checks to take KEXEC_FILE_LOAD into account +References: bsc#1080916, boo#1076839 +Upstream: merged +Git-commit: bf36a4623b5ef67b3ae9722972fc135c608df963 When kexec_file_load support was added some sanity checks were not updated. diff --git a/kexec-Return-ENOSYS-when-kexec-does-not-know-how-to-.patch b/kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch similarity index 74% rename from kexec-Return-ENOSYS-when-kexec-does-not-know-how-to-.patch rename to kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch index e25caba..6aa2ac7 100644 --- a/kexec-Return-ENOSYS-when-kexec-does-not-know-how-to-.patch +++ b/kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch @@ -1,9 +1,9 @@ -From e810acd57d9fc2d7ba3b0e95d470c20de9948462 Mon Sep 17 00:00:00 2001 -Message-Id: From: Michal Suchanek Date: Mon, 26 Feb 2018 12:12:38 +0100 -Subject: [PATCH v6 1/6] kexec: Return -ENOSYS when kexec does not know how to - call KEXEC_FILE_LOAD +Subject: kexec: Return -ENOSYS when kexec does not know how to call KEXEC_FILE_LOAD +References: bsc#1080916, boo#1076839 +Upstream: merged +Git-commit: e810acd57d9fc2d7ba3b0e95d470c20de9948462 When the kernel does not know a syscall number it returns -ENOSYS but when kexec does not know a syscall number it returns -1. Return -ENOSYS diff --git a/kexec-ppc64-leverage-kexec_file_load-support.patch b/kexec-tools-ppc64-leverage-kexec_file_load-support.patch similarity index 96% rename from kexec-ppc64-leverage-kexec_file_load-support.patch rename to kexec-tools-ppc64-leverage-kexec_file_load-support.patch index b685065..6e9484e 100644 --- a/kexec-ppc64-leverage-kexec_file_load-support.patch +++ b/kexec-tools-ppc64-leverage-kexec_file_load-support.patch @@ -1,7 +1,9 @@ -From 3720b743ae3ced0407e811a4223228d305dc4705 Mon Sep 17 00:00:00 2001 From: Hari Bathini Date: Mon, 26 Mar 2018 14:16:34 +0530 -Subject: [PATCH] kexec/ppc64: leverage kexec_file_load support +Subject: kexec/ppc64: leverage kexec_file_load support +References: bsc#1080916 +Upstream: merged +Git-commit: 3720b743ae3ced0407e811a4223228d305dc4705 PPC64 kernel now supports kexec_file_load system call. Leverage it by enabling that support here. Note that loading crash kernel with this diff --git a/kexec-tools.changes b/kexec-tools.changes index 0007f1f..14c111f 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -3,14 +3,14 @@ Tue Apr 3 11:43:18 UTC 2018 - msuchanek@suse.com - kexec: add -a option to fall back to KEXEC_LOAD when KEXEC_FILE_LOAD is not supported (bsc#1080916, boo#1076839). - * kexec-Return-ENOSYS-when-kexec-does-not-know-how-to-.patch - * kexec-Fix-option-checks-to-take-KEXEC_FILE_LOAD-into.patch - * kexec-Do-not-special-case-the-s-option.patch - * kexec-Add-option-to-revert-s.patch - * kexec-Add-option-to-fall-back-to-KEXEC_LOAD-when-KEX.patch - * kexec-Document-s-c-and-a-options-in-the-man-page.patch -- kexec/ppc64: leverage kexec_file_load support (bsc#1080916) - * kexec-ppc64-leverage-kexec_file_load-support.patch + * kexec-tools-Return-ENOSYS-when-kexec-does-not-know.patch + * kexec-tools-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch + * kexec-tools-Do-not-special-case-the-s-option.patch + * kexec-tools-Add-option-to-revert-s.patch + * kexec-tools-Add-option-to-fall-back-to-KEXEC_LOAD.patch + * kexec-tools-Document-s-c-and-a-options-in-the-man-page.patch +- kexec-tools-ppc64-leverage-kexec_file_load-support.patch: kexec/ppc64: + leverage kexec_file_load support (bsc#1080916). ------------------------------------------------------------------- Fri Feb 23 07:38:55 UTC 2018 - ptesarik@suse.com diff --git a/kexec-tools.spec b/kexec-tools.spec index 9cfc6b2..b2aa848 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -33,13 +33,13 @@ Patch2: %{name}-xen-balloon-up.patch Patch3: %{name}-disable-test.patch Patch4: %{name}-add-a-helper-function-to-add-ranges.patch Patch5: %{name}-ppc64-parse-ibm-dynamic-memory.patch -Patch6: kexec-ppc64-leverage-kexec_file_load-support.patch -Patch7: kexec-Return-ENOSYS-when-kexec-does-not-know-how-to-.patch -Patch8: kexec-Fix-option-checks-to-take-KEXEC_FILE_LOAD-into.patch -Patch9: kexec-Do-not-special-case-the-s-option.patch -Patch10: kexec-Add-option-to-revert-s.patch -Patch11: kexec-Add-option-to-fall-back-to-KEXEC_LOAD-when-KEX.patch -Patch12: kexec-Document-s-c-and-a-options-in-the-man-page.patch +Patch6: %{name}-ppc64-leverage-kexec_file_load-support.patch +Patch7: %{name}-Return-ENOSYS-when-kexec-does-not-know.patch +Patch8: %{name}-Fix-option-checks-to-take-KEXEC_FILE_LOAD.patch +Patch9: %{name}-Do-not-special-case-the-s-option.patch +Patch10: %{name}-Add-option-to-revert-s.patch +Patch11: %{name}-Add-option-to-fall-back-to-KEXEC_LOAD.patch +Patch12: %{name}-Document-s-c-and-a-options-in-the-man-page.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: systemd-rpm-macros