diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2018-04-25 14:06:48 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-15 11:00:31 +0100 |
| commit | 386c183971929e5440cb3fa957d3ce8a93943b4f (patch) | |
| tree | 9756d0c3a2a7e1803141bc60e0e161daa4225c1e | |
| parent | d75c28fc0b4b16eb75e9c68d9d6224a0d782607e (diff) | |
| download | openembedded-core-contrib-386c183971929e5440cb3fa957d3ce8a93943b4f.tar.gz | |
test-dependencies.sh: remove /sysroots* between component builds
* 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.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rwxr-xr-x | scripts/test-dependencies.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh index 0b94de8608..3fb74e1762 100755 --- a/scripts/test-dependencies.sh +++ b/scripts/test-dependencies.sh @@ -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 |