[PATCH 0/2] siteinfo: fix siteinfo_get_files to work with RSS

[PATCH 0/2] siteinfo: fix siteinfo_get_files to work with RSS

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

--
The following changes since commit 4aa6cdfe9f069ecd976c1257702fe8ff28c57f07:

  tune-mips32*.inc: use consistent comments across all three .inc files (2017-05-30 10:14:33 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib.git jhuang0/d_siteinfo_170531_0
  http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_siteinfo_170531_0

Jackie Huang (2):
  ncurses: add SYSROOT_DESTDIR for siteconfig_gencache
  siteinfo: fix siteinfo_get_files to work with RSS

 meta/classes/autotools.bbclass        |  2 +-
 meta/classes/siteinfo.bbclass         | 15 ++++-----------
 meta/recipes-core/ncurses/ncurses.inc |  2 ++
 3 files changed, 7 insertions(+), 12 deletions(-)

-- 
2.11.0

[PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

After switching to Recipe Specific Sysroots, ncurses
will not be populated in its own sysroots, then
siteconfig_gencache fails to find some headers,
so add ${SYSROOT_DESTDIR}/${includedir} into the
search list to fix the issue.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-core/ncurses/ncurses.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 8990b0f5ef..1f21cd413d 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -18,6 +18,8 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ncurses.git"
 EXTRA_AUTORECONF = "-I m4"
 CONFIG_SITE =+ "${WORKDIR}/config.cache"
 
+EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
+
 # Whether to enable separate widec libraries; must be 'true' or 'false'
 #
 # TODO: remove this variable when widec is supported in every setup?
-- 
2.11.0

[PATCH 2/2] siteinfo: fix siteinfo_get_files to work with RSS

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

The siteconfig cache files in ACLOCALDIR setup by autotools.bbclass
has been dropped after switching to RSS, so change the siteconfig
search path back to SITECONFIG_SYSROOTCACHE and the parameter
name changed from aclocalcache to sysrootcache.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/classes/autotools.bbclass |  2 +-
 meta/classes/siteinfo.bbclass  | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index ac04a07cb5..efa4098d63 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -141,7 +141,7 @@ ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/"
 
 python autotools_aclocals () {
     # Refresh variable with cache files
-    d.setVar("CONFIG_SITE", siteinfo_get_files(d, aclocalcache=True))
+    d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True))
 }
 
 CONFIGURE_FILES = "${S}/configure.in ${S}/configure.ac ${S}/config.h.in ${S}/acinclude.m4 Makefile.am"
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 2c33732be3..e8e2644684 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -159,7 +159,7 @@ python () {
         bb.fatal("Please add your architecture to siteinfo.bbclass")
 }
 
-def siteinfo_get_files(d, aclocalcache = False):
+def siteinfo_get_files(d, sysrootcache = False):
     sitedata = siteinfo_data(d)
     sitefiles = ""
     for path in d.getVar("BBPATH").split(":"):
@@ -168,18 +168,11 @@ def siteinfo_get_files(d, aclocalcache = False):
             if os.path.exists(filename):
                 sitefiles += filename + " "
 
-    if not aclocalcache:
+    if not sysrootcache:
         return sitefiles
 
-    # Now check for siteconfig cache files in the directory setup by autotools.bbclass to
-    # avoid races.
-    #
-    # ACLOCALDIR may or may not exist so cache should only be set to True from autotools.bbclass
-    # after files have been copied into this location. To do otherwise risks parsing/signature
-    # issues and the directory being created/removed whilst this code executes. This can happen
-    # when a multilib recipe is parsed along with its base variant which may be running at the time
-    # causing rare but nasty failures
-    path_siteconfig = d.getVar('ACLOCALDIR')
+    # Now check for siteconfig cache files in sysroots
+    path_siteconfig = d.getVar('SITECONFIG_SYSROOTCACHE')
     if path_siteconfig and os.path.isdir(path_siteconfig):
         for i in os.listdir(path_siteconfig):
             if not i.endswith("_config"):
-- 
2.11.0

Re: [PATCH 0/2] siteinfo: fix siteinfo_get_files to work with RSS

[Huang, Jie (Jackie)]

Ping.

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> jackie.huang@windriver.com
> Sent: Wednesday, May 31, 2017 16:27
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 0/2] siteinfo: fix siteinfo_get_files to work with RSS
> 
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> --
> The following changes since commit
> 4aa6cdfe9f069ecd976c1257702fe8ff28c57f07:
> 
>   tune-mips32*.inc: use consistent comments across all three .inc files (2017-05-
> 30 10:14:33 +0100)
> 
> are available in the git repository at:
> 
>   git://git.pokylinux.org/poky-contrib.git jhuang0/d_siteinfo_170531_0
>   http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_siteinfo_170531_0
> 
> Jackie Huang (2):
>   ncurses: add SYSROOT_DESTDIR for siteconfig_gencache
>   siteinfo: fix siteinfo_get_files to work with RSS
> 
>  meta/classes/autotools.bbclass        |  2 +-
>  meta/classes/siteinfo.bbclass         | 15 ++++-----------
>  meta/recipes-core/ncurses/ncurses.inc |  2 ++
>  3 files changed, 7 insertions(+), 12 deletions(-)
> 
> --
> 2.11.0
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

On 31 May 2017 at 09:27, <jackie.huang@windriver.com> wrote:

> +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
>

Why is this ncurses specific, it sounds like something which will impact
all users of siteconfig?

Ross

[-- Attachment #2: Type: text/html, Size: 689 bytes --]

Re: [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[Huang, Jie (Jackie)]

> 
> 
> From: Burton, Ross [mailto:ross.burton@intel.com] 
> Sent: Thursday, June 15, 2017 20:31
> To: Huang, Jie (Jackie)
> Cc: OE-core
> Subject: Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache
> 
> 
> On 31 May 2017 at 09:27, <jackie.huang@windriver.com> wrote:
> +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
> 
> Why is this ncurses specific, it sounds like something which will impact all users of siteconfig?

My original issue is not ncurses specific, that is:
After switching to RSS, the siteconfig cache files in ACLOCALDIR setup by autotools.bbclass was dropped, so searching
the path ACLOCALDIR for siteconfig files ended up with nothing, which caused some package (like openhpi) fail to configure, 
so the "PATCH 2/2" change it back to search SITECONFIG_SYSROOTCACHE.

But I met the second issue after the that:
util-linux depends on ncurses but the siteinfo in ncurses_config which is populated to SITECONFIG_SYSROOTCACHE  is not correct:
ac_cv_header_curses_h=${ac_cv_header_curses_h=no}
ac_cv_header_ncurses_h=${ac_cv_header_ncurses_h=no}

then it fails to build (it should be the same issue for other package that depend on ncurses), so this patch is needed.
And the patch will only impact the packages that depend on ncurses, for those without dependency on ncurses, there 
is no ncurses_config at all in their own recipe-sysroot.

Thanks,
Jackie

> 
> Ross
>

Re: [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[Huang, Jie (Jackie)]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Huang, Jie (Jackie)
> Sent: Friday, June 16, 2017 09:58
> To: BURTON, ROSS
> Cc: OE-core
> Subject: Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for
> siteconfig_gencache
> 
> >
> >
> > From: Burton, Ross [mailto:ross.burton@intel.com]
> > Sent: Thursday, June 15, 2017 20:31
> > To: Huang, Jie (Jackie)
> > Cc: OE-core
> > Subject: Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for
> siteconfig_gencache
> >
> >
> > On 31 May 2017 at 09:27, <jackie.huang@windriver.com> wrote:
> > +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -
> I${SYSROOT_DESTDIR}${includedir}'"
> >
> > Why is this ncurses specific, it sounds like something which will impact all users
> of siteconfig?

Ping.

Is my explanation clear enough? What's the suggestion if it's not acceptable?

Thanks,
Jackie

> 
> My original issue is not ncurses specific, that is:
> After switching to RSS, the siteconfig cache files in ACLOCALDIR setup by
> autotools.bbclass was dropped, so searching
> the path ACLOCALDIR for siteconfig files ended up with nothing, which caused
> some package (like openhpi) fail to configure,
> so the "PATCH 2/2" change it back to search SITECONFIG_SYSROOTCACHE.
> 
> But I met the second issue after the that:
> util-linux depends on ncurses but the siteinfo in ncurses_config which is
> populated to SITECONFIG_SYSROOTCACHE  is not correct:
> ac_cv_header_curses_h=${ac_cv_header_curses_h=no}
> ac_cv_header_ncurses_h=${ac_cv_header_ncurses_h=no}
> 
> then it fails to build (it should be the same issue for other package that depend
> on ncurses), so this patch is needed.
> And the patch will only impact the packages that depend on ncurses, for those
> without dependency on ncurses, there
> is no ncurses_config at all in their own recipe-sysroot.
> 
> Thanks,
> Jackie
> 
> >
> > Ross
> >
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

[Huang, Jie (Jackie)]

> > >
> > >
> > > On 31 May 2017 at 09:27, <jackie.huang@windriver.com> wrote:
> > > +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -
> > I${SYSROOT_DESTDIR}${includedir}'"
> > >
> > > Why is this ncurses specific, it sounds like something which will impact all
> users
> > of siteconfig?
> 
> Ping.
> 
> Is my explanation clear enough? What's the suggestion if it's not acceptable?

Ping.

Thanks,
Jackie

> 
> Thanks,
> Jackie
> 
> >
> > My original issue is not ncurses specific, that is:
> > After switching to RSS, the siteconfig cache files in ACLOCALDIR setup by
> > autotools.bbclass was dropped, so searching
> > the path ACLOCALDIR for siteconfig files ended up with nothing, which caused
> > some package (like openhpi) fail to configure,
> > so the "PATCH 2/2" change it back to search SITECONFIG_SYSROOTCACHE.
> >
> > But I met the second issue after the that:
> > util-linux depends on ncurses but the siteinfo in ncurses_config which is
> > populated to SITECONFIG_SYSROOTCACHE  is not correct:
> > ac_cv_header_curses_h=${ac_cv_header_curses_h=no}
> > ac_cv_header_ncurses_h=${ac_cv_header_ncurses_h=no}
> >
> > then it fails to build (it should be the same issue for other package that depend
> > on ncurses), so this patch is needed.
> > And the patch will only impact the packages that depend on ncurses, for those
> > without dependency on ncurses, there
> > is no ncurses_config at all in their own recipe-sysroot.
> >
> > Thanks,
> > Jackie
> >
> > >
> > > Ross
> > >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core