diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-02-06 10:49:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-08 10:59:06 +0000 |
commit | bd7a3fd0f7a5b13bc1b3eef10bbc9d84f4889b6d (patch) | |
tree | aba4d135931a6563847cff089483d7276fdfa559 /meta/lib/oeqa/sdk | |
parent | f31fe0b5b5c502ab56941cf8d77fb10427269ec3 (diff) | |
download | poky-bd7a3fd0f7a5b13bc1b3eef10bbc9d84f4889b6d.tar.gz |
buildcpio.py: Switch to using cpio-2.15
This helps in getting it building with newer architectures like riscv32
since it has upgraded gnulib over 2.14 which has the needed fixes.
Drop the -fno-common workaround as it is already applied to cpio
drop --disable-maintainer-mode
Fixes
configure: WARNING: unrecognized options: --disable-maintainer-mode
(From OE-Core rev: 18d303497089d3a7a893ee0eec5b0f0c78cca06d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/sdk')
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcpio.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index 33b946fc16..51003b19cd 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py | |||
@@ -19,10 +19,10 @@ class BuildCpioTest(OESDKTestCase): | |||
19 | """ | 19 | """ |
20 | def test_cpio(self): | 20 | def test_cpio(self): |
21 | with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: | 21 | with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir: |
22 | tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.14.tar.gz") | 22 | tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.gz") |
23 | 23 | ||
24 | dirs = {} | 24 | dirs = {} |
25 | dirs["source"] = os.path.join(testdir, "cpio-2.14") | 25 | dirs["source"] = os.path.join(testdir, "cpio-2.15") |
26 | dirs["build"] = os.path.join(testdir, "build") | 26 | dirs["build"] = os.path.join(testdir, "build") |
27 | dirs["install"] = os.path.join(testdir, "install") | 27 | dirs["install"] = os.path.join(testdir, "install") |
28 | 28 | ||
@@ -30,8 +30,7 @@ class BuildCpioTest(OESDKTestCase): | |||
30 | self.assertTrue(os.path.isdir(dirs["source"])) | 30 | self.assertTrue(os.path.isdir(dirs["source"])) |
31 | os.makedirs(dirs["build"]) | 31 | os.makedirs(dirs["build"]) |
32 | 32 | ||
33 | self._run("sed -i -e '/char.*program_name/d' {source}/src/global.c".format(**dirs)) | 33 | self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) |
34 | self._run("cd {build} && {source}/configure --disable-maintainer-mode $CONFIGURE_FLAGS".format(**dirs)) | ||
35 | self._run("cd {build} && make -j".format(**dirs)) | 34 | self._run("cd {build} && make -j".format(**dirs)) |
36 | self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) | 35 | self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) |
37 | 36 | ||