summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-16 20:30:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-18 11:44:55 +0100
commita8b421598577243c50d555dae3c6eaa7646df996 (patch)
tree9f13a6a2c8a08eb3702dda43ee88a57af231794a
parent196e8c6daf6be90e7eb7c330584f423ac6255ad8 (diff)
downloadpoky-a8b421598577243c50d555dae3c6eaa7646df996.tar.gz
buildcpio.py: Apply patch to fix build with -fno-common
This sed expression implements the needed patch to fix compilation with -fno-common, hopefully this patch will get included in 2.14 release and we can remove this operation (From OE-Core rev: 77b2e00c37c661a502bb47fcbbeb2e71aca5b9ce) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/cases/buildcpio.py3
-rw-r--r--meta/lib/oeqa/sdk/cases/buildcpio.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py
index d0f91668b2..e29bf16ccb 100644
--- a/meta/lib/oeqa/runtime/cases/buildcpio.py
+++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
@@ -27,6 +27,7 @@ class BuildCpioTest(OERuntimeTestCase):
27 @OEHasPackage(['autoconf']) 27 @OEHasPackage(['autoconf'])
28 def test_cpio(self): 28 def test_cpio(self):
29 self.project.download_archive() 29 self.project.download_archive()
30 self.project.run_configure('--disable-maintainer-mode','') 30 self.project.run_configure('--disable-maintainer-mode',
31 'sed -i -e "/char \*program_name/d" src/global.c;')
31 self.project.run_make() 32 self.project.run_make()
32 self.project.run_install() 33 self.project.run_install()
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py
index 902e93f623..e565826541 100644
--- a/meta/lib/oeqa/sdk/cases/buildcpio.py
+++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
28 self.assertTrue(os.path.isdir(dirs["source"])) 28 self.assertTrue(os.path.isdir(dirs["source"]))
29 os.makedirs(dirs["build"]) 29 os.makedirs(dirs["build"])
30 30
31 self._run("sed -i -e '/char.*program_name/d' {source}/src/global.c".format(**dirs))
31 self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) 32 self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs))
32 self._run("cd {build} && make -j".format(**dirs)) 33 self._run("cd {build} && make -j".format(**dirs))
33 self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) 34 self._run("cd {build} && make install DESTDIR={install}".format(**dirs))