diff --git a/kexec-tools-2.0.25.tar.sign b/kexec-tools-2.0.25.tar.sign deleted file mode 100644 index 0f210c7..0000000 Binary files a/kexec-tools-2.0.25.tar.sign and /dev/null differ diff --git a/kexec-tools-2.0.25.tar.xz b/kexec-tools-2.0.25.tar.xz deleted file mode 100644 index 715ea4d..0000000 --- a/kexec-tools-2.0.25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ce2e5def38ec04f79feb107d02243dd586fbc68569eccf02f44bad3a13ec07d -size 303884 diff --git a/kexec-tools-2.0.26.tar.sign b/kexec-tools-2.0.26.tar.sign new file mode 100644 index 0000000..4e9c633 Binary files /dev/null and b/kexec-tools-2.0.26.tar.sign differ diff --git a/kexec-tools-2.0.26.tar.xz b/kexec-tools-2.0.26.tar.xz new file mode 100644 index 0000000..949abda --- /dev/null +++ b/kexec-tools-2.0.26.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fe36a064101cd5c515e41b2be393dce3ca88adce59d6ee668e0af7c0c4570cd +size 306264 diff --git a/kexec-tools-riscv64.patch b/kexec-tools-riscv64.patch index e23b75c..d232420 100644 --- a/kexec-tools-riscv64.patch +++ b/kexec-tools-riscv64.patch @@ -39,8 +39,8 @@ index 51439f1..6ee6c30 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,9 @@ case $target_cpu in - hppa*) - ARCH="hppa" + loongarch*) + ARCH="loongarch" ;; + riscv32|riscv64 ) + ARCH="riscv" @@ -52,16 +52,14 @@ diff --git a/include/elf.h b/include/elf.h index b7677a2..123f167 100644 --- a/include/elf.h +++ b/include/elf.h -@@ -259,7 +259,8 @@ typedef struct +@@ -259,6 +259,7 @@ typedef struct #define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ #define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ #define EM_AARCH64 183 /* ARM AARCH64 */ --#define EM_NUM 184 +#define EM_RISCV 243 /* RISC-V */ -+#define EM_NUM 244 + #define EM_LOONGARCH 258 /* Loongson Loongarch*/ + #define EM_NUM 184 - /* If it is necessary to assign new unofficial EM_* values, please - pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the diff --git a/kexec/Makefile b/kexec/Makefile index e69e309..ca17831 100644 --- a/kexec/Makefile @@ -1471,18 +1469,19 @@ index bea29d4..2e99e2b 100644 #define KEXEC_ARCH_MIPS ( 8 << 16) #define KEXEC_ARCH_CRIS (76 << 16) +#define KEXEC_ARCH_RISCV (243 << 16) + #define KEXEC_ARCH_LOONGARCH (258 << 16) #define KEXEC_MAX_SEGMENTS 16 - -@@ -177,5 +178,8 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, +@@ -177,6 +178,9 @@ static inline long kexec_file_load(int kernel_fd, int initrd_fd, #if defined(__arm64__) #define KEXEC_ARCH_NATIVE KEXEC_ARCH_ARM64 #endif +#if defined(__riscv__) || defined(__riscv) +#define KEXEC_ARCH_NATIVE KEXEC_ARCH_RISCV +#endif - - #endif /* KEXEC_SYSCALL_H */ + #if defined(__loongarch__) + #define KEXEC_ARCH_NATIVE KEXEC_ARCH_LOONGARCH + #endif diff --git a/purgatory/Makefile b/purgatory/Makefile index 2dd6c47..0a9d1c1 100644 --- a/purgatory/Makefile diff --git a/kexec-tools.changes b/kexec-tools.changes index a156ad6..eb5e8e8 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Feb 2 13:45:39 UTC 2023 - Petr Tesařík + +- update to 2.0.26: + * m68k: pass rng seed via BI_RNG_SEED + * workflow: update to checkout@v3 + * LoongArch: Remove redundant cmdline parameters when using --reuse-cmdline option + * LoongArch: Add purgatory framework code + * LoongArch: PE format image loading support + * LoongArch: Add kexec/kdump support + * config: Add LoongArch architecture support in config.guess and config.sub files + * ppc64: remove rma_top limit +- refresh kexec-tools-riscv64.patch. + ------------------------------------------------------------------- Tue Dec 27 12:37:09 UTC 2022 - Ludwig Nussel diff --git a/kexec-tools.spec b/kexec-tools.spec index b39dc3f..28fb07d 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,7 +1,7 @@ # # spec file for package kexec-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: kexec-tools -Version: 2.0.25 +Version: 2.0.26 Release: 0 Summary: Tools for loading replacement kernels into memory License: GPL-2.0-or-later