Skip to contentSkip to conversation

oeqa/selftest: Apply patch to fix cpio build with -fno-common

PATCH New Khem Raj 1 participant 2 messages Aug 25, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 oeqa/selftest: Apply patch to fix cpio build with -fno-common

---
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/meta_ide.py +1 -1
index 809142559a..4dcebc5a06 100644
@@ -43,7 +43,7 @@ class MetaIDE(OESelftestTestCase):
                         "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz",
                         self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir)
         self.project.download_archive()
-        self.assertEqual(self.project.run_configure(), 0,
+        self.assertEqual(self.project.run_configure('--disable-maintainer-mode','sed -i -e "/char \*program_name/d" src/global.c;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
Signature · 1 line
2.28.0
author
#1 lore raw

PATCH 2/2 kexec-tools: Fix build with -fno-common on ppc

---
 .../0001-kexec-Fix-build-with-fno-common.patch         | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta/recipes-kernel/kexec/kexec-tools/0001-kexec-Fix-build-with-fno-common.patch +10 -0
index a3ba0912d4..31f4d00b53 100644
@@ -66,3 +66,13 @@ Signed-off-by: Khem Raj <[email protected]>
  
  int bzImage64_probe(const char *buf, off_t len)
  {
+--- a/kexec/arch/ppc/kexec-elf-ppc.c
++++ b/kexec/arch/ppc/kexec-elf-ppc.c
+@@ -33,7 +33,6 @@
+ static const int probe_debug = 0;
+ 
+ unsigned char reuse_initrd;
+-const char *ramdisk;
+ int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *,
+ 			char *);
+ 
Signature · 1 line
2.28.0