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:01:17 +0100 |
commit | 6b3b9062e312fbe979b4509c79c410e17f6fce8e (patch) | |
tree | eb4e9a85f86fbe33b59501a9b9e490359e28a2bc | |
parent | 3af875b26b48c24f6533dc0d57f888711362f7f2 (diff) | |
download | poky-6b3b9062e312fbe979b4509c79c410e17f6fce8e.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.
(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>
-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() { | |||
163 | fi | 163 | fi |
164 | if [ "${TYPE}" != "2" ] ; then | 164 | if [ "${TYPE}" != "2" ] ; then |
165 | echo "!!!Removing tmpdir \"$tmpdir\"!!!" | 165 | echo "!!!Removing tmpdir \"$tmpdir\"!!!" |
166 | rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots $tmpdir/work $tmpdir/work-shared 2>/dev/null | 166 | rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots* $tmpdir/work $tmpdir/work-shared 2>/dev/null |
167 | fi | 167 | fi |
168 | i=1 | 168 | i=1 |
169 | count=`cat $recipes ${OUTPUT1}/failed-recipes.log | sort -u | wc -l` | 169 | count=`cat $recipes ${OUTPUT1}/failed-recipes.log | sort -u | wc -l` |
@@ -185,7 +185,7 @@ build_every_recipe() { | |||
185 | mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/ok/ | 185 | mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/ok/ |
186 | fi | 186 | fi |
187 | if [ "${TYPE}" != "2" ] ; then | 187 | if [ "${TYPE}" != "2" ] ; then |
188 | rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots $tmpdir/work $tmpdir/work-shared 2>/dev/null | 188 | rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots* $tmpdir/work $tmpdir/work-shared 2>/dev/null |
189 | fi | 189 | fi |
190 | i=`expr $i + 1` | 190 | i=`expr $i + 1` |
191 | done | 191 | done |