netcf: fix gnulib not found in sysroots while using a shared sstate cache

The following changes since commit 3c5bd3a077d04c140d774d258ac9f2652dda2669:

phpmyadmin: update to 4.1.9 (2014-03-17 10:46:59 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-netcf
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-netcf

Hongxu Jia (1):
netcf: fix gnulib not found in sysroots while using a shared sstate
cache

 meta-networking/recipes-support/netcf/gnulib_git.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

1.8.1.2

...
./bootstrap: Bootstrapping from checked-out netcf sources... ./bootstrap: consider installing git-merge-changelog from gnulib ./bootstrap: line 641:
tmp/sysroots/qemux86/usr/share/gnulib/gnulib-tool: No such file or directory
...

The gnulib source was incorrectly populated to ${STAGING_DATADIR}. While the build shared an existed sstate cache, the gnulib's ${SYSROOT_DESTDIR} was empty, the gnulib source code was not found in sysroots.

We should use do_install task to install them to ${D}, and the default do_populate_sysroot task will populate them to ${STAGING_DATADIR}.

---
 meta-networking/recipes-support/netcf/gnulib_git.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

index 730f5cd..1da6c83 100644
@@ -16,18 +16,15 @@ SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \
 "
 S = "${WORKDIR}/git"
 
-# Git clone a copy of gnulib source to the staging data dir
-sysroot_stage_all () {
-    [ -d ${STAGING_DATADIR}/gnulib/ ] && rm -rf ${STAGING_DATADIR}/gnulib/
+do_install () {
     cd ${S}
     git checkout master
-    git clone ${S} ${STAGING_DATADIR}/gnulib
+    git clone ${S} ${D}/${datadir}/gnulib
 }
 
 do_patch[noexec] = "1"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
-do_install[noexec] = "1"
 do_package[noexec] = "1"
 do_packagedata[noexec] = "1"
 do_package_write_ipk[noexec] = "1"

1.8.1.2

Merged, thanks.
-J.

-Joe MacDonald.
:wq