<div dir="ltr">If I apply this and then re-build guile I get this error:<div><br></div><div><div>ERROR: guile-2.0.12-r0 do_populate_sysroot: The recipe guile is trying to install files into a shared area when those files already exist. Those files and their manifest location are:</div><div> /data/poky-master/tmp-glibc/sysroots/intel-corei7-64/usr/bin/crossscripts/guile-config</div><div> Matched in b''</div></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 22 September 2016 at 10:33, <span dir="ltr"><<a href="mailto:zhe.he@windriver.com" target="_blank">zhe.he@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: "Tim K. Chan" <<a href="mailto:nirvanatk@gmail.com">nirvanatk@gmail.com</a>><br>
<br>
Signed-off-by: Tim K. Chan <<a href="mailto:nirvanatk@gmail.com">nirvanatk@gmail.com</a>><br>
[<br>
Adjust context<br>
Use Peter Kjellerstedt's simpler guile_cross_config<br>
]<br>
Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
---<br>
meta/classes/systemd.bbclass | 4 +--<br>
meta/classes/update-rc.d.<wbr>bbclass | 6 ++--<br>
.../resolvconf/<a href="http://resolvconf_1.79.bb" rel="noreferrer" target="_blank">resolvconf_1.<wbr>79.bb</a> | 2 +-<br>
meta/recipes-core/glibc/glibc-<wbr>package.inc | 2 +-<br>
meta/recipes-devtools/guile/<a href="http://guile_2.0.12.bb" rel="noreferrer" target="_blank">gu<wbr>ile_2.0.12.bb</a> | 37 ++++++++++++----------<br>
meta/recipes-devtools/rpm/<a href="http://rpm_5.4.16.bb" rel="noreferrer" target="_blank">rpm_<wbr>5.4.16.bb</a> | 13 ++++++--<br>
6 files changed, 39 insertions(+), 25 deletions(-)<br>
<br>
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass<br>
index db7873f..7370489 100644<br>
--- a/meta/classes/systemd.bbclass<br>
+++ b/meta/classes/systemd.bbclass<br>
@@ -28,7 +28,7 @@ if [ -n "$D" ]; then<br>
OPTS="--root=$D"<br>
fi<br>
<br>
-if type systemctl >/dev/null 2>/dev/null; then<br>
+if command -p systemctl >/dev/null 2>/dev/null; then<br>
systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}<br>
<br>
if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then<br>
@@ -44,7 +44,7 @@ if [ -n "$D" ]; then<br>
OPTS="--root=$D"<br>
fi<br>
<br>
-if type systemctl >/dev/null 2>/dev/null; then<br>
+if command -p systemctl >/dev/null 2>/dev/null; then<br>
if [ -z "$D" ]; then<br>
systemctl stop ${SYSTEMD_SERVICE}<br>
fi<br>
diff --git a/meta/classes/update-rc.d.<wbr>bbclass b/meta/classes/update-rc.d.<wbr>bbclass<br>
index 82b8024..dee80c8 100644<br>
--- a/meta/classes/update-rc.d.<wbr>bbclass<br>
+++ b/meta/classes/update-rc.d.<wbr>bbclass<br>
@@ -15,7 +15,7 @@ updatercd_preinst() {<br>
if [ -z "$D" -a -f "${INIT_D_DIR}/${INITSCRIPT_<wbr>NAME}" ]; then<br>
${INIT_D_DIR}/${INITSCRIPT_<wbr>NAME} stop<br>
fi<br>
-if type update-rc.d >/dev/null 2>/dev/null; then<br>
+if command -p update-rc.d >/dev/null 2>/dev/null; then<br>
if [ -n "$D" ]; then<br>
OPT="-f -r $D"<br>
else<br>
@@ -26,7 +26,7 @@ fi<br>
}<br>
<br>
updatercd_postinst() {<br>
-if type update-rc.d >/dev/null 2>/dev/null; then<br>
+if command -p update-rc.d >/dev/null 2>/dev/null; then<br>
if [ -n "$D" ]; then<br>
OPT="-r $D"<br>
else<br>
@@ -43,7 +43,7 @@ fi<br>
}<br>
<br>
updatercd_postrm() {<br>
-if type update-rc.d >/dev/null 2>/dev/null; then<br>
+if command -p update-rc.d >/dev/null 2>/dev/null; then<br>
if [ -n "$D" ]; then<br>
OPT="-f -r $D"<br>
else<br>
diff --git a/meta/recipes-connectivity/<wbr>resolvconf/<a href="http://resolvconf_1.79.bb" rel="noreferrer" target="_blank">resolvconf_1.79.bb</a> b/meta/recipes-connectivity/<wbr>resolvconf/<a href="http://resolvconf_1.79.bb" rel="noreferrer" target="_blank">resolvconf_1.79.bb</a><br>
index 8550177..e415445 100644<br>
--- a/meta/recipes-connectivity/<wbr>resolvconf/<a href="http://resolvconf_1.79.bb" rel="noreferrer" target="_blank">resolvconf_1.79.bb</a><br>
+++ b/meta/recipes-connectivity/<wbr>resolvconf/<a href="http://resolvconf_1.79.bb" rel="noreferrer" target="_blank">resolvconf_1.79.bb</a><br>
@@ -56,7 +56,7 @@ do_install () {<br>
<br>
pkg_postinst_${PN} () {<br>
if [ -z "$D" ]; then<br>
- if command -v systemd-tmpfiles >/dev/null; then<br>
+ if command -p systemd-tmpfiles >/dev/null; then<br>
systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/<wbr>resolvconf.conf<br>
elif [ -e ${sysconfdir}/init.d/populate-<wbr>volatile.sh ]; then<br>
${sysconfdir}/init.d/populate-<wbr>volatile.sh update<br>
diff --git a/meta/recipes-core/glibc/<wbr>glibc-package.inc b/meta/recipes-core/glibc/<wbr>glibc-package.inc<br>
index 6df8b9e..557f32a 100644<br>
--- a/meta/recipes-core/glibc/<wbr>glibc-package.inc<br>
+++ b/meta/recipes-core/glibc/<wbr>glibc-package.inc<br>
@@ -206,7 +206,7 @@ glibc_package_preprocess () {<br>
<br>
pkg_postinst_nscd () {<br>
if [ -z "$D" ]; then<br>
- if command -v systemd-tmpfiles >/dev/null; then<br>
+ if command -p systemd-tmpfiles >/dev/null; then<br>
systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.<wbr>conf<br>
elif [ -e ${sysconfdir}/init.d/populate-<wbr>volatile.sh ]; then<br>
${sysconfdir}/init.d/populate-<wbr>volatile.sh update<br>
diff --git a/meta/recipes-devtools/guile/<a href="http://guile_2.0.12.bb" rel="noreferrer" target="_blank"><wbr>guile_2.0.12.bb</a> b/meta/recipes-devtools/guile/<a href="http://guile_2.0.12.bb" rel="noreferrer" target="_blank"><wbr>guile_2.0.12.bb</a><br>
index d2fe511..a466d65 100644<br>
--- a/meta/recipes-devtools/guile/<a href="http://guile_2.0.12.bb" rel="noreferrer" target="_blank"><wbr>guile_2.0.12.bb</a><br>
+++ b/meta/recipes-devtools/guile/<a href="http://guile_2.0.12.bb" rel="noreferrer" target="_blank"><wbr>guile_2.0.12.bb</a><br>
@@ -87,22 +87,27 @@ SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"<br>
<br>
guile_cross_config() {<br>
# this is only for target recipe<br>
- if [ "${PN}" = "guile" ]<br>
- then<br>
- # Create guile-config returning target values instead of native values<br>
- install -d ${SYSROOT_DESTDIR}${STAGING_<wbr>BINDIR_CROSS}<br>
- echo '#!'`which ${BUILD_SYS}-guile`$' \\\n--no-auto-compile -e main -s\n!#\n(define %guile-build-info '\'\( \<br>
- > ${B}/guile-config.cross<br>
- sed -n -e 's:^[ \t]*{[ \t]*": (:' \<br>
- -e 's:",[ \t]*": . ":' \<br>
- -e 's:" *}, *\\:"):' \<br>
- -e 's:^.*cachedir.*$::' \<br>
- -e '/^ (/p' \<br>
- < ${B}/libguile/libpath.h >> ${B}/guile-config.cross<br>
- echo '))' >> ${B}/guile-config.cross<br>
- cat ${B}/meta/guile-config >> ${B}/guile-config.cross<br>
- install ${B}/guile-config.cross ${STAGING_BINDIR_CROSS}/guile-<wbr>config<br>
- fi<br>
+ [ "${PN}" = "${BPN}" ] || return 0<br>
+<br>
+ vars=$(sed -n -e 's:^[ \t]*{[ \t]*": (:' \<br>
+ -e 's:",[ \t]*": . ":' \<br>
+ -e 's:" *}, *\\:"):' \<br>
+ -e 's:^.*cachedir.*$::' \<br>
+ -e '/^ (/p' \<br>
+ < ${B}/libguile/libpath.h)<br>
+<br>
+ # Create guile-config returning target values instead of native values<br>
+ install -d ${SYSROOT_DESTDIR}${bindir_<wbr>crossscripts}<br>
+ cat <<EOF >${B}/guile-config.cross<br>
+#!$(which ${BUILD_SYS}-guile) \\<br>
+--no-auto-compile -e main -s<br>
+!#<br>
+(define %guile-build-info '(<br>
+$vars<br>
+))<br>
+EOF<br>
+ cat ${B}/meta/guile-config >> ${B}/guile-config.cross<br>
+ install ${B}/guile-config.cross ${SYSROOT_DESTDIR}${bindir_<wbr>crossscripts}/guile-config<br>
}<br>
<br>
# Guile needs the compiled files to be newer than the source, and it won't<br>
diff --git a/meta/recipes-devtools/rpm/<a href="http://rpm_5.4.16.bb" rel="noreferrer" target="_blank">rp<wbr>m_5.4.16.bb</a> b/meta/recipes-devtools/rpm/<a href="http://rpm_5.4.16.bb" rel="noreferrer" target="_blank">rp<wbr>m_5.4.16.bb</a><br>
index 84adef6..be3b942 100644<br>
--- a/meta/recipes-devtools/rpm/<a href="http://rpm_5.4.16.bb" rel="noreferrer" target="_blank">rp<wbr>m_5.4.16.bb</a><br>
+++ b/meta/recipes-devtools/rpm/<a href="http://rpm_5.4.16.bb" rel="noreferrer" target="_blank">rp<wbr>m_5.4.16.bb</a><br>
@@ -554,13 +554,22 @@ do_install_append() {<br>
install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_<wbr>rpmdeps.sh<br>
<br>
# Remove unpackaged files (based on list in rpm.spec)<br>
- rm -f ${D}/${libdir}/rpm/{Specfile.<wbr>pm,cpanflute,cpanflute2,<wbr>rpmdiff,rpmdiff.cgi,sql.prov,<wbr>sql.req,tcl.req,trpm}<br>
+ rm -f ${D}/${libdir}/rpm/Specfile.pm<br>
+ rm -f ${D}/${libdir}/rpm/cpanflute<br>
+ rm -f ${D}/${libdir}/rpm/cpanflute2<br>
+ rm -f ${D}/${libdir}/rpm/rpmdiff<br>
+ rm -f ${D}/${libdir}/rpm/rpmdiff.cgi<br>
+ rm -f ${D}/${libdir}/rpm/sql.prov<br>
+ rm -f ${D}/${libdir}/rpm/sql.req<br>
+ rm -f ${D}/${libdir}/rpm/tcl.req<br>
+ rm -f ${D}/${libdir}/rpm/trpm<br>
<br>
rm -f ${D}/${mandir}/man8/rpmcache.<wbr>8*<br>
rm -f ${D}/${mandir}/man8/rpmgraph.<wbr>8*<br>
rm -f ${D}/${mandir}/*/man8/<wbr>rpmcache.8*<br>
rm -f ${D}/${mandir}/*/man8/<wbr>rpmgraph.8*<br>
- rm -rf ${D}/${mandir}/{fr,ko}<br>
+ rm -rf ${D}/${mandir}/fr<br>
+ rm -rf ${D}/${mandir}/ko<br>
<br>
rm -f ${D}/${includedir}/popt.h<br>
rm -f ${D}/${libdir}/libpopt.*<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.8.1<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>