Skip to contentSkip to conversation

kexec: bump to version 2.0.6

PATCH New Sven Neumann 2 participants 2 messages Apr 17, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kexec: bump to version 2.0.6

Remove two patches which have been included upstream.

---
 ...ix-build-failure-bzImage_support_efi_boot.patch | 28 ---------------
 ...e-probe-function-return-value-checking-fi.patch | 41 ----------------------
 package/kexec/kexec.mk                             |  2 +-
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 package/kexec/kexec-0002-i386-fix-build-failure-bzImage_support_efi_boot.patch
 delete mode 100644 package/kexec/kexec-0003-kernel-image-probe-function-return-value-checking-fi.patch
package/kexec/kexec-0002-i386-fix-build-failure-bzImage_support_efi_boot.patch deleted +0 -28
deleted file mode 100644
index 3572015..0000000
@@ -1,28 +0,0 @@
-Fetch from:
-  https://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/patch/?id=9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c
-
-From 9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c Mon Sep 17 00:00:00 2001
-From: Tony Jones <[email protected]>
-Date: Wed, 05 Feb 2014 22:32:18 +0000
-Subject: i386: fix build failure (bzImage_support_efi_boot)
-
-Commit 9c200a85de2245a850546fded96a1977b84ad24d referenced
-'bzImage_support_efi_boot' without matching 32-bit definition.
-
-Signed-off-by: Tony Jones <[email protected]>
-Signed-off-by: Simon Horman <[email protected]>
----
-diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c
-index fc1a54f..e7bc1d6 100644
---- a/kexec/arch/i386/kexec-bzImage.c
-+++ b/kexec/arch/i386/kexec-bzImage.c
-@@ -40,6 +40,7 @@
- #include <arch/options.h>
-
- static const int probe_debug = 0;
-+int bzImage_support_efi_boot = 0;
-
- int bzImage_probe(const char *buf, off_t len)
- {
---
-cgit v0.9.2
package/kexec/kexec-0003-kernel-image-probe-function-return-value-checking-fi.patch deleted +0 -41

41 lines not on this page · raw message

package/kexec/kexec.mk +1 -1
index b16787c..e88254c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KEXEC_VERSION = 2.0.5
+KEXEC_VERSION = 2.0.6
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
 
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 kexec: bump to version 2.0.6

Dear Sven Neumann,

Quoted 10 lines · Sven Neumann

Remove two patches which have been included upstream.

---
 ...ix-build-failure-bzImage_support_efi_boot.patch | 28 ---------------
 ...e-probe-function-return-value-checking-fi.patch | 41 ----------------------
 package/kexec/kexec.mk                             |  2 +-
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 package/kexec/kexec-0002-i386-fix-build-failure-bzImage_support_efi_boot.patch
 delete mode 100644 package/kexec/kexec-0003-kernel-image-probe-function-return-value-checking-fi.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com