Backports for morty

The following changes since commit 7b7cbba0bb93893029118e5798ec5831838a5bd9:

sanity.bbclass: Improved error message (2018-04-05 15:22:59 +0100)

are available in the Git repository at:

git://git.openembedded.org/openembedded-core-contrib jansa/morty-backports
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=jansa/morty-backports

Martin Jansa (3):
sstate-sysroot-cruft.sh: Extend the whitelist sstate-diff-machines.sh: Replace MACHINE_ARCH only at the beginning
and separated with dash
test-dependencies.sh: remove /sysroots* between component builds

 scripts/sstate-diff-machines.sh | 2 +-
 scripts/sstate-sysroot-cruft.sh | 2 ++
 scripts/test-dependencies.sh    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

2.17.0

* add more php5 entries

---
 scripts/sstate-sysroot-cruft.sh | 2 ++
 1 file changed, 2 insertions(+)

index b6166aa1b2..d9917f5152 100755
@@ -105,7 +105,9 @@ WHITELIST="${WHITELIST} \
 
 # generated by php
 WHITELIST="${WHITELIST} \
+  .*/usr/lib/php5/php/.channels \
   .*/usr/lib/php5/php/.channels/.* \
+  .*/usr/lib/php5/php/.registry \
   .*/usr/lib/php5/php/.registry/.* \
   .*/usr/lib/php5/php/.depdb \
   .*/usr/lib/php5/php/.depdblock \

2.17.0

* I had some components where the MACHINE name was also included in PV of allarch recipe which was tripping the script into saying that they have different signatures (because for one MACHINE was the string in PV replaced with 'MACHINE' and not for other MACHINEs

---
 scripts/sstate-diff-machines.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 056aa0a04c..27c6a33006 100755
@@ -118,7 +118,7 @@ for M in ${machines}; do
     cp -ra ${tmpdir}/stamps/* ${OUTPUT}/${M}
     find ${OUTPUT}/${M} -name \*sigdata\* | sed "s#${OUTPUT}/${M}/##g" | sort > ${OUTPUT}/${M}/list
     M_UNDERSCORE=`echo ${M} | sed 's/-/_/g'`
-    sed "s/${M_UNDERSCORE}/MACHINE/g; s/${M}/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M
+    sed "s/^${M_UNDERSCORE}-/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M
     find ${tmpdir}/stamps/ -name \*sigdata\* | xargs rm -f
   else
     printf "ERROR: no sigdata files were generated for MACHINE $M in ${tmpdir}/stamps\n";

2.17.0

* glibc is now the only component in morty release which is using TMPDIR/sysroots-components (normally used only after RSS):
oe-core$ git grep "\${STAGING_DIR}-components"
meta/recipes-core/glibc/glibc-locale.inc:LOCALETREESRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale" meta/recipes-core/glibc/glibc-mtrace.inc:SRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale/scripts" meta/recipes-core/glibc/glibc-package.inc:do_stash_locale[sstate-outputdirs] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale" meta/recipes-core/glibc/glibc-package.inc:do_stash_locale[sstate-fixmedir] = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale" meta/recipes-core/glibc/glibc-scripts.inc:SRC = "${STAGING_DIR}-components/${PACKAGE_ARCH}/glibc-stash-locale/scripts"

test-dependencies selective pruning of TMPDIR, deletes sysroots, but not sysroots-components

which leaves TMPDIR/sysroots-components files from qlibc.do_stash_locale behind and when next build started in the same workspace it failed, because it was trying to overwrite files already there.

---
 scripts/test-dependencies.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 0b94de8608..3fb74e1762 100755
@@ -163,7 +163,7 @@ build_every_recipe() {
   fi
   if [ "${TYPE}" != "2" ] ; then
     echo "!!!Removing tmpdir \"$tmpdir\"!!!"
-    rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots $tmpdir/work $tmpdir/work-shared 2>/dev/null
+    rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots* $tmpdir/work $tmpdir/work-shared 2>/dev/null
   fi
   i=1
   count=`cat $recipes ${OUTPUT1}/failed-recipes.log | sort -u | wc -l`

@@ -185,7 +185,7 @@ build_every_recipe() {
       mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/ok/
     fi
     if [ "${TYPE}" != "2" ] ; then
-      rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots $tmpdir/work $tmpdir/work-shared 2>/dev/null
+      rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots* $tmpdir/work $tmpdir/work-shared 2>/dev/null
     fi
     i=`expr $i + 1`
   done

2.17.0

== Series Details ==

Series: Backports for morty (rev3)
Revision: 3
URL : https://patchwork.openembedded.org/series/8870/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Patch            [morty, 2/3] sstate-diff-machines.sh: Replace MACHINE_ARCH only at the beginning and separated with dash
 Issue             Commit shortlog is too long [test_shortlog_length] 
  Suggested fix    Edit shortlog so that it is 90 characters or less (currently 91 characters)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe