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 | |
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')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/buildcpio.py | 8 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcpio.py | 7 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/meta_ide.py | 4 |
3 files changed, 7 insertions, 12 deletions
diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index ce122ebcf9..7be734cb4f 100644 --- a/meta/lib/oeqa/runtime/cases/buildcpio.py +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py | |||
@@ -14,7 +14,7 @@ class BuildCpioTest(OERuntimeTestCase): | |||
14 | 14 | ||
15 | @classmethod | 15 | @classmethod |
16 | def setUpClass(cls): | 16 | def setUpClass(cls): |
17 | uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.14.tar.gz' | 17 | uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.15.tar.gz' |
18 | cls.project = TargetBuildProject(cls.tc.target, | 18 | cls.project = TargetBuildProject(cls.tc.target, |
19 | uri, | 19 | uri, |
20 | dl_dir = cls.tc.td['DL_DIR']) | 20 | dl_dir = cls.tc.td['DL_DIR']) |
@@ -29,10 +29,6 @@ class BuildCpioTest(OERuntimeTestCase): | |||
29 | @OEHasPackage(['autoconf']) | 29 | @OEHasPackage(['autoconf']) |
30 | def test_cpio(self): | 30 | def test_cpio(self): |
31 | self.project.download_archive() | 31 | self.project.download_archive() |
32 | self.project.run_configure('--disable-maintainer-mode') | 32 | self.project.run_configure() |
33 | # This sed is needed until | ||
34 | # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb | ||
35 | # is in a release. | ||
36 | self.project._run(r'sed -i -e "/char \*program_name/d" %s/src/global.c' % self.project.targetdir) | ||
37 | self.project.run_make() | 33 | self.project.run_make() |
38 | self.project.run_install() | 34 | self.project.run_install() |
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 | ||
diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index e446d9308d..ffe0d2604d 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py | |||
@@ -44,10 +44,10 @@ class MetaIDE(OESelftestTestCase): | |||
44 | def test_meta_ide_can_build_cpio_project(self): | 44 | def test_meta_ide_can_build_cpio_project(self): |
45 | dl_dir = self.td.get('DL_DIR', None) | 45 | dl_dir = self.td.get('DL_DIR', None) |
46 | self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, | 46 | self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path, |
47 | "https://ftp.gnu.org/gnu/cpio/cpio-2.14.tar.gz", | 47 | "https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.gz", |
48 | self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) | 48 | self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir) |
49 | self.project.download_archive() | 49 | self.project.download_archive() |
50 | self.assertEqual(self.project.run_configure('$CONFIGURE_FLAGS --disable-maintainer-mode','sed -i -e "/char \*program_name/d" src/global.c;'), 0, | 50 | self.assertEqual(self.project.run_configure('$CONFIGURE_FLAGS'), 0, |
51 | msg="Running configure failed") | 51 | msg="Running configure failed") |
52 | self.assertEqual(self.project.run_make(), 0, | 52 | self.assertEqual(self.project.run_make(), 0, |
53 | msg="Running make failed") | 53 | msg="Running make failed") |