[OE-core] [PATCH 2/2] oeqa: autoreconf cpio before building

[Andre McCurdy]

On Fri, Feb 7, 2020 at 10:28 AM Khem Raj <raj.khem at gmail.com> wrote:
>
> On Fri, Feb 7, 2020 at 10:18 AM Andre McCurdy <armccurdy at gmail.com> wrote:
> >
> > On Fri, Feb 7, 2020 at 10:09 AM Richard Purdie
> > <richard.purdie at 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 at 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! :-)