[2/2] oeqa: autoreconf cpio before building

Submitted by Khem Raj on Feb. 5, 2020, 5:41 a.m. | Patch ID: 169743

Details

Message ID 20200205054120.1461132-2-raj.khem@gmail.com
State Master Next
Commit e83d5109efdef0034e9a9455892a1ec6815f2678
Headers show

Commit Message

Khem Raj Feb. 5, 2020, 5:41 a.m.
since the versions of autotools might differ in OE especially
so recreate config.h.in, aclocal.m4, configure, and Makefile.in

[YOCTO #13779]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 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(-)

Patch hide | download patch | download mbox

diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py
index 4bd72dd37e..9cc261c314 100644
--- a/meta/lib/oeqa/runtime/cases/buildcpio.py
+++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
@@ -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()
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py
index b0beafb38f..ec10149d34 100644
--- a/meta/lib/oeqa/sdk/cases/buildcpio.py
+++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
@@ -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))
diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py
index 809142559a..46398c7e2d 100644
--- a/meta/lib/oeqa/selftest/cases/meta_ide.py
+++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
@@ -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")

Comments

Richard Purdie Feb. 7, 2020, 6:09 p.m.
On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote:
> since the versions of autotools might differ in OE especially
> so recreate config.h.in, aclocal.m4, configure, and Makefile.in
> 
> [YOCTO #13779]
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  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(-)
> 
> diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py
> b/meta/lib/oeqa/runtime/cases/buildcpio.py
> index 4bd72dd37e..9cc261c314 100644
> --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> @@ -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()
> diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py
> b/meta/lib/oeqa/sdk/cases/buildcpio.py
> index b0beafb38f..ec10149d34 100644
> --- a/meta/lib/oeqa/sdk/cases/buildcpio.py
> +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
> @@ -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))
> diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py
> b/meta/lib/oeqa/selftest/cases/meta_ide.py
> index 809142559a..46398c7e2d 100644
> --- a/meta/lib/oeqa/selftest/cases/meta_ide.py
> +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
> @@ -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")
> -- 
> 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
Andre McCurdy Feb. 7, 2020, 6:18 p.m.
On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote:
> > since the versions of autotools might differ in OE especially
> > so recreate config.h.in, aclocal.m4, configure, and Makefile.in
> >
> > [YOCTO #13779]
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  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(-)
> >
> > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > index 4bd72dd37e..9cc261c314 100644
> > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > @@ -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()
> > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > index b0beafb38f..ec10149d34 100644
> > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > @@ -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))
> > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > index 809142559a..46398c7e2d 100644
> > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > @@ -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")
> > --
> > 2.25.0
>
> This breaks the SDK everywhere:
>
> 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
Khem Raj Feb. 7, 2020, 6:26 p.m.
On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote:
> > since the versions of autotools might differ in OE especially
> > so recreate config.h.in, aclocal.m4, configure, and Makefile.in
> >
> > [YOCTO #13779]
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  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(-)
> >
> > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > index 4bd72dd37e..9cc261c314 100644
> > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > @@ -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()
> > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > index b0beafb38f..ec10149d34 100644
> > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > @@ -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))
> > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > index 809142559a..46398c7e2d 100644
> > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > @@ -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")
> > --
> > 2.25.0
>
> This breaks the SDK everywhere:
>
> 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.

> Cheers,
>
> Richard
>
>
Khem Raj Feb. 7, 2020, 6:28 p.m.
On Fri, Feb 7, 2020 at 10:18 AM Andre McCurdy <armccurdy@gmail.com> wrote:
>
> On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote:
> > > since the versions of autotools might differ in OE especially
> > > so recreate config.h.in, aclocal.m4, configure, and Makefile.in
> > >
> > > [YOCTO #13779]
> > >
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ---
> > >  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(-)
> > >
> > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > index 4bd72dd37e..9cc261c314 100644
> > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > @@ -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()
> > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > index b0beafb38f..ec10149d34 100644
> > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > @@ -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))
> > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > index 809142559a..46398c7e2d 100644
> > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > @@ -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")
> > > --
> > > 2.25.0
> >
> > This breaks the SDK everywhere:
> >
> > 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.

>   https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html
Andre McCurdy Feb. 7, 2020, 6:47 p.m.
On Fri, Feb 7, 2020 at 10:28 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Fri, Feb 7, 2020 at 10:18 AM Andre McCurdy <armccurdy@gmail.com> wrote:
> >
> > On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > >
> > > On Tue, 2020-02-04 at 21:41 -0800, Khem Raj wrote:
> > > > since the versions of autotools might differ in OE especially
> > > > so recreate config.h.in, aclocal.m4, configure, and Makefile.in
> > > >
> > > > [YOCTO #13779]
> > > >
> > > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > > ---
> > > >  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(-)
> > > >
> > > > diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > > b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > > index 4bd72dd37e..9cc261c314 100644
> > > > --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > > +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> > > > @@ -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()
> > > > diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > > b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > > index b0beafb38f..ec10149d34 100644
> > > > --- a/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > > +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
> > > > @@ -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))
> > > > diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > > b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > > index 809142559a..46398c7e2d 100644
> > > > --- a/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > > +++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
> > > > @@ -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")
> > > > --
> > > > 2.25.0
> > >
> > > This breaks the SDK everywhere:
> > >
> > > 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

If only it was that easy! :-)