Skip to contentSkip to conversation

kexec-tools-klibc_2.0.2: mask recipe for x86 and x86-64

PATCH New Andrea Adami 1 participant 3 messages Apr 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 kexec-tools-klibc_2.0.2: mask recipe for x86 and x86-64

* current recipe is failing because as of today klibc lacks vfscanf()
* and basename(). This latter is trivial to solve.
* Commit 3bf0213789d56054f601c5a06372f78567aacdd9 of kexec-tools
* introduced the issue in kexec/arch/i386/x86-linux-setup.c

---
 meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb +5 -0
index 90b876c..d5a2ecc 100644
@@ -7,6 +7,11 @@ inherit klibc
 
 FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
 
+# current version is known to fail on x86 and x86-64
+# due to missing vfscanf() in klibc
+COMPATIBLE_MACHINE_x86 = "(-)"
+COMPATIBLE_MACHINE_x86-64 = "(-)"
+
 SRC_URI += "file://elf.patch \
             file://errno.patch \
             file://string.patch \
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/3 initramfs-kexecboot-klibc-image: mask recipe for x86 and x86-64

* kexec-tools fails to compile against klibc so we have
* to mask the image pulling it

---
 meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +5 -0
index e4e52cf..92f387c 100644
@@ -3,3 +3,8 @@ require initramfs-kexecboot-image.bb
 IMAGE_INSTALL = "kexec-klibc kexecboot-klibc ubiattach-klibc"
 
 export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
+
+# current version is known to fail on x86 and x86-64
+# due to missing vfscanf() in klibc
+COMPATIBLE_MACHINE_x86 = "(-)"
+COMPATIBLE_MACHINE_x86-64 = "(-)"
Signature · 1 line
1.8.1.5
#2 lore raw

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

In reply to Andrea Adami

* 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 92f387c..8c90fd2 100644
@@ -2,8 +2,6 @@ require initramfs-kexecboot-image.bb
 
 IMAGE_INSTALL = "kexec-klibc kexecboot-klibc ubiattach-klibc"
 
-export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
-
 # current version is known to fail on x86 and x86-64
 # due to missing vfscanf() in klibc
 COMPATIBLE_MACHINE_x86 = "(-)"
Signature · 1 line
1.8.1.5