Compare commits
15 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec2fbe250b | ||
|
|
9de58b57c9 | ||
|
|
725e6be894 | ||
|
|
58ea13cd4b |
||
|
|
4c7819a6e7 | ||
|
|
25c93a31fd | ||
|
|
e514d0f7e1 | ||
|
|
057212f0be | ||
|
|
768af19c31 | ||
|
|
cfb51fe894 | ||
|
|
bc6c854686 | ||
|
|
23e0e44579 | ||
|
|
2e200421b1 | ||
|
|
9d472a6793 | ||
|
|
542f9c90ad |
6 changed files with 63 additions and 178 deletions
20
.packit.yaml
20
.packit.yaml
|
|
@ -1,6 +1,8 @@
|
|||
# See the documentation for more information:
|
||||
# https://packit.dev/docs/configuration/
|
||||
|
||||
upstream_project_url: https://github.com/horms/kexec-tools.git
|
||||
|
||||
specfile_path: kexec-tools.spec
|
||||
|
||||
# add or remove files that should be synced
|
||||
|
|
@ -14,3 +16,21 @@ upstream_package_name: kexec-tools
|
|||
downstream_package_name: kexec-tools
|
||||
|
||||
upstream_tag_template: v{version}
|
||||
|
||||
jobs:
|
||||
- job: pull_from_upstream
|
||||
trigger: release
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
allowed_pr_authors: ["all_committers", "packit"]
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
|
||||
- job: bodhi_update
|
||||
trigger: commit
|
||||
allowed_builders: ["all_committers", "packit"]
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.89.0.
|
||||
The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32.
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001
|
||||
From: Michel Lind <salimma@fedoraproject.org>
|
||||
Date: Tue, 30 Jan 2024 04:14:31 -0600
|
||||
Subject: [PATCH 2/2] Fix building on x86_64 with binutils 2.41
|
||||
|
||||
Newer versions of the GNU assembler (observed with binutils 2.41) will
|
||||
complain about the ".arch i386" in files assembled with "as --64",
|
||||
with the message "Error: 64bit mode not supported on 'i386'".
|
||||
|
||||
Fix by moving ".arch i386" below the relevant ".code32" directive, so
|
||||
that the assembler is no longer expecting 64-bit instructions to be used
|
||||
by the time that the ".arch i386" directive is encountered.
|
||||
|
||||
Based on similar iPXE fix:
|
||||
https://github.com/ipxe/ipxe/commit/6ca597eee
|
||||
|
||||
Signed-off-by: Michel Lind <michel@michel-slm.name>
|
||||
Signed-off-by: Simon Horman <horms@kernel.org>
|
||||
---
|
||||
purgatory/arch/i386/entry32-16-debug.S | 2 +-
|
||||
purgatory/arch/i386/entry32-16.S | 2 +-
|
||||
purgatory/arch/i386/entry32.S | 2 +-
|
||||
purgatory/arch/i386/setup-x86.S | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S
|
||||
index 5167944..12e1164 100644
|
||||
--- a/purgatory/arch/i386/entry32-16-debug.S
|
||||
+++ b/purgatory/arch/i386/entry32-16-debug.S
|
||||
@@ -25,10 +25,10 @@
|
||||
.globl entry16_debug_pre32
|
||||
.globl entry16_debug_first32
|
||||
.globl entry16_debug_old_first32
|
||||
- .arch i386
|
||||
.balign 16
|
||||
entry16_debug:
|
||||
.code32
|
||||
+ .arch i386
|
||||
/* Compute where I am running at (assumes esp valid) */
|
||||
call 1f
|
||||
1: popl %ebx
|
||||
diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S
|
||||
index c051aab..eace095 100644
|
||||
--- a/purgatory/arch/i386/entry32-16.S
|
||||
+++ b/purgatory/arch/i386/entry32-16.S
|
||||
@@ -20,10 +20,10 @@
|
||||
#undef i386
|
||||
.text
|
||||
.globl entry16, entry16_regs
|
||||
- .arch i386
|
||||
.balign 16
|
||||
entry16:
|
||||
.code32
|
||||
+ .arch i386
|
||||
/* Compute where I am running at (assumes esp valid) */
|
||||
call 1f
|
||||
1: popl %ebx
|
||||
diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S
|
||||
index f7a494f..8ce9e31 100644
|
||||
--- a/purgatory/arch/i386/entry32.S
|
||||
+++ b/purgatory/arch/i386/entry32.S
|
||||
@@ -20,10 +20,10 @@
|
||||
#undef i386
|
||||
|
||||
.text
|
||||
- .arch i386
|
||||
.globl entry32, entry32_regs
|
||||
entry32:
|
||||
.code32
|
||||
+ .arch i386
|
||||
|
||||
/* Setup a gdt that should that is generally usefully */
|
||||
lgdt %cs:gdt
|
||||
diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S
|
||||
index 201bb2c..a212eed 100644
|
||||
--- a/purgatory/arch/i386/setup-x86.S
|
||||
+++ b/purgatory/arch/i386/setup-x86.S
|
||||
@@ -21,10 +21,10 @@
|
||||
#undef i386
|
||||
|
||||
.text
|
||||
- .arch i386
|
||||
.globl purgatory_start
|
||||
purgatory_start:
|
||||
.code32
|
||||
+ .arch i386
|
||||
|
||||
/* Load a gdt so I know what the segment registers are */
|
||||
lgdt %cs:gdt
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
From 94fbe64fb22d61726ca0c0996987574b6c783c19 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Bohac <jbohac@suse.cz>
|
||||
Date: Tue, 16 Jan 2024 18:14:31 +0100
|
||||
Subject: [PATCH 1/2] kexec: don't use kexec_file_load on XEN
|
||||
|
||||
Since commit 29fe5067ed07 ("kexec: make -a the default")
|
||||
kexec tries the kexec_file_load syscall first and only falls back to kexec_load on
|
||||
selected error codes.
|
||||
|
||||
This effectively breaks kexec on XEN, unless -c is pecified to force the kexec_load
|
||||
syscall.
|
||||
|
||||
The XEN-specific functions (xen_kexec_load / xen_kexec_unload) are only called
|
||||
from my_load / k_unload, i.e. the kexec_load code path.
|
||||
|
||||
With -p (panic kernel) kexec_file_load on XEN fails with -EADDRNOTAVAIL (crash
|
||||
kernel reservation is ignored by the kernel on XEN), which is not in the list
|
||||
of return codes that cause the fallback to kexec_file.
|
||||
|
||||
Without -p kexec_file_load actualy leads to a kernel oops on v6.4.0
|
||||
(needs to be dubugged separately).
|
||||
|
||||
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
|
||||
Fixes: 29fe5067ed07 ("kexec: make -a the default")
|
||||
Signed-off-by: Simon Horman <horms@kernel.org>
|
||||
---
|
||||
kexec/kexec.8 | 1 +
|
||||
kexec/kexec.c | 4 ++++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/kexec/kexec.8 b/kexec/kexec.8
|
||||
index b969cea..9e995fe 100644
|
||||
--- a/kexec/kexec.8
|
||||
+++ b/kexec/kexec.8
|
||||
@@ -162,6 +162,7 @@ Specify that the new kernel is of this
|
||||
.TP
|
||||
.BI \-s\ (\-\-kexec-file-syscall)
|
||||
Specify that the new KEXEC_FILE_LOAD syscall should be used exclusively.
|
||||
+Ignored on XEN.
|
||||
.TP
|
||||
.BI \-c\ (\-\-kexec-syscall)
|
||||
Specify that the old KEXEC_LOAD syscall should be used exclusively.
|
||||
diff --git a/kexec/kexec.c b/kexec/kexec.c
|
||||
index 08edfca..9d0ec46 100644
|
||||
--- a/kexec/kexec.c
|
||||
+++ b/kexec/kexec.c
|
||||
@@ -1685,6 +1685,10 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
}
|
||||
+ if (xen_present()) {
|
||||
+ do_kexec_file_syscall = 0;
|
||||
+ do_kexec_fallback = 0;
|
||||
+ }
|
||||
if (do_kexec_file_syscall) {
|
||||
if (do_load_jump_back_helper && !do_kexec_fallback)
|
||||
die("--load-jump-back-helper not supported with kexec_file_load\n");
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
Name: kexec-tools
|
||||
Version: 2.0.28
|
||||
Release: 12%{?dist}
|
||||
Version: 2.0.32
|
||||
Release: 1%{?dist}
|
||||
URL: https://kernel.org/pub/linux/utils/kernel/kexec
|
||||
License: GPL-2.0-only
|
||||
Summary: The kexec/kdump userspace component
|
||||
|
||||
Source0: http://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
|
||||
Source0: https://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
|
||||
Recommends: kdump-utils
|
||||
|
||||
BuildRequires: automake
|
||||
|
|
@ -14,6 +14,7 @@ BuildRequires: libtool
|
|||
BuildRequires: gcc
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libzstd-devel
|
||||
|
||||
#START INSERT
|
||||
|
||||
|
|
@ -24,9 +25,6 @@ BuildRequires: zlib-devel
|
|||
#
|
||||
# Patches 101 through 200 are meant for x86_64 kexec-tools enablement
|
||||
#
|
||||
# Fix building on x86_64 with binutils 2.41
|
||||
# Author: Michel Lind <salimma@fedoraproject.org>
|
||||
Patch101: kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch
|
||||
|
||||
#
|
||||
# Patches 301 through 400 are meant for ppc64 kexec-tools enablement
|
||||
|
|
@ -42,10 +40,7 @@ Patch101: kexec-tools-2.0.28-Fix-building-on-x86_64-with-binutils-2.41.patch
|
|||
|
||||
#
|
||||
# Patches 601 onward are generic patches
|
||||
#
|
||||
# kexec: don't use kexec_file_load on XEN
|
||||
# Author: Jiri Bohac <jbohac@suse.cz>
|
||||
Patch601: kexec-tools-2.0.28-kexec-don-t-use-kexec_file_load-on-XEN.patch
|
||||
|
||||
|
||||
%description
|
||||
kexec-tools provides /sbin/kexec binary that facilitates a new
|
||||
|
|
@ -55,16 +50,7 @@ binary and ancillary utilities that together form the userspace
|
|||
component of the kernel's kexec feature.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
mkdir -p -m755 kcp
|
||||
|
||||
%patch 101 -p1
|
||||
%patch 601 -p1
|
||||
|
||||
%ifarch ppc
|
||||
%define archdef ARCH=ppc
|
||||
%endif
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
autoreconf
|
||||
|
|
@ -78,7 +64,7 @@ autoreconf
|
|||
--build=powerpc64le-redhat-linux-gnu \
|
||||
%endif
|
||||
--sbindir=%{_sbindir}
|
||||
rm -f kexec-tools.spec.in
|
||||
|
||||
%make_build
|
||||
|
||||
%install
|
||||
|
|
@ -96,6 +82,40 @@ rm -f %{buildroot}/%{_libdir}/kexec-tools/kexec_test
|
|||
%doc TODO
|
||||
|
||||
%changelog
|
||||
* Thu Oct 16 2025 Packit <hello@packit.dev> - 2.0.32-1
|
||||
- Update to version 2.0.32
|
||||
- Resolves: rhbz#2404365
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.31-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed May 21 2025 Coiby Xu <coxu@redhat.com> - 2.0.31-2
|
||||
- Add BuildRequires libzstd-devel to support loading zstd-compressed kernel
|
||||
|
||||
* Tue Apr 22 2025 Packit <hello@packit.dev> - 2.0.31-1
|
||||
- Update to version 2.0.31
|
||||
- Resolves: rhbz#2359477
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.30-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.0.30-2
|
||||
- Rebuilt for the bin-sbin merge (2nd attempt)
|
||||
|
||||
* Mon Dec 02 2024 Packit <hello@packit.dev> - 2.0.30-1
|
||||
- Update to version 2.0.30
|
||||
- Resolves: rhbz#2326470
|
||||
|
||||
* Tue Aug 06 2024 Coiby Xu <coxu@redhat.com> - 2.0.29-1
|
||||
- Update to version 2.0.29
|
||||
- Resolves: 2297928
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.28-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jul 13 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.0.28-13
|
||||
- Rebuilt for the bin-sbin merge (again)
|
||||
|
||||
* Thu Jul 11 2024 Coiby Xu <coxu@redhat.com> - 2.0.28-12
|
||||
- Re-add missing build dependencies
|
||||
|
||||
|
|
|
|||
5
sources
5
sources
|
|
@ -1,4 +1 @@
|
|||
SHA512 (kexec-tools-2.0.28.tar.xz) = 889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753
|
||||
SHA512 (eppic-e8844d3.tar.gz) = d86b9f90c57e694107272d8f71b87f66a30743b9530480fb6f665026bbada4c6b0205a83e40b5383663a945681cfbfcf1ee79469fc219ddf679473c4b2290763
|
||||
SHA512 (makedumpfile-1.7.5.tar.gz) = 6bb84a87959d2aa530f952acacacc669e888b6a0ae5fe3c6c627647a0e2566a73f05c70ba7b2428f9c740bfe40a773792bb302039ab62c0fa646e148c69f7c6f
|
||||
SHA512 (kdump-utils-1.0.42.tar.gz) = 2d8717a010bfbffd4410ef57ade1402316cda07faa1063631b8665ac273fac618bff0afd9bdc02292c859d956790e06a51d81b141db158957ef97eb8408111c4
|
||||
SHA512 (kexec-tools-2.0.32.tar.xz) = 60f120f8e46b9fb5dcf5a5b344ee8b303878ba9f71d58a3eefa1c9f044a6a2192b285154b738970263384c6e7281a854cd48a185334c08141aa4e6cf08230654
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue