diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-09-23 00:31:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-26 10:25:42 +0100 |
commit | bf7e3886aed013fbf9e9635da8445e4d8670a993 (patch) | |
tree | 4016cc839af32e61303162026b133fc5a7e233c3 | |
parent | fc59af1998af4347c5992f01231291557bc8f3cd (diff) | |
download | poky-bf7e3886aed013fbf9e9635da8445e4d8670a993.tar.gz |
oeqa: Use 2.14 release of cpio instead of 2.13
2.13 may not be buildable with latest compilers without patching
(From OE-Core rev: 406a33f896accc35a9cb6ab156f1e0f42dda67d8)
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.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcpio.py | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/meta_ide.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py index 3728855d24..ce122ebcf9 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.13.tar.gz' | 17 | uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.14.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']) |
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index c42c670add..33b946fc16 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.13.tar.gz") | 22 | tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.14.tar.gz") |
23 | 23 | ||
24 | dirs = {} | 24 | dirs = {} |
25 | dirs["source"] = os.path.join(testdir, "cpio-2.13") | 25 | dirs["source"] = os.path.join(testdir, "cpio-2.14") |
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 | ||
diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py index 59270fb3e0..e446d9308d 100644 --- a/meta/lib/oeqa/selftest/cases/meta_ide.py +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py | |||
@@ -44,7 +44,7 @@ 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.13.tar.gz", | 47 | "https://ftp.gnu.org/gnu/cpio/cpio-2.14.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 --disable-maintainer-mode','sed -i -e "/char \*program_name/d" src/global.c;'), 0, |