summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Schröter <adrian@suse.de>2014-11-03 10:13:13 (GMT)
committerAdrian Schröter <adrian@suse.de>2014-11-03 10:13:13 (GMT)
commit97c93b03ee656507db9e2418f3e1b1987d939b46 (patch)
treeb2495ff0c9dbfd3fa0b93f0d87da0ed9a02ad5ec
parentdafe67336672360deec05588173653813bedbcfc (diff)
downloadobs-build-master.tar.gz
obs-build-master.tar.xz
- fix kiwi failure on second run in existing envHEADmaster
-rw-r--r--build-recipe-kiwi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-recipe-kiwi b/build-recipe-kiwi
index 7c18460..64825f2 100644
--- a/build-recipe-kiwi
+++ b/build-recipe-kiwi
@@ -347,7 +347,7 @@ build_kiwi_appliance() {
for imgtype in $imagetype ; do
echo "running kiwi --prepare for $imgtype..."
# Do not use $BUILD_USER here, since we always need root permissions
- $CHROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT-$imgtype $KIWI_PARAMETERS" - root < /dev/null || cleanup_and_exit 1
+ $CHROOT su -c "cd $TOPDIR/SOURCES && rm -rf $TOPDIR/KIWIROOT-$imgtype && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT-$imgtype $KIWI_PARAMETERS" - root < /dev/null || cleanup_and_exit 1
echo "running kiwi --create for $imgtype..."
mkdir -p $BUILD_ROOT/$TOPDIR/KIWI-$imgtype
$CHROOT su -c "cd $TOPDIR/SOURCES && kiwi --create $TOPDIR/KIWIROOT-$imgtype --logfile terminal --type $imgtype -d $TOPDIR/KIWI-$imgtype $KIWI_PARAMETERS" - root < /dev/null || cleanup_and_exit 1