siteinfo: fix siteinfo_get_files to work with RSS

PATCH In review [email protected] 2 participants 8 messages May 31, 2017 – Jul 25, 2017

lore

Share & tools

lore

[email protected]

author

2017-05-31 08:27 UTC #0 lore raw

cover siteinfo: fix siteinfo_get_files to work with RSS

From: Jackie Huang <[email protected]>

--
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(-)

Signature · 1 line

2.11.0

[email protected]

author

2017-05-31 08:27 UTC #1 lore raw

PATCH 1/2 ncurses: add SYSROOT_DESTDIR for siteconfig_gencache

From: Jackie Huang <[email protected]>

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 <[email protected]>

---
 meta/recipes-core/ncurses/ncurses.inc | 2 ++
 1 file changed, 2 insertions(+)

meta/recipes-core/ncurses/ncurses.inc +2 -0

index 8990b0f5ef..1f21cd413d 100644
@@ -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?

Signature · 1 line

2.11.0

Burton, Ross

2017-06-15 12:31 UTC #2 lore raw

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

Quoted 2 lines · On 31 May 2017 at 09:27, <[email protected]> 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

Huang, Jie (Jackie)

author

2017-06-16 01:57 UTC #3 lore raw

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

Quoted 9 lines

From: Burton, Ross [mailto:[email protected]]
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

Quoted 4 lines

On 31 May 2017 at 09:27, <[email protected]> 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

Quoted 3 lines

Ross

Huang, Jie (Jackie)

author

2017-06-30 01:03 UTC #4 lore raw

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

Quoted 22 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] 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
Quoted 7 lines
From: Burton, Ross [mailto:[email protected]]
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
Quoted 2 lines

Quoted 6 lines

Quoted 2 lines · On 31 May 2017 at 09:27, <[email protected]> wrote:
+EXTRASITECONFIG = "CFLAGS='${CFLAGS} -
I${SYSROOT_DESTDIR}${includedir}'"
Quoted 2 lines
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

Quoted 31 lines

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
Quoted 3 lines
Ross
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Huang, Jie (Jackie)

author

2017-07-25 06:38 UTC #5 lore raw

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

In reply to Huang, Jie (Jackie)

Quoted 8 lines

Quoted 8 lines
Quoted 6 lines · On 31 May 2017 at 09:27, <[email protected]> wrote:
+EXTRASITECONFIG = "CFLAGS='${CFLAGS} -
I${SYSROOT_DESTDIR}${includedir}'"
Quoted 1 line

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Why is this ncurses specific, it sounds like something which will impact all
users
Quoted 1 line
of siteconfig?
Ping.
Is my explanation clear enough? What's the suggestion if it's not acceptable?

Ping.

Thanks,
Jackie

Quoted 35 lines

Thanks,
Jackie
Quoted 31 lines
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
Quoted 3 lines
Ross
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[email protected]

author

2017-05-31 08:27 UTC #6 lore raw

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

In reply to [email protected]

From: Jackie Huang <[email protected]>

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 <[email protected]>

---
 meta/classes/autotools.bbclass |  2 +-
 meta/classes/siteinfo.bbclass  | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

meta/classes/autotools.bbclass +1 -1

index ac04a07cb5..efa4098d63 100644
@@ -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"

meta/classes/siteinfo.bbclass +4 ~~-11~~

index 2c33732be3..e8e2644684 100644
@@ -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"):

Signature · 1 line

2.11.0

Huang, Jie (Jackie)

author

2017-06-15 05:47 UTC #7 lore raw

In reply to [email protected]

Ping.

Quoted 39 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: Wednesday, May 31, 2017 16:27
To: [email protected]
Subject: [OE-core] [PATCH 0/2] siteinfo: fix siteinfo_get_files to work with RSS
From: Jackie Huang <[email protected]>
--
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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core