@@ -1,4 +1,4 @@
-From d48ec5e1a5fb7907520dee71b1d94045486a0c29 Mon Sep 17 00:00:00 2001
+From e01eed76362c2dc0a36042ac04114f7aa4d99784 Mon Sep 17 00:00:00 2001
From: Alexander Kamensky <alexander.kamensky42@gmail.com>
Date: Thu, 12 Nov 2020 12:56:46 -0800
Subject: [PATCH] arm64: kexec: disabled check if kaslr-seed dtb property was
@@ -34,7 +34,7 @@ Upstream-Status: Submitted [http://lists.infradead.org/pipermail/kexec/2020-Nove
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
-index ec6df4b..10238d9 100644
+index 55e822b..ca71c09 100644
--- a/kexec/arch/arm64/kexec-arm64.c
+++ b/kexec/arch/arm64/kexec-arm64.c
@@ -503,7 +503,7 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
@@ -65,6 +65,3 @@ index ec6df4b..10238d9 100644
/*
* Invoke the getrandom system call with
* GRND_NONBLOCK, to make sure we
-2.25.1
-
@@ -1,4 +1,4 @@
-From 211cae4b6a02a4d9d37bfcd76f3702696e095fc3 Mon Sep 17 00:00:00 2001
+From 0dab260f988c512eac48a9a7289953493b7e2c0a Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Tue, 16 Jun 2015 12:59:57 +0800
Subject: [PATCH] powerpc: change the memory size limit
deleted file mode 100644
@@ -1,54 +0,0 @@
-From 32c8ffa7ace6f1b7e63f9ddffab00b00c36a7b57 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 May 2024 21:18:08 -0700
-Subject: [PATCH] x86-linux-setup.c: Use POSIX basename API
-
-Musl C library only supports POSIX basename function. while glibc has
-both GNU extention as well as POSIX basename implemented. Switch to
-using posix version, so it can work across musl and glibc
-
-basename prototype has been removed from string.h from latest musl [1]
-compilers e.g. clang-18/GCC-14 flags the absense of prototype as error.
-therefore include libgen.h for providing it.
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://lists.infradead.org/pipermail/kexec/2024-May/030034.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- kexec/arch/i386/x86-linux-setup.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
-index 9a281dc..73251b9 100644
---- a/kexec/arch/i386/x86-linux-setup.c
-+++ b/kexec/arch/i386/x86-linux-setup.c
-@@ -14,6 +14,7 @@
- *
- */
- #define _GNU_SOURCE
-+#include <libgen.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <string.h>
-@@ -329,12 +330,14 @@ static int add_edd_entry(struct x86_linux_param_header *real_mode,
- memset(edd_info, 0, sizeof(struct edd_info));
-
- /* extract the device number */
-- if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) {
-+ char* sysfs_name_copy = strdup(sysfs_name);
-+ if (sscanf(basename(sysfs_name_copy), "int13_dev%hhx", &devnum) != 1) {
- fprintf(stderr, "Invalid format of int13_dev dir "
-- "entry: %s\n", basename(sysfs_name));
-+ "entry: %s\n", basename(sysfs_name_copy));
-+ free(sysfs_name_copy);
- return -1;
- }
--
-+ free(sysfs_name_copy);
- /* if there's a MBR signature, then add it */
- if (file_scanf(sysfs_name, "mbr_signature", "0x%x", &mbr_sig) == 1) {
- real_mode->edd_mbr_sig_buffer[*current_mbr] = mbr_sig;
-2.45.1
-
@@ -1,4 +1,4 @@
-From e5bc9fbd6029057a4e3815a5326af5bd83a450e6 Mon Sep 17 00:00:00 2001
+From 2762b56d5e3e8c614318853b979a39437379c79b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 7 Sep 2015 07:59:45 +0000
Subject: [PATCH] purgatory: Pass -r directly to linker
@@ -10,7 +10,6 @@ unfiltered
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-
---
purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
deleted file mode 100644
@@ -1,50 +0,0 @@
-From b62c1da8f8e641397add10367ee9c4cfdedb1cc0 Mon Sep 17 00:00:00 2001
-From: Haiqing Bai <Haiqing.Bai@windriver.com>
-Date: Mon, 9 Jan 2017 15:26:29 +0800
-Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue
-
-When "CONFIG_ARM_LPAE" is enabled,3 level page table
-is used by MMU, the "SECTION_SIZE" is defined with
-(1 << 21), but 'add_buffer_phys_virt()' hardcode this
-to (1 << 20).
-
-Upstream-Status: Submitted [via email to horms@kernel.org,http://lists.infradead.org/pipermail/kexec/2024-April/029903.html]
-
-Suggested-By:fredrik.markstrom@gmail.com
-Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
-
----
- kexec/arch/arm/crashdump-arm.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c
-index 1ec1826..cc20f63 100644
---- a/kexec/arch/arm/crashdump-arm.c
-+++ b/kexec/arch/arm/crashdump-arm.c
-@@ -242,6 +242,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
- void *buf;
- int err;
- int last_ranges;
-+ unsigned short align_bit_shift = 20;
-
- /*
- * First fetch all the memory (RAM) ranges that we are going to pass to
-@@ -283,6 +284,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
-
- /* for support LPAE enabled kernel*/
- elf_info.class = ELFCLASS64;
-+ align_bit_shift = 21;
-
- err = crash_create_elf64_headers(info, &elf_info,
- usablemem_rgns.ranges,
-@@ -304,8 +306,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)
- * 1MB) so that available memory passed in kernel command line will be
- * aligned to 1MB. This is because kernel create_mapping() wants memory
- * regions to be aligned to SECTION_SIZE.
-+ * The SECTION_SIZE of LPAE kernel is '1UL << 21' defined in pgtable-3level.h
- */
-- elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20,
-+ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << align_bit_shift,
- crash_kernel_mem.start,
- crash_kernel_mem.end, -1, 0);
-
@@ -1,4 +1,4 @@
-From 494888bcc3bbf070dfce1b2686ee34c8619aa33d Mon Sep 17 00:00:00 2001
+From f04338b348c9246c20aa65049b189db3189550a4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 10 Jun 2017 11:18:49 -0700
Subject: [PATCH] Disable PIE during link
@@ -9,7 +9,6 @@ just need to match it with linker flags
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
purgatory/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
deleted file mode 100644
@@ -1,95 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Michel Lind <salimma@fedoraproject.org>
-Date: Tue, 30 Jan 2024 04:14:31 -0600
-Subject: [PATCH] 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>
-
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?h=main&id=328de8e00e298f00d7ba6b25dc3950147e9642e6]
-Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
----
- 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.39.2
-
similarity index 31%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb
@@ -1,11 +1,152 @@
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- COPYING
+# +++ COPYING
+# @@ -1,13 +1,12 @@
+# -
+# - GNU GENERAL PUBLIC LICENSE
+# - Version 2, June 1991
+# -
+# - Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+# - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# + GNU GENERAL PUBLIC LICENSE
+# + Version 2, June 1991
+# +
+# + Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+# + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Everyone is permitted to copy and distribute verbatim copies
+# of this license document, but changing it is not allowed.
+#
+# - Preamble
+# + Preamble
+#
+# The licenses for most software are designed to take away your
+# freedom to share and change it. By contrast, the GNU General Public
+# @@ -16,7 +15,7 @@
+# General Public License applies to most of the Free Software
+# Foundation's software and to any other program whose authors commit to
+# using it. (Some other Free Software Foundation software is covered by
+# -the GNU Library General Public License instead.) You can apply it to
+# +the GNU Lesser General Public License instead.) You can apply it to
+# your programs, too.
+#
+# When we speak of free software, we are referring to freedom, not
+# @@ -56,8 +55,8 @@
+#
+# The precise terms and conditions for copying, distribution and
+# modification follow.
+# -
+# - GNU GENERAL PUBLIC LICENSE
+# +
+# + GNU GENERAL PUBLIC LICENSE
+# TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+# 0. This License applies to any program or other work which contains
+# @@ -111,7 +110,7 @@
+# License. (Exception: if the Program itself is interactive but
+# does not normally print such an announcement, your work based on
+# the Program is not required to print an announcement.)
+# -
+# +
+# These requirements apply to the modified work as a whole. If
+# identifiable sections of that work are not derived from the Program,
+# and can be reasonably considered independent and separate works in
+# @@ -169,7 +168,7 @@
+# access to copy the source code from the same place counts as
+# distribution of the source code, even though third parties are not
+# compelled to copy the source along with the object code.
+# -
+# +
+# 4. You may not copy, modify, sublicense, or distribute the Program
+# except as expressly provided under this License. Any attempt
+# otherwise to copy, modify, sublicense or distribute the Program is
+# @@ -226,7 +225,7 @@
+#
+# This section is intended to make thoroughly clear what is believed to
+# be a consequence of the rest of this License.
+# -
+# +
+# 8. If the distribution and/or use of the Program is restricted in
+# certain countries either by patents or by copyrighted interfaces, the
+# original copyright holder who places the Program under this License
+# @@ -256,7 +255,7 @@
+# of preserving the free status of all derivatives of our free software and
+# of promoting the sharing and reuse of software generally.
+#
+# - NO WARRANTY
+# + NO WARRANTY
+#
+# 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+# FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+# @@ -278,9 +277,9 @@
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
+#
+# - END OF TERMS AND CONDITIONS
+# -
+# - How to Apply These Terms to Your New Programs
+# + END OF TERMS AND CONDITIONS
+# +
+# + How to Apply These Terms to Your New Programs
+#
+# If you develop a new program, and you want it to be of the greatest
+# possible use to the public, the best way to achieve this is to make it
+# @@ -292,7 +291,7 @@
+# the "copyright" line and a pointer to where the full notice is found.
+#
+# <one line to give the program's name and a brief idea of what it does.>
+# - Copyright (C) 19yy <name of author>
+# + Copyright (C) <year> <name of author>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# @@ -304,17 +303,16 @@
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# - You should have received a copy of the GNU General Public License
+# - along with this program; if not, write to the Free Software
+# - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# -
+# + You should have received a copy of the GNU General Public License along
+# + with this program; if not, write to the Free Software Foundation, Inc.,
+# + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Also add information on how to contact you by electronic and paper mail.
+#
+# If the program is interactive, make it output a short notice like this
+# when it starts in an interactive mode:
+#
+# - Gnomovision version 69, Copyright (C) 19yy name of author
+# + Gnomovision version 69, Copyright (C) year name of author
+# Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; type `show c' for details.
+# @@ -337,5 +335,5 @@
+# This General Public License does not permit incorporating your program into
+# proprietary programs. If your program is a subroutine library, you may
+# consider it more useful to permit linking proprietary applications with the
+# -library. If this is what you want to do, use the GNU Library General
+# +library. If this is what you want to do, use the GNU Lesser General
+# Public License instead of this License.
+#
+#
+
SUMMARY = "Kexec fast reboot tools"
DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel"
HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
SECTION = "kernel/userland"
LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
- file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09 \
+ "
DEPENDS = "zlib xz"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
@@ -14,14 +155,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
file://kdump.service \
file://0001-powerpc-change-the-memory-size-limit.patch \
file://0002-purgatory-Pass-r-directly-to-linker.patch \
- file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \
file://0005-Disable-PIE-during-link.patch \
file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
- file://Fix-building-on-x86_64-with-binutils-2.41.patch \
- file://0001-x86-linux-setup.c-Use-POSIX-basename-API.patch \
"
-SRC_URI[sha256sum] = "f33d2660b3e38d25a127e87097978e0f7a9a73ab5151a29eb80974d169ff6a29"
+SRC_URI[sha256sum] = "0756dd54dab2f2a437e5d4df64b9760c3e6cf6a7d29fb296bdeeeb749f6ea28e"
inherit autotools update-rc.d systemd
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *kexec-tools* to *2.0.29* has Succeeded. Next steps: - apply the patch: git am 0001-kexec-tools-upgrade-2.0.28-2.0.29.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 0d998a9d89fdaeed629e50edd1fe29cedf3a8687 Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Thu, 1 Aug 2024 14:57:49 +0000 Subject: [PATCH] kexec-tools: upgrade 2.0.28 -> 2.0.29 --- ...bled-check-if-kaslr-seed-dtb-propert.patch | 7 +- ...powerpc-change-the-memory-size-limit.patch | 2 +- ...linux-setup.c-Use-POSIX-basename-API.patch | 54 ------- ...-purgatory-Pass-r-directly-to-linker.patch | 3 +- ...Fix-add_buffer_phys_virt-align-issue.patch | 50 ------ .../0005-Disable-PIE-during-link.patch | 3 +- ...uilding-on-x86_64-with-binutils-2.41.patch | 95 ----------- ...-tools_2.0.28.bb => kexec-tools_2.0.29.bb} | 150 +++++++++++++++++- 8 files changed, 149 insertions(+), 215 deletions(-) delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-x86-linux-setup.c-Use-POSIX-basename-API.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/Fix-building-on-x86_64-with-binutils-2.41.patch rename meta/recipes-kernel/kexec/{kexec-tools_2.0.28.bb => kexec-tools_2.0.29.bb} (31%)