- almost there...

diff --git a/build b/build
index 3f28e6a..42894fa 100755 (executable)
--- a/build
+++ b/build
@@ -942,7 +942,11 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        if ! test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
            rm -rf $BUILD_ROOT/.build-srcdir
            mkdir $BUILD_ROOT/.build-srcdir
-           cp -p "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
+           if test "$BUILDTYPE" = kiwi ; then
+               cp -a "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
+           else
+               cp -p "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
+           fi
            MYSRCDIR=$BUILD_ROOT/.build-srcdir
        fi
        Q="'\''"
@@ -1297,8 +1301,8 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     fi
 
     if test "$BUILDTYPE" = kiwi ; then
-       chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile /.build.log.prepare --root $TOPDIR/KIWIROOT" - $BUILD_USER < /dev/null && BUILD_SUCCEDED=true
-       chroot $BUILD_ROOT su -c "kiwi --create $TOPDIR/KIWIROOT --logfile /.build.log -d $TOPDIR/KIWI --type iso" - $BUILD_USER < /dev/null && BUILD_SUCCEDED=true
+       chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare $TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT" - $BUILD_USER < /dev/null && BUILD_SUCCEDED=true
+       chroot $BUILD_ROOT su -c "kiwi --create $TOPDIR/KIWIROOT --logfile terminal -d $TOPDIR/KIWI --type iso" - $BUILD_USER < /dev/null && BUILD_SUCCEDED=true
     fi
 
     test "$BUILD_SUCCEDED" = true || cleanup_and_exit 1

diff --git a/expanddeps b/expanddeps
index bd1fe3e..15e3fca 100755 (executable)
--- a/expanddeps
+++ b/expanddeps
@@ -215,7 +215,7 @@ if ($spec) {
   if ($spec =~ /\.kiwi$/) {
     # just set up kiwi root for now
     $d = {
-      'deps' => [ 'kiwi', 'zypper', 'createrepo' ],
+      'deps' => [ 'kiwi', 'zypper', 'createrepo', 'squashfs' ],
       'subpacks' => [],
     };
   } else {