Skip to contentSkip to conversation

cleanings and fixes

PATCH New Andrea Adami 1 participant 5 messages May 12, 2013

lore
Share & tools
lore
#0 lore raw

cover cleanings and fixes

* minor editing to the images,
* kexecboot runtime deps fixes,
* klibc and kexec-tools-klibc refinements needed to unbreak the build
* for x86 and x86-64

Andrea Adami (4):
initramfs-kexecboot(-klibc)-image: Drop legacy export of
IMAGE_BASENAME
kexecboot(-klibc): remove runtime dependency on kexec(-klibc)
klibc: fix KLIBCARCH for x86-64, powerpc and powerpc64 kexec-tools-klibc_2.0.2: refactor and extend patches for building

 .../images/initramfs-kexecboot-image.bb            |  2 -
 .../images/initramfs-kexecboot-klibc-image.bb      |  2 -
 .../recipes-bsp/kexecboot/kexecboot-klibc_git.bb   |  1 -
 .../recipes-bsp/kexecboot/kexecboot_git.bb         |  1 -
 meta-initramfs/recipes-devtools/klibc/klibc.inc    |  3 +
 .../kexec-tools-klibc-2.0.2/arm_crashdump.patch    | 12 +++
 .../kexec-tools-klibc-2.0.2/cflags_static.patch    | 11 +++
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        | 94 ---------------------
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      | 13 ---
 .../kexec-tools-klibc-2.0.2/ifdown_errno.patch     | 11 +++
 .../kexec-tools-klibc-2.0.2/kexec-elf-rel.patch    | 61 ++++++++++++++
 .../kexec-tools-klibc-2.0.2/kexec-syscall.patch    | 44 ++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      | 97 ----------------------
 .../kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch     | 18 ++++
 .../kexec-tools-klibc-2.0.2/purgatory_flags.patch  | 21 +++++
 .../kexec-tools-klibc-2.0.2/purgatory_string.patch |  9 ++
 .../kexec/kexec-tools-klibc-2.0.2/sha256.patch     | 13 +++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     | 11 ---
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    | 46 ----------
 .../sysconf_nrprocessors.patch                     | 13 +++
 .../kexec-tools-klibc-2.0.2/x86_basename.patch     | 14 ++++
 .../kexec-tools-klibc-2.0.2/x86_kexec_test.patch   | 13 +++
 .../kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch | 21 +++++
 .../kexec-tools-klibc-2.0.2/x86_vfscanf.patch      | 27 ++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               | 28 +++++--
 25 files changed, 310 insertions(+), 276 deletions(-)
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/4 initramfs-kexecboot(-klibc)-image: Drop legacy export of IMAGE_BASENAME

* We used to export this in the days an external script handled the image
* generation. This is no longer the case and hence we no longer need
* this export.
* As committed in oe-core with 919613c0e75362ee0eace99b51cc77d34a05372f

---
 meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb       | 2 --
 meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb | 2 --
 2 files changed, 4 deletions(-)
meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb +0 -2
index e706ea8..dbe5583 100644
@@ -16,8 +16,6 @@ IMAGE_INSTALL = "kexec kexecboot mtd-utils-ubifs"
 # Do not pollute the initrd image with rootfs features
 IMAGE_FEATURES = ""
 
-export IMAGE_BASENAME = "initramfs-kexecboot-image"
-
 IMAGE_LINGUAS = ""
 IMAGE_LOGIN_MANAGER = ""
 IMAGE_INIT_MANAGER = ""
meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +0 -2
index e4e52cf..37349e1 100644
@@ -1,5 +1,3 @@
 require initramfs-kexecboot-image.bb
 
 IMAGE_INSTALL = "kexec-klibc kexecboot-klibc ubiattach-klibc"
-
-export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 2/4 kexecboot(-klibc): remove runtime dependency on kexec(-klibc)

In reply to Andrea Adami

* the binary itself can run without kexec (in host-debug mode) so
* specify in the cpio IMAGE which packages are needed at runtime

---
 meta-initramfs/recipes-bsp/kexecboot/kexecboot-klibc_git.bb | 1 -
 meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb       | 1 -
 2 files changed, 2 deletions(-)
meta-initramfs/recipes-bsp/kexecboot/kexecboot-klibc_git.bb +0 -1
index f9aee7c..a158eb4 100644
@@ -1,4 +1,3 @@
-RDEPENDS_${PN} = "kexec-klibc"
 PV = "0.5.9"
 PR = "r10+gitr${SRCREV}"
 
meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +0 -1
index fe1ef36..d664261 100644
@@ -1,4 +1,3 @@
-RDEPENDS_${PN} = "kexec"
 PV = "0.5.9"
 PR = "r10+gitr${SRCREV}"
 
Signature · 1 line
1.8.1.5
#3 lore raw

PATCH 3/4 klibc: fix KLIBCARCH for x86-64, powerpc and powerpc64

In reply to Andrea Adami
---
 meta-initramfs/recipes-devtools/klibc/klibc.inc | 3 +++
 1 file changed, 3 insertions(+)
meta-initramfs/recipes-devtools/klibc/klibc.inc +3 -0
index a4937fa..4d5f6c4 100644
@@ -16,10 +16,13 @@ KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
 KLIBC_ARCH_mipsel = 'mips'
 KLIBC_ARCH_x86 = 'i386'
+KLIBC_ARCH_x86-64 = 'x86_64'
 KLIBC_ARCH_i486 = 'i386'
 KLIBC_ARCH_i586 = 'i386'
 KLIBC_ARCH_i686 = 'i386'
 KLIBC_ARCH_pentium = 'i386'
+KLIBC_ARCH_powerpc = 'ppc'
+KLIBC_ARCH_powerpc64 = 'ppc64'
 
 export FIX_ARMV4_EABI_BX = "${FIX_V4BX}"
 
Signature · 1 line
1.8.1.5
#4 lore raw

PATCH 4/4 kexec-tools-klibc_2.0.2: refactor and extend patches for building

In reply to Andrea Adami

* some old patches apparently unneeded have been removed
* patches are now better split
* fix build for x86 and x86-64
* tested with qemuarm, qemuppc, qemumips, qemux86, qemux86-64

---
 .../kexec-tools-klibc-2.0.2/arm_crashdump.patch    | 12 +++
 .../kexec-tools-klibc-2.0.2/cflags_static.patch    | 11 +++
 .../kexec/kexec-tools-klibc-2.0.2/elf.patch        | 94 ---------------------
 .../kexec/kexec-tools-klibc-2.0.2/errno.patch      | 13 ---
 .../kexec-tools-klibc-2.0.2/ifdown_errno.patch     | 11 +++
 .../kexec-tools-klibc-2.0.2/kexec-elf-rel.patch    | 61 ++++++++++++++
 .../kexec-tools-klibc-2.0.2/kexec-syscall.patch    | 44 ++++++++++
 .../kexec/kexec-tools-klibc-2.0.2/other.patch      | 97 ----------------------
 .../kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch     | 18 ++++
 .../kexec-tools-klibc-2.0.2/purgatory_flags.patch  | 21 +++++
 .../kexec-tools-klibc-2.0.2/purgatory_string.patch |  9 ++
 .../kexec/kexec-tools-klibc-2.0.2/sha256.patch     | 13 +++
 .../kexec/kexec-tools-klibc-2.0.2/string.patch     | 11 ---
 .../kexec/kexec-tools-klibc-2.0.2/syscall.patch    | 46 ----------
 .../sysconf_nrprocessors.patch                     | 13 +++
 .../kexec-tools-klibc-2.0.2/x86_basename.patch     | 14 ++++
 .../kexec-tools-klibc-2.0.2/x86_kexec_test.patch   | 13 +++
 .../kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch | 21 +++++
 .../kexec-tools-klibc-2.0.2/x86_vfscanf.patch      | 27 ++++++
 .../kexec/kexec-tools-klibc_2.0.2.bb               | 28 +++++--
 20 files changed, 307 insertions(+), 270 deletions(-)
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch
 delete mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch
 create mode 100644 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch new file +12 -0
new file mode 100644
index 0000000..0ff61e5
@@ -0,0 +1,12 @@
+--- a/kexec/arch/arm/crashdump-arm.c
++++ b/kexec/arch/arm/crashdump-arm.c
+@@ -20,7 +20,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch new file +11 -0
new file mode 100644
index 0000000..35100a3
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,7 @@
+ # where necessary.
+ CPPFLAGS	= @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \
+			-Iinclude/
+-CFLAGS		= @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes
++CFLAGS		= @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes
+ PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@
+ ASFLAGS		= @ASFLAGS@
+ LDFLAGS		= @LDFLAGS@
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/elf.patch deleted +0 -94

94 lines not on this page · raw message

meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/errno.patch deleted +0 -13
deleted file mode 100644
index c56b5a9..0000000
@@ -1,13 +0,0 @@
-Index: kexec-tools-2.0.2/kexec/ifdown.c
-===================================================================
---- kexec-tools-2.0.2.orig/kexec/ifdown.c	2009-09-24 14:15:34.025828340 +0100
-+++ kexec-tools-2.0.2/kexec/ifdown.c	2009-09-24 14:15:47.014827381 +0100
-@@ -14,7 +14,7 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/time.h>
--#include <sys/errno.h>
-+#include <errno.h>
-
- #include <net/if.h>
- #include <netinet/in.h>
\ No newline at end of file
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch new file +11 -0
new file mode 100644
index 0000000..7f8cddd
@@ -0,0 +1,11 @@
+--- a/kexec/ifdown.c
++++ b/kexec/ifdown.c
+@@ -14,7 +14,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ #include <net/if.h>
+ #include <netinet/in.h>
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch new file +61 -0

61 lines not on this page · raw message

meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch new file +44 -0

44 lines not on this page · raw message

meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/other.patch deleted +0 -97

97 lines not on this page · raw message

meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch new file +18 -0
new file mode 100644
index 0000000..56cdfb0
@@ -0,0 +1,18 @@
+--- a/purgatory/arch/ppc/crt.S
++++ b/purgatory/arch/ppc/crt.S
+@@ -249,6 +249,7 @@
+  *
+  */
+ 
++/* already defined in misc.S
+ _GLOBAL(__lshrdi3)
+ 	subfic	6,5,32
+ 	srw	4,4,5	# LSW = count > 31 ? 0 : LSW >> count
+@@ -259,5 +260,7 @@
+ 	srw	3,3,5	# MSW = MSW >> count
+ 	or	4,4,7	# LSW |= t2
+ 	blr
++*/
++
+ #endif
+ #endif
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch new file +21 -0
new file mode 100644
index 0000000..41fc116
@@ -0,0 +1,21 @@
+--- a/purgatory/Makefile
++++ b/purgatory/Makefile
+@@ -47,7 +47,7 @@
+ $(PURGATORY): CC=$(TARGET_CC)
+ $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \
+		      $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
+-		      -Os -fno-builtin -ffreestanding
++		      -Os -fno-builtin -ffreestanding -nostdinc
+ 
+ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
+			-I$(srcdir)/purgatory/include \
+@@ -61,7 +61,8 @@
+ 
+ $(PURGATORY): $(PURGATORY_OBJS)
+	$(MKDIR) -p $(@D)
+-	$(CC) $(LDFLAGS) -o $@ $^
++#	$(CC) $(LDFLAGS) -o $@ $^
++	$(LD) $(LDFLAGS) -o $@ $^
+ 
+ #	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
+
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch new file +9 -0
new file mode 100644
index 0000000..5710561
@@ -0,0 +1,9 @@
+--- a/purgatory/string.c
++++ b/purgatory/string.c
+@@ -1,5 +1,5 @@
+ #include <stddef.h>
+-#include <string.h>
++/* #include <string.h> */
+ 
+ size_t strnlen(const char *s, size_t max)
+ {
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch new file +13 -0
new file mode 100644
index 0000000..85bf7aa
@@ -0,0 +1,13 @@
+--- a/util_lib/include/sha256.h
++++ b/util_lib/include/sha256.h
+@@ -1,7 +1,8 @@
+ #ifndef SHA256_H
+ #define SHA256_H
+ 
+-#include <sys/types.h>
++//#include <sys/types.h>
++#include <stddef.h>
+ #include <stdint.h>
+ 
+ typedef struct
+
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/string.patch deleted +0 -11
deleted file mode 100644
index 7d27e39..0000000
@@ -1,11 +0,0 @@
-Index: kexec-tools-2.0.2/purgatory/string.c
-===================================================================
---- kexec-tools-2.0.2.orig/purgatory/string.c	2008-05-16 13:28:19.000000000 +0200
-+++ kexec-tools-2.0.2/purgatory/string.c	2009-09-16 17:49:04.000000000 +0200
-@@ -1,5 +1,5 @@
- #include <stddef.h>
--#include <string.h>
-+/* #include <string.h> */
-
- size_t strnlen(const char *s, size_t max)
- {
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/syscall.patch deleted +0 -46

46 lines not on this page · raw message

meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch new file +13 -0
new file mode 100644
index 0000000..04a97e6
@@ -0,0 +1,13 @@
+--- a/kexec/crashdump-elf.c
++++ b/kexec/crashdump-elf.c
+@@ -47,7 +47,8 @@
+	if (xen_present())
+		nr_cpus = xen_get_nr_phys_cpus();
+	else
+-		nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
++		/*nr_cpus = sysconf(_SC_NPROCESSORS_CONF);*/
++		nr_cpus = 1;
+ 
+	if (nr_cpus < 0) {
+		return -1;
+
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch new file +14 -0
new file mode 100644
index 0000000..200fb1d
@@ -0,0 +1,14 @@
+--- a/kexec/arch/i386/x86-linux-setup.c
++++ b/kexec/arch/i386/x86-linux-setup.c
+@@ -280,9 +280,9 @@ static int add_edd_entry(struct x86_linu
+	memset(edd_info, 0, sizeof(struct edd_info));
+ 
+ 	/* extract the device number */
+-	if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) {
++	if (sscanf(strrchr(sysfs_name,'/') + 1, "int13_dev%hhx", &devnum) != 1) {
+ 		fprintf(stderr, "Invalid format of int13_dev dir "
+-				"entry: %s\n", basename(sysfs_name));
++				"entry: %s\n", strrchr(sysfs_name,'/') + 1);
+ 		return -1;
+ 	}
+ 
\ No newline at end of file
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch new file +13 -0
new file mode 100644
index 0000000..9500bd6
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -106,8 +106,8 @@
+ 
+ MAN_PAGES:= kexec/kexec.8
+ MAN_PAGES+= kdump/kdump.8
+-BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
+-BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
++BINARIES_i386:=  $(SBINDIR)/kexec
++BINARIES_x86_64:=$(SBINDIR)/kexec
+ BINARIES:=$(SBINDIR)/kexec $(SBINDIR)/kdump $(BINARIES_$(ARCH))
+ 
+ TARGETS:=$(BINARIES) $(MAN_PAGES)
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch new file +21 -0
new file mode 100644
index 0000000..a497c9a
@@ -0,0 +1,21 @@
+--- a/purgatory/arch/i386/pic.c
++++ b/purgatory/arch/i386/pic.c
+@@ -16,7 +16,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+-#include <sys/io.h>
++#include "include/arch/io.h"
+ #include <purgatory.h>
+ #include "purgatory-x86.h"
+ 
+
+--- a/purgatory/arch/i386/vga.c
++++ b/purgatory/arch/i386/vga.c
+@@ -1,4 +1,4 @@
+-#include <sys/io.h>
++#include "include/arch/io.h"
+ #include <purgatory.h>
+ #include "purgatory-x86.h"
+ 
+
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch new file +27 -0
new file mode 100644
index 0000000..14f4d2a
@@ -0,0 +1,27 @@
+--- a/kexec/arch/i386/x86-linux-setup.c
++++ b/kexec/arch/i386/x86-linux-setup.c
+@@ -176,6 +176,8 @@ static int file_scanf(const char *dir, c
+ 	FILE *fp;
+ 	int retno;
+ 	char filename[PATH_MAX];
++	long line_size = MAX_LINE;
++	char *line;
+ 
+ 	snprintf(filename, PATH_MAX, "%s/%s", dir, file);
+ 	filename[PATH_MAX-1] = 0;
+@@ -186,7 +188,14 @@ static int file_scanf(const char *dir, c
+ 	}
+ 
+ 	va_start(argptr, scanf_line);
+-	retno = vfscanf(fp, scanf_line, argptr);
++
++	line = xmalloc(sizeof(line) * line_size);
++	while(fgets(line, sizeof(line), fp) != 0 ) {
++		line_size += MAX_LINE;
++		line = xrealloc(line,line_size);
++	}
++	retno = vsscanf(line, scanf_line, argptr);
++
+ 	va_end(argptr);
+ 
+ 	fclose(fp);
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb +19 -9
index 90b876c..eedcaa5 100644
@@ -7,20 +7,30 @@ inherit klibc
 
 FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
 
-SRC_URI += "file://elf.patch \
-            file://errno.patch \
-            file://string.patch \
-            file://syscall.patch \
-            file://other.patch \
-"
+SRC_URI += " \
+            file://kexec-elf-rel.patch \
+            file://kexec-syscall.patch \
+            file://cflags_static.patch  \
+            file://ifdown_errno.patch  \
+            file://purgatory_flags.patch \
+            file://purgatory_string.patch \
+            file://sha256.patch \
+            file://sysconf_nrprocessors.patch \
+            "
+
+SRC_URI_append_arm = " file://arm_crashdump.patch"
+SRC_URI_append_powerpc = " file://ppc__lshrdi3.patch"
+SRC_URI_append_x86 = " file://x86_sys_io.patch file://x86_basename.patch file://x86_vfscanf.patch file://x86_kexec_test.patch"
+SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch file://x86_vfscanf.patch file://x86_kexec_test.patch"
 
 S = "${WORKDIR}/kexec-tools-${PV}"
 
-EXTRA_OECONF += "--without-zlib"
-
-PACKAGES =+ "kexec-klibc kdump-klibc"
+EXTRA_OECONF += "--without-zlib --without-lzma --without-xen"
 
 CFLAGS += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits32"
+CFLAGS_x86-64 += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits64"
+
+PACKAGES =+ "kexec-klibc kdump-klibc"
 
 FILES_kexec-klibc = "${sbindir}/kexec"
 FILES_kdump-klibc = "${sbindir}/kdump"
Signature · 1 line
1.8.1.5