MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

test-dependencies.sh: remove /sysroots* between component builds

Browse Source 
* 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.

(From OE-Core rev: 386c183971929e5440cb3fa957d3ce8a93943b4f)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2018-04-25 14:06:48 +00:00 committed by Richard Purdie
parent 3af875b26b
commit 6b3b9062e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/test-dependencies.sh
View File

@ -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