* update kexec-tools to 2.0.29-2
This commit is contained in:
parent
ddf41346dc
commit
f4145843a1
@ -1,44 +1,58 @@
|
||||
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
|
||||
# Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
# Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
|
||||
|
||||
pkgname=kexec-tools
|
||||
pkgver=2.0.28
|
||||
pkgver=2.0.29
|
||||
pkgrel=2
|
||||
pkgdesc="Load another kernel from the currently executing Linux kernel"
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
url="https://kernel.org/pub/linux/utils/kernel/kexec/"
|
||||
source=("git+https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git#tag=v${pkgver}"
|
||||
'binutils-2.41.patch'
|
||||
'ppc64-elfv2.patch'
|
||||
'riscv64.patch')
|
||||
source=("git+https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git?signed#tag=v${pkgver}"
|
||||
hotfix-error_msg.patch
|
||||
hotfix-ppc32-kexec-file-syscall.patch
|
||||
hotfix-ppc32.patch
|
||||
hotfix-ppc64-elfv2.patch
|
||||
hotfix-ppc64-mem-ranges.patch
|
||||
add-riscv64-support.patch
|
||||
riscv-hotplug.patch)
|
||||
makedepends=('git')
|
||||
validpgpkeys=('E27CD9A1F5ACC2FF4BFE7285D7CF64696A374FBE') # Simon Horman <horms@debian.org>
|
||||
depends=('zlib' 'xz')
|
||||
license=('GPL-2.0-or-later')
|
||||
b2sums=('a11aaef9190cc2f4470a35085fcfc61609c356c42ded1b5269501f91bbde234401da5151f03d3fcfe9f39c8d02ff67d65549f2cdd5f2cbc551863a7d34788321'
|
||||
'57b9830fc3e522d04b8d0db091502d2b101103a68af7c3c1099ea18d8b8d8b7f4a5ccbafebda38e7c7dce43172658dff8a786a5ae4452ad40b57e0161015550e'
|
||||
'fb8fdd686271bf100994e5faee005c1253f6b4e66d15f65a8f7ad6bcfb6bbb63969ee234bb9ae30636f74e1ecc2ab6cc3a1b2f4685272f9ffd7a7a14f6fabe21'
|
||||
'd93625d1a1725e7c8029cadeb8b47a97fb334d5dd07557f8135c0d7a076a0074e1297bdcffd28426ba38b955be5c9938e664eadae7835b92f120d575beaa1cb6')
|
||||
b2sums=('e49b21dadc06cd91ec71a7c48e6a731a29560dde91f53cea615ffcfc747f443b5db3bfc2fe56050a2a604e4eb5b4f50788b8887e73d2f5c7e8c485a14c467580'
|
||||
'ed06ef6e38249105e2f6a6751edbd3975aada1563a89a55a6aa1eb0c29cccd629532f28d90726f6ed90ef3662afaf1f169ce405f01f35b313880eebf239bfdcc'
|
||||
'79d6e7e1ed8e77fd0f551daa9d01cf78e264cd36eb853e2a85821491eede1e27642f8b14927021d0c86dc38887d66d7198bc2fb15a367a313db158021d44ada1'
|
||||
'b3f4c16a04b22e909e5d68ee4e7c698f659cc44ebf4961a4c377de0f6bd0f9163352466226143068a9fff4cf07f990df393dac669bdc72f67f5602862c0294da'
|
||||
'5eabd0ed708b2c67aa4df52fd40db57edf165b88ce51b8cc753ee90763e96ae6460294f94432c3218e89f9a2ec3f1b2c5888adc2b830445329fe223b43468795'
|
||||
'91817d8c8d446186bbbf45d4117307eb134a8a3e35bd78f90e2c031b1a5769f0e8ece18a9b7b506ee0d60bf6cf9602d180ff34db0830773ccf20bb4c048284cf'
|
||||
'60f71a3da5945af3099f0359f695c7e8cb6875b10b223df32bd729d25baa7474914c9aa49c37fbc2af173ce9804696b17d3681060cba599e150b42c9daa32bbd'
|
||||
'05600e0964fa35df04f5f25aee15745bce91f5b1ad9320880bc48bf56563e512b21ceb069bc3898069602b4629cbba89e3688887fb9d39c1438c031654c8016a')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
patch -Np1 -i $srcdir/binutils-2.41.patch
|
||||
patch -Np1 -i $srcdir/ppc64-elfv2.patch
|
||||
patch -Np1 -i $srcdir/riscv64.patch
|
||||
cd "${pkgname}"
|
||||
|
||||
patch -Np1 -i ${srcdir}/hotfix-error_msg.patch
|
||||
patch -Np1 -i ${srcdir}/hotfix-ppc32-kexec-file-syscall.patch
|
||||
patch -Np1 -i ${srcdir}/hotfix-ppc32.patch
|
||||
patch -Np1 -i ${srcdir}/hotfix-ppc64-elfv2.patch
|
||||
patch -Np1 -i ${srcdir}/hotfix-ppc64-mem-ranges.patch
|
||||
|
||||
patch -Np1 -i ${srcdir}/add-riscv64-support.patch
|
||||
patch -Np1 -i ${srcdir}/riscv-hotplug.patch
|
||||
|
||||
./bootstrap
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
|
||||
cd "${pkgname}"
|
||||
./configure --prefix=/usr --sbindir=/usr/bin --without-lzma
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname
|
||||
make DESTDIR="$pkgdir" install
|
||||
cd "${pkgname}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
install -D -m644 kexec/kexec.8 "$pkgdir"/usr/share/man/man8/kexec.8
|
||||
}
|
||||
|
||||
|
||||
@ -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: 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 5167944d..12e11649 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 c051aab0..eace0958 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 f7a494f1..8ce9e316 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 201bb2cb..a212eed4 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
|
||||
--
|
||||
cgit 1.2.3-korg
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Use ELFv2 ABI for big endian.
|
||||
|
||||
--- a/purgatory/arch/ppc64/Makefile
|
||||
+++ b/purgatory/arch/ppc64/Makefile
|
||||
@@ -14,8 +14,8 @@ ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float \
|
||||
ppc64_PURGATORY_EXTRA_ASFLAGS += -m64
|
||||
ifeq ($(SUBARCH),BE)
|
||||
ppc64_PURGATORY_EXTRA_LDFLAGS += -melf64ppc
|
||||
- ppc64_PURGATORY_EXTRA_CFLAGS += -mcall-aixdesc
|
||||
- ppc64_PURGATORY_EXTRA_ASFLAGS += -mcall-aixdesc
|
||||
+ ppc64_PURGATORY_EXTRA_CFLAGS += -mabi=elfv2
|
||||
+ ppc64_PURGATORY_EXTRA_ASFLAGS += -mabi=elfv2
|
||||
else
|
||||
ppc64_PURGATORY_EXTRA_LDFLAGS += -melf64lppc
|
||||
ppc64_PURGATORY_EXTRA_CFLAGS += -mlittle-endian
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user