Skip to contentSkip to conversation

oeqa: Use cpio 2.13 as testcase

PATCH In review Khem Raj 3 participants 7 messages Feb 5, 2020 – Feb 7, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 oeqa: Use cpio 2.13 as testcase

cpio 2.12 was released in 2015 and might have used older autotools which could result in errors like

https://bugzilla.yoctoproject.org/show_bug.cgi?id=13779

Bumping to 2.13 will help in matching the tool versions A good change on top would be to run

aclocal -I .; autoheader; autoconf; automake --add-missing -c

before running configure step perhaps

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 4 ++--
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index f4e871e421..4bd72dd37e 100644
@@ -12,7 +12,7 @@ class BuildCpioTest(OERuntimeTestCase):
 
     @classmethod
     def setUpClass(cls):
-        uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.12.tar.gz'
+        uri = 'https://downloads.yoctoproject.org/mirror/sources/cpio-2.13.tar.gz'
         cls.project = TargetBuildProject(cls.tc.target,
                                          uri,
                                          dl_dir = cls.tc.td['DL_DIR'])
meta/lib/oeqa/sdk/cases/buildcpio.py +2 -2
index 0a5e68d5fd..b0beafb38f 100644
@@ -17,10 +17,10 @@ class BuildCpioTest(OESDKTestCase):
     """
     def test_cpio(self):
         with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir:
-            tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz")
+            tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.gz")
 
             dirs = {}
-            dirs["source"] = os.path.join(testdir, "cpio-2.12")
+            dirs["source"] = os.path.join(testdir, "cpio-2.13")
             dirs["build"] = os.path.join(testdir, "build")
             dirs["install"] = os.path.join(testdir, "install")
 
meta/lib/oeqa/selftest/cases/meta_ide.py +1 -1
index 03901a2f32..809142559a 100644
@@ -40,7 +40,7 @@ class MetaIDE(OESelftestTestCase):
     def test_meta_ide_can_build_cpio_project(self):
         dl_dir = self.td.get('DL_DIR', None)
         self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path,
-                        "https://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.gz",
+                        "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,
Signature · 1 line
2.25.0
author
#1 lore raw

PATCH 2/2 oeqa: autoreconf cpio before building

since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 1 +
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index 4bd72dd37e..9cc261c314 100644
@@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase):
     @OEHasPackage(['autoconf'])
     def test_cpio(self):
         self.project.download_archive()
-        self.project.run_configure()
+        self.project.run_configure('','autoreconf --force;')
         self.project.run_make()
         self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
index b0beafb38f..ec10149d34 100644
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
+            self._run("cd {source} && autoreconf --force")
             self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install DESTDIR={install}".format(**dirs))
meta/lib/oeqa/selftest/cases/meta_ide.py +1 -1
index 809142559a..46398c7e2d 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('','autoreconf --force;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
Signature · 1 line
2.25.0
#2 lore raw

Re: [PATCH 2/2] oeqa: autoreconf cpio before building

Quoted 59 lines · Khem Raj

since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 1 +
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index 4bd72dd37e..9cc261c314 100644
@@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase):
     @OEHasPackage(['autoconf'])
     def test_cpio(self):
         self.project.download_archive()
-        self.project.run_configure()
+        self.project.run_configure('','autoreconf --force;')
         self.project.run_make()
         self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
index b0beafb38f..ec10149d34 100644
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
+            self._run("cd {source} && autoreconf --force")
             self._run("cd {build} && {source}/configure
 $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install

DESTDIR={install}".format(**dirs))

meta/lib/oeqa/selftest/cases/meta_ide.py +1 -2
index 809142559a..46398c7e2d 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('','autoreconf
--force;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
Signature · 1 line
2.25.0

This breaks the SDK everywhere:

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c

(and many more)

Cheers,

Richard

#3 lore raw

Re: [PATCH 2/2] oeqa: autoreconf cpio before building

Quoted 64 lines · Richard Purdie
Quoted 58 lines · Khem Raj

since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 1 +
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index 4bd72dd37e..9cc261c314 100644
@@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase):
     @OEHasPackage(['autoconf'])
     def test_cpio(self):
         self.project.download_archive()
-        self.project.run_configure()
+        self.project.run_configure('','autoreconf --force;')
         self.project.run_make()
         self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
index b0beafb38f..ec10149d34 100644
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
+            self._run("cd {source} && autoreconf --force")
             self._run("cd {build} && {source}/configure
 $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install

DESTDIR={install}".format(**dirs))

meta/lib/oeqa/selftest/cases/meta_ide.py +1 -3
index 809142559a..46398c7e2d 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('','autoreconf
--force;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
--
Quoted 1 line

2.25.0

This breaks the SDK everywhere:

Quoted 3 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c

(and many more)

Configuring with --disable-maintainer-mode might be a better fix for the original problem?

https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html

author
#4 lore raw

Re: [PATCH 2/2] oeqa: autoreconf cpio before building

Quoted 67 lines · Andre McCurdy
Quoted 64 lines · Richard Purdie
Quoted 58 lines · Khem Raj

since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 1 +
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index 4bd72dd37e..9cc261c314 100644
@@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase):
     @OEHasPackage(['autoconf'])
     def test_cpio(self):
         self.project.download_archive()
-        self.project.run_configure()
+        self.project.run_configure('','autoreconf --force;')
         self.project.run_make()
         self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
index b0beafb38f..ec10149d34 100644
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
+            self._run("cd {source} && autoreconf --force")
             self._run("cd {build} && {source}/configure
 $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install

DESTDIR={install}".format(**dirs))

meta/lib/oeqa/selftest/cases/meta_ide.py +1 -3
index 809142559a..46398c7e2d 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('','autoreconf
--force;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
--
Quoted 1 line

2.25.0

This breaks the SDK everywhere:

Quoted 7 lines
Quoted 3 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c

(and many more)

Configuring with --disable-maintainer-mode might be a better fix for the original problem?

yes, or just touch configure, which I have sent as v2, but I am still miffed with why its happening on mips64 box alone.

Quoted 1 line

https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html

#5 lore raw

Re: [PATCH 2/2] oeqa: autoreconf cpio before building

Quoted 71 lines · Khem Raj
Quoted 69 lines · Andre McCurdy
Quoted 66 lines · Richard Purdie
Quoted 58 lines · Khem Raj

since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 1 +
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index 4bd72dd37e..9cc261c314 100644
@@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase):
     @OEHasPackage(['autoconf'])
     def test_cpio(self):
         self.project.download_archive()
-        self.project.run_configure()
+        self.project.run_configure('','autoreconf --force;')
         self.project.run_make()
         self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
index b0beafb38f..ec10149d34 100644
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
+            self._run("cd {source} && autoreconf --force")
             self._run("cd {build} && {source}/configure
 $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install

DESTDIR={install}".format(**dirs))

meta/lib/oeqa/selftest/cases/meta_ide.py +1 -3
index 809142559a..46398c7e2d 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('','autoreconf
--force;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
--
Quoted 1 line

2.25.0

This breaks the SDK everywhere:

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

(and many more)

Configuring with --disable-maintainer-mode might be a better fix for the original problem?

yes, or just touch configure, which I have sent as v2

If only it was that easy! :-)

author
#6 lore raw

Re: [PATCH 2/2] oeqa: autoreconf cpio before building

In reply to Richard Purdie
Quoted 64 lines · Richard Purdie
Quoted 58 lines · Khem Raj

since the versions of autotools might differ in OE especially so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

---
 meta/lib/oeqa/runtime/cases/buildcpio.py | 2 +-
 meta/lib/oeqa/sdk/cases/buildcpio.py     | 1 +
 meta/lib/oeqa/selftest/cases/meta_ide.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/buildcpio.py +1 -1
index 4bd72dd37e..9cc261c314 100644
@@ -27,6 +27,6 @@ class BuildCpioTest(OERuntimeTestCase):
     @OEHasPackage(['autoconf'])
     def test_cpio(self):
         self.project.download_archive()
-        self.project.run_configure()
+        self.project.run_configure('','autoreconf --force;')
         self.project.run_make()
         self.project.run_install()
meta/lib/oeqa/sdk/cases/buildcpio.py +1 -0
index b0beafb38f..ec10149d34 100644
@@ -28,6 +28,7 @@ class BuildCpioTest(OESDKTestCase):
             self.assertTrue(os.path.isdir(dirs["source"]))
             os.makedirs(dirs["build"])
 
+            self._run("cd {source} && autoreconf --force")
             self._run("cd {build} && {source}/configure
 $CONFIGURE_FLAGS".format(**dirs))
             self._run("cd {build} && make -j".format(**dirs))
             self._run("cd {build} && make install

DESTDIR={install}".format(**dirs))

meta/lib/oeqa/selftest/cases/meta_ide.py +1 -3
index 809142559a..46398c7e2d 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('','autoreconf
--force;'), 0,
                         msg="Running configure failed")
         self.assertEqual(self.project.run_make(), 0,
                         msg="Running make failed")
--
Quoted 1 line

2.25.0

This breaks the SDK everywhere:

Quoted 4 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1552/steps/8/logs/step2c

(and many more)

yes obvious oversight, I have sent a v2, anyway this patch was not fixing original problem too.

Quoted 5 lines

Cheers,

Richard