- support preinstal limage creation/unpacking

diff --git a/build b/build
index 1a67b1e..200d585 100755 (executable)
--- a/build
+++ b/build
@@ -406,8 +406,8 @@ setupccache()
 setupicecream()
 {
     if [ "$icecream" -eq 0 ]; then
-       rm -rf "$BUILD_ROOT"/var/run/icecream
-       rm -f "$BUILD_ROOT"/etc/profile.d/build_icecream.sh
+       rm -rf "$BUILD_ROOT/var/run/icecream"
+       rm -f "$BUILD_ROOT/etc/profile.d/build_icecream.sh"
        return
     fi
 
@@ -437,8 +437,8 @@ setupicecream()
        -o "$BUILD_ROOT/usr/bin/as" -nt "$BUILD_ROOT/$icecc_vers" \
        -o "$BUILD_ROOT/lib/libc.so.6" -nt "$BUILD_ROOT/$icecc_vers" ]
     then
-       rm -rf $BUILD_ROOT/var/run/icecream
-       mkdir -p $BUILD_ROOT/var/run/icecream
+       rm -rf "$BUILD_ROOT/var/run/icecream"
+       mkdir -p "$BUILD_ROOT/var/run/icecream"
        if [ -e "$BUILD_ROOT"/usr/bin/create-env ]; then
          createenv=/usr/bin/create-env
        elif [ -e "$BUILD_ROOT"/usr/lib/icecc/icecc-create-env ]; then
@@ -528,8 +528,8 @@ create_baselibs()
        # use external version
        whichone=" (external)"
        mkbaselibs="/.mkbaselibs/mkbaselibs"
-       rm -rf $BUILD_ROOT/.mkbaselibs
-       mkdir -p $BUILD_ROOT/.mkbaselibs
+       rm -rf "$BUILD_ROOT/.mkbaselibs"
+       mkdir -p "$BUILD_ROOT/.mkbaselibs"
        cp -f $BUILD_DIR/mkbaselibs $BUILD_ROOT/.mkbaselibs/
        if test "$BUILDTYPE" == "dsc" ; then
            cp -f $BUILD_DIR/baselibs_global-deb.conf $BUILD_ROOT/.mkbaselibs/baselibs_g.conf
@@ -551,7 +551,7 @@ create_baselibs()
     do
        chroot $BUILD_ROOT su -c "$mkbaselibs $BASELIBS_GLOBAL $BASELIBS_CFG $line" - $BUILD_USER || cleanup_and_exit 1
     done < <(IFS=$'\n'; echo "${pkgs[*]#$BUILD_ROOT}" | xargs -n 1024)
-    rm -rf $BUILD_ROOT/.mkbaselibs
+    rm -rf "$BUILD_ROOT/.mkbaselibs"
 }
 
 copy_oldpackages()
@@ -720,11 +720,11 @@ mkdir_build_root()
        cleanup_and_exit 3
     fi
 
-    rm -rf "$BUILD_ROOT"/.build.packages
+    rm -rf "$BUILD_ROOT/.build.packages"
     if [ -z "$VM_TYPE" -a -z "$RUNNING_IN_VM" ]; then
        # don't touch this in VM
-       rm -rf "$BUILD_ROOT"/.build
-       mkdir -p "$BUILD_ROOT"/.build
+       rm -rf "$BUILD_ROOT/.build"
+       mkdir -p "$BUILD_ROOT/.build"
     fi
 }
 
@@ -1266,18 +1266,18 @@ if test -n "$LIST_STATE" ; then
     test -d "$BUILD_ROOT" || cleanup_and_exit 3
     SPECFILE=$SPECFILES # only one specified anyways
     if test "$SPECFILE" != "${SPECFILE%.src.rpm}" ; then
-       rm -rf $BUILD_ROOT/usr/src/packages
+       rm -rf "$BUILD_ROOT/usr/src/packages"
        mkdir -p $BUILD_ROOT/usr/src/packages/SOURCES $BUILD_ROOT/usr/src/packages/SPECS
        rpm -i --nodigest --nosignature --root $BUILD_ROOT $SPECFILE || {
           echo "could not install $SPECFILE." 2>&1
-          rm -rf $BUILD_ROOT
+          rm -rf "$BUILD_ROOT"
           cleanup_and_exit 3
        }
        for SPECFILE in $BUILD_ROOT/usr/src/packages/SPECS/*.spec ; do : ; done
     fi
     init_buildsystem --configdir "$CONFIG_DIR" --cachedir "$CACHE_DIR" --list-state "${definesnstuff[@]}" "${repos[@]}" $USEUSEDFORBUILD $SPECFILE $BUILD_EXTRA_PACKS
     ERR=$?
-    rm -rf $BUILD_ROOT
+    rm -rf "$BUILD_ROOT"
     cleanup_and_exit $ERR
 fi
 
@@ -1405,6 +1405,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
       *.dsc) BUILDTYPE=dsc ;;
       *.kiwi) BUILDTYPE=kiwi ;;
       PKGBUILD) BUILDTYPE=arch ;;
+      preinstallimage) BUILDTYPE=preinstallimage ;;
     esac
     if test -z "$BUILDTYPE" ; then
        echo "don't know how to build $SPECFILE"
@@ -1432,8 +1433,8 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     if test "$SPECFILE" != "${SPECFILE%.src.rpm}" ; then
        echo processing src rpm $SRCDIR/$SPECFILE ...
        MYSRCDIR=$BUILD_ROOT/.build-srcdir
-       rm -rf $MYSRCDIR
-       mkdir -p $MYSRCDIR
+       rm -rf "$MYSRCDIR"
+       mkdir -p "$MYSRCDIR"
        cd $MYSRCDIR || cleanup_and_exit 1
        $BUILD_DIR/unrpm -q $SRCDIR/$SPECFILE || {
            echo "could not install $SPECFILE."
@@ -1483,8 +1484,8 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     fi
 
     if test -n "$VM_TYPE" -a -z "$RUNNING_IN_VM"; then
-       rm -rf $BUILD_ROOT/.build
-       mkdir -p $BUILD_ROOT/.build
+       rm -rf "$BUILD_ROOT/.build"
+       mkdir -p "$BUILD_ROOT/.build"
        if test "$DO_INIT" = true ; then
            # do fist stage of init_buildsystem
            rm -f $BUILD_ROOT/.build.success
@@ -1501,8 +1502,8 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        # start up xen, rerun ourself
        cp -a $BUILD_DIR/. $BUILD_ROOT/.build
        if ! test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
-           rm -rf $BUILD_ROOT/.build-srcdir
-           mkdir $BUILD_ROOT/.build-srcdir
+           rm -rf "$BUILD_ROOT/.build-srcdir"
+           mkdir "$BUILD_ROOT/.build-srcdir"
            if test "$BUILDTYPE" = kiwi ; then
                cp -pRL "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
            else
@@ -1764,6 +1765,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        test -z "$INCARNATION" && INCARNATION=0
        echo "BUILD_INCARNATION=$INCARNATION" > $BUILD_ROOT/.buildenv
        CREATE_BUILD_BINARIES=
+       test "$BUILDTYPE" = preinstallimage && mkdir -p $BUILD_ROOT/.preinstall_image
        egrep '^#[       ]*needsbinariesforbuild[       ]*$' >/dev/null <$MYSRCDIR/$SPECFILE && CREATE_BUILD_BINARIES=--create-build-binaries
        set -- init_buildsystem --configdir "$CONFIG_DIR" --cachedir "$CACHE_DIR" "${definesnstuff[@]}" "${repos[@]}" $CLEAN_BUILD $USE_SYSTEM_QEMU $USEUSEDFORBUILD $CREATE_BUILD_BINARIES $RPMLIST "$MYSRCDIR/$SPECFILE" $ADDITIONAL_PACKS
        echo "$* ..."
@@ -1784,6 +1786,47 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        copy_oldpackages
     fi
 
+    if test "$BUILDTYPE" = preinstallimage ; then
+       echo "creating preinstall image..."
+       test -d "$BUILD_ROOT/.preinstall_image" || cleanup_and_exit 1
+       cd $BUILD_ROOT || cleanup_and_exit 1
+       TAR="tar"
+       if test -x /usr/bin/bsdtar; then
+           TAR="/usr/bin/bsdtar --chroot"
+       fi
+       TOPDIRS=
+       for DIR  in .* * ; do
+         case "$DIR" in
+           .|..) continue ;;
+           .build*) continue ;;
+           .preinstallimage*) continue ;;
+           .srcfiles*) continue ;;
+           .pkgs) continue ;;
+           installed-pkg) continue ;;
+           proc|sys) continue ;;
+         esac
+         TOPDIRS="$TOPDIRS $DIR"
+        done
+       if ! $TAR -czf .preinstallimage.$$.tar.gz --one-file-system $TOPDIRS ; then
+           cleanup_and_exit 1
+       fi
+       echo "image created."
+       TOPDIR=/usr/src/packages
+       mkdir -p $BUILD_ROOT$TOPDIR/OTHER
+       rm -f $BUILD_ROOT$TOPDIR/OTHER/preinstallimage.info
+       for PKG in $BUILD_ROOT/.preinstall_image/* ; do
+           PKG=${PKG##*/}
+           read PKG_HDRMD5 PKGID < $BUILD_ROOT/.preinstall_image/$PKG
+           test -n "$PKG_HDRMD5" || cleanup_and_exit 1
+           echo "$PKG_HDRMD5  $PKG" >> $BUILD_ROOT$TOPDIR/OTHER/preinstallimage.info
+       done
+       mv $BUILD_ROOT/.preinstallimage.$$.tar.gz $BUILD_ROOT$TOPDIR/OTHER/preinstallimage.tar.gz
+       rm -f $BUILD_ROOT/.build.packages
+       ln -s ${TOPDIR#/} $BUILD_ROOT/.build.packages
+       test -d "$SRCDIR" && cd "$SRCDIR"
+       continue
+    fi
+
     if test -z "$BUILD_DIST" -a -e "$BUILD_ROOT/.guessed_dist" ; then
        read BUILD_DIST < $BUILD_ROOT/.guessed_dist
     fi
@@ -1855,7 +1898,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
        ABUILD_UID=0
        ABUILD_GID=0
        if egrep '^abuild:' >/dev/null <$BUILD_ROOT/etc/passwd ; then
-           rm -rf $BUILD_ROOT/home/abuild
+           rm -rf "$BUILD_ROOT/home/abuild"
            egrep -v '^abuild:' <$BUILD_ROOT/etc/passwd >$BUILD_ROOT/etc/passwd.new
            mv $BUILD_ROOT/etc/passwd.new $BUILD_ROOT/etc/passwd
            egrep -v '^abuild:' <$BUILD_ROOT/etc/group >$BUILD_ROOT/etc/group.new
@@ -1901,7 +1944,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     #
     # now clean up RPM building directories
     #
-    rm -rf $BUILD_ROOT$TOPDIR
+    rm -rf "$BUILD_ROOT$TOPDIR"
     for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS BUILDROOT OTHER ; do
        mkdir -p $BUILD_ROOT$TOPDIR/$i
     done
@@ -1976,7 +2019,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     if test -f $BUILD_ROOT/.spec.new ; then
        if ! cmp -s $BUILD_ROOT$TOPDIR/SOURCES/$SPECFILE $BUILD_ROOT/.spec.new ; then
            echo -----------------------------------------------------------------
-           echo I have the following modifications for $SPECFILE:
+           echo "I have the following modifications for $SPECFILE:"
            sed -e "/^%changelog/q" $BUILD_ROOT$TOPDIR/SOURCES/$SPECFILE > $BUILD_ROOT/.spec.t1
            sed -e "/^%changelog/q" $BUILD_ROOT/.spec.new > $BUILD_ROOT/.spec.t2
            diff $BUILD_ROOT/.spec.t1 $BUILD_ROOT/.spec.t2
@@ -1988,7 +2031,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     fi
 
     if test "$BUILDTYPE" = dsc ; then
-       rm -rf $BUILD_ROOT$TOPDIR/BUILD
+       rm -rf "$BUILD_ROOT$TOPDIR/BUILD"
        mkdir -p $BUILD_ROOT$TOPDIR/SOURCES.DEB
        chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"
        DEB_TRANSFORM=

diff --git a/init_buildsystem b/init_buildsystem
index 79df969..8d7af82 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -106,33 +106,77 @@ cleanup_and_exit()
     [ "$BUILD_ROOT" != / ] || chown $browner $BUILD_ROOT
     # umount so init_buildsystem can be used standalone
 # XXX: use stat -f /dev/pts/ -c %T  to check whether it's mounted and not suppress errors then?
-    umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true
-    umount -n $BUILD_ROOT/proc 2> /dev/null || true
-    umount -n $BUILD_ROOT/dev/pts 2> /dev/null || true
-    umount -n $BUILD_ROOT/mnt 2> /dev/null || true
+    umount -n "$BUILD_ROOT/proc/sys/fs/binfmt_misc" 2> /dev/null || true
+    umount -n "$BUILD_ROOT/proc" 2> /dev/null || true
+    umount -n "$BUILD_ROOT/dev/pts" 2> /dev/null || true
+    umount -n "$BUILD_ROOT/mnt" 2> /dev/null || true
     exit ${1:-0}
 }
 
 clean_build_root()
 {
        test -n "$BUILD_ROOT" && {
-           umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true
-           umount -n $BUILD_ROOT/proc 2> /dev/null || true
-           umount -n $BUILD_ROOT/dev/pts 2> /dev/null || true
-           umount -n $BUILD_ROOT/mnt 2> /dev/null || true
-           rm -rf -- $BUILD_ROOT/*
-           rm -rf -- $BUILD_ROOT/.build
-           rm -rf -- $BUILD_ROOT/.root
-           rm -rf -- $BUILD_ROOT/.init_b_cache
-           mkdir -p $BUILD_ROOT/proc
-           mkdir -p $BUILD_ROOT/dev/pts
+           umount -n "$BUILD_ROOT/proc/sys/fs/binfmt_misc" 2> /dev/null || true
+           umount -n "$BUILD_ROOT/proc" 2> /dev/null || true
+           umount -n "$BUILD_ROOT/dev/pts" 2> /dev/null || true
+           umount -n "$BUILD_ROOT/mnt" 2> /dev/null || true
+           rm -rf -- "$BUILD_ROOT"/*
+           rm -rf -- "$BUILD_ROOT/.build"
+           rm -rf -- "$BUILD_ROOT/.root"
+           rm -rf -- "$BUILD_ROOT/.init_b_cache"
+           rm -rf -- "$BUILD_ROOT/.preinstall_image/*"
+           rm -rf -- "$BUILD_ROOT/.preinstallimage"*
+           mkdir -p "$BUILD_ROOT/proc"
+           mkdir -p "$BUILD_ROOT/dev/pts"
            if [ "$UID" = '0' ]; then
-                   mount -n -tproc none $BUILD_ROOT/proc
-                   mount -n -tdevpts none $BUILD_ROOT/dev/pts
+                   mount -n -tproc none "$BUILD_ROOT/proc"
+                   mount -n -tdevpts none "$BUILD_ROOT/dev/pts"
            fi
        }
 }
 
+
+unsafe_preinstall_check()
+{
+    # cpio isn't safe so we require bsdtar for VMs. chroot is
+    # unsafe anyways so it's ok for that.
+    if test -n "$PREPARE_VM" ; then
+       echo "Error: setting up a VM requires bsdtar for security reasons."
+       echo "Please install bsdtar."
+       cleanup_and_exit 1
+    fi
+}
+
+preinstall_image_filter()
+{
+    for PKG in "$@" ; do
+       test -e "$BUILD_ROOT/.preinstall_image/$PKG" && continue
+       echo $PKG
+    done
+}
+
+preinstall_image()
+{
+    check_exit
+    if test -n "$2" ; then
+       echo "unpacking preinstall image $2..."
+    else
+       echo "unpacking preinstall image..."
+    fi
+    cd $BUILD_ROOT || cleanup_and_exit 1
+    if test -x /usr/bin/bsdtar ; then
+       TAR="/usr/bin/bsdtar -P --chroot -o --numeric-owner -x"
+    else
+       unsafe_preinstall_check
+       TAR="tar -x"
+    fi
+    # pipe output through perl to print a dot every 1000 lines
+    if ! $TAR -z --exclude .build --exclude .init_b_cache -f "$BUILD_ROOT/.init_b_cache/rpms/$1" -v > >(perl -e '$|=1; my $done=0; $done++ % 1000 or print "." while <STDIN>; print "\n";')  2>&1 ; then
+       echo "unpack failed."
+       cleanup_and_exit 1
+    fi
+}
+
 preinstall()
 {
     check_exit
@@ -142,13 +186,7 @@ preinstall()
        CPIO="/usr/bin/bsdtar -P --chroot -o --numeric-owner -x -f-"
        TAR="/usr/bin/bsdtar -P --chroot -o --numeric-owner -x"
     else
-       # cpio isn't safe so we require bsdtar for VMs. chroot is
-       # unsafe anyways so it's ok for that.
-       if [ -n "$PREPARE_VM" ]; then
-           echo "Error: setting up a VM requires bsdtar for security reasons."
-           echo "Please install bsdtar"
-           cleanup_and_exit 1
-       fi
+       unsafe_preinstall_check
        CPIO="cpio --extract --unconditional --preserve-modification-time --make-directories --no-absolute-filenames --quiet"
        TAR="tar -x"
     fi
@@ -596,8 +634,8 @@ else
     #
     # now make sure that all the packages are installed.
     #
-    rm -rf $BUILD_ROOT/.init_b_cache
-    mkdir -p $BUILD_ROOT/.init_b_cache/scripts
+    rm -rf "$BUILD_ROOT/.init_b_cache"
+    mkdir -p "$BUILD_ROOT/.init_b_cache/scripts"
 
     if test -z "$RPMLIST" ; then
        #
@@ -628,7 +666,7 @@ else
           test "$PKG" = "rpmid:" && continue
           echo "${SRC##*/}"
        done < $BUILD_ROOT/.init_b_cache/rpmlist
-       rm -rf $BUILD_ROOT/.init_b_cache
+       rm -rf "$BUILD_ROOT/.init_b_cache"
        cleanup_and_exit 0
     fi
 
@@ -664,7 +702,10 @@ else
     PACKAGES_TO_VMINSTALL=
     PACKAGES_TO_CBPREINSTALL=
     PACKAGES_TO_CBINSTALL=
+    PREINSTALL_IMAGE=
+    PREINSTALL_IMAGE_SOURCE=
     RUNSCRIPTS_SEEN=
+    PACKAGES_FROM_PREINSTALLIMAGE=
     GUESSED_DIST=unknown
     mkdir -p $BUILD_ROOT/.init_b_cache/rpms
     while read PKG SRC ; do
@@ -676,6 +717,15 @@ else
            PACKAGES_TO_VMINSTALL=$SRC
            continue
        fi
+       if test "$PKG" = "preinstallimage:" ; then
+           PREINSTALL_IMAGE=${SRC##*/}
+           ln -s "$SRC" "$BUILD_ROOT/.init_b_cache/rpms/${SRC##*/}"
+           continue
+       fi
+       if test "$PKG" = "preinstallimagesource:" ; then
+           PREINSTALL_IMAGE_SOURCE="$SRC"
+           continue
+       fi
        # these additional preinstall / install values are only set for 
        # emulated "CrossBuild" setups - thus CB(pre)install
        if test "$PKG" = "cbpreinstall:" ; then
@@ -707,6 +757,11 @@ else
            echo "Warning: ignoring unsupported tag '$PKG'" >&2
            continue
        fi
+       if test "$SRC" = "preinstallimage" ; then
+           PACKAGES_FROM_PREINSTALLIMAGE="$PACKAGES_FROM_PREINSTALLIMAGE $PKG"
+           PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $PKG"
+           continue
+       fi
        if [ "${SRC#/}" = "$SRC" ]; then
            url="$SRC"
            case "$url" in
@@ -736,11 +791,23 @@ else
     case "$PSUF" in
        UNKNOWN|'')
            # auto detect from packages
+           if test -n "$PREINSTALL_IMAGE" ; then
+               echo "cannot autodetect build type when using a preinstall image" >&2
+               cleanup_and_exit 1
+           fi
            PSUF=rpm
-           test -L $BUILD_ROOT/.init_b_cache/rpms/dpkg.deb && PSUF=deb
-           test -L $BUILD_ROOT/.init_b_cache/rpms/pacman.arch && PSUF=arch
+           test -e $BUILD_ROOT/.init_b_cache/rpms/dpkg.deb && PSUF=deb
+           test -e $BUILD_ROOT/.init_b_cache/rpms/pacman.arch && PSUF=arch
            ;;
     esac
+
+    if test -n "$PREINSTALL_IMAGE" ; then
+       for PKG in $PACKAGES_FROM_PREINSTALLIMAGE ; do
+           # touch the file so that the copying works
+           touch $BUILD_ROOT/.init_b_cache/rpms/"$PKG.$PSUF"
+       done
+    fi
+
 fi
 
 #
@@ -765,25 +832,35 @@ if test ! -f $BUILD_ROOT/var/lib/rpm/packages.rpm -a ! -f $BUILD_ROOT/var/lib/rp
     for PKG in $PACKAGES_TO_RUNSCRIPTS ; do
        : > $BUILD_ROOT/.init_b_cache/scripts/$PKG.run
     done
-    PACKAGES_TO_PREINSTALL=`reorder $PACKAGES_TO_PREINSTALL`
-    progress_setup PACKAGES_TO_PREINSTALL
-    for PKG in $PACKAGES_TO_PREINSTALL ; do
-       progress_step PACKAGES_TO_PREINSTALL
+    PACKAGES_TO_PREINSTALL_FILTERED="$PACKAGES_TO_PREINSTALL"
+    PACKAGES_TO_VMINSTALL_FILTERED="$PACKAGES_TO_VMINSTALL"
+    PACKAGES_TO_CBPREINSTALL_FILTERED="$PACKAGES_TO_CBPREINSTALL"
+    rm -f "$BUILD_ROOT/.preinstall_image"/*
+    if test -n "$PREINSTALL_IMAGE" ; then
+       preinstall_image "$PREINSTALL_IMAGE" "$PREINSTALL_IMAGE_SOURCE"
+       PACKAGES_TO_PREINSTALL_FILTERED=`preinstall_image_filter $PACKAGES_TO_PREINSTALL_FILTERED`
+       PACKAGES_TO_VMINSTALL_FILTERED=`preinstall_image_filter $PACKAGES_TO_VMINSTALL_FILTERED`
+       PACKAGES_TO_CBPREINSTALL_FILTERED=`preinstall_image_filter $PACKAGES_TO_VMINSTALL_FILTERED`
+    fi
+    PACKAGES_TO_PREINSTALL_FILTERED=`reorder $PACKAGES_TO_PREINSTALL_FILTERED`
+    progress_setup PACKAGES_TO_PREINSTALL_FILTERED
+    for PKG in $PACKAGES_TO_PREINSTALL_FILTERED ; do
+       progress_step PACKAGES_TO_PREINSTALL_FILTERED
        preinstall ${PKG##*/}
     done
     if test -n "$PREPARE_VM" ; then
-        PACKAGES_TO_VMINSTALL=`reorder $PACKAGES_TO_VMINSTALL`
-       progress_setup PACKAGES_TO_VMINSTALL
-       for PKG in $PACKAGES_TO_VMINSTALL ; do
-           progress_step PACKAGES_TO_VMINSTALL
+        PACKAGES_TO_VMINSTALL_FILTERED=`reorder $PACKAGES_TO_VMINSTALL_FILTERED`
+       progress_setup PACKAGES_TO_VMINSTALL_FILTERED
+       for PKG in $PACKAGES_TO_VMINSTALL_FILTERED ; do
+           progress_step PACKAGES_TO_VMINSTALL_FILTERED
            preinstall ${PKG##*/}
        done
     fi
     # add cbpreinstall if cross HOST != TARGET
-    PACKAGES_TO_CBINSTALL=`reorder $PACKAGES_TO_CBINSTALL`
-    progress_setup PACKAGES_TO_CBPREINSTALL
-    for PKG in $PACKAGES_TO_CBPREINSTALL ; do
-       progress_step PACKAGES_TO_CBPREINSTALL
+    PACKAGES_TO_CBINSTALL_FILTERED=`reorder $PACKAGES_TO_CBINSTALL_FILTERED`
+    progress_setup PACKAGES_TO_CBPREINSTALL_FILTERED
+    for PKG in $PACKAGES_TO_CBPREINSTALL_FILTERED ; do
+       progress_step PACKAGES_TO_CBPREINSTALL_FILTERED
         preinstall ${PKG##*/}
     done
     if [ -w /root ]; then
@@ -806,8 +883,7 @@ if test -n "$PREPARE_VM" ; then
        ln -s -f ../$PKG.$PSUF $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF
        check_exit
     done
-    # alreadyinstalled check will not work, but we have to live with
-    # that...
+    # alreadyinstalled check will not work, but we have to live with that...
     echo -n 'reordering...'
     PACKAGES_TO_INSTALL=`reorder $PACKAGES_TO_INSTALL`
     echo 'done'
@@ -818,7 +894,7 @@ if test -n "$PREPARE_VM" ; then
     echo "PACKAGES_TO_PREINSTALL='${PACKAGES_TO_PREINSTALL//"'"/$Q}'" >> $BUILD_ROOT/.build/init_buildsystem.data
     echo "PACKAGES_TO_CBPREINSTALL='${PACKAGES_TO_CBPREINSTALL//"'"/$Q}'" >> $BUILD_ROOT/.build/init_buildsystem.data
     echo "PSUF='$PSUF'" >> $BUILD_ROOT/.build/init_buildsystem.data
-    rm -f $BUILD_IS_RUNNING
+    rm -f $BUILD_IS_RUNNIN]G
     cleanup_and_exit 0
 fi
 
@@ -830,7 +906,7 @@ mount -n -tdevpts none $BUILD_ROOT/dev/pts 2>/dev/null || true
 #
 # create .build.binaries directory if requested
 #
-rm -rf $BUILD_ROOT/.build.binaries
+rm -rf "$BUILD_ROOT/.build.binaries"
 if test -n "$CREATE_BUILD_BINARIES" ; then
     echo "creating .build.binaries directory..."
     mkdir -p "$BUILD_ROOT/.build.binaries"
@@ -861,7 +937,6 @@ fi
 #
 if ! test -e $BUILD_ROOT/.build/init_buildsystem.data ; then
     echo -n 'reordering...'
-    PACKAGES_TO_INSTALL_FIRST=`reorder $PACKAGES_TO_INSTALL_FIRST`
     PACKAGES_TO_INSTALL=`reorder $PACKAGES_TO_INSTALL`
     echo 'done'
 fi
@@ -893,7 +968,7 @@ for PKG in $BUILD_ROOT/.init_b_cache/alreadyinstalled/* ; do
     test "$PKG" = "*" && continue
     ln $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG $BUILD_ROOT/.init_b_cache/todelete/$PKG
 done
-for PKG in $PACKAGES_TO_INSTALL_FIRST $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL ; do
+for PKG in $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL ; do
     rm -f $BUILD_ROOT/.init_b_cache/todelete/$PKG
 done
 for PKG in $BUILD_ROOT/.init_b_cache/todelete/* ; do
@@ -903,16 +978,16 @@ for PKG in $BUILD_ROOT/.init_b_cache/todelete/* ; do
     rpm_e "$PKG"
     check_exit
 done
-rm -rf $BUILD_ROOT/.init_b_cache/todelete
+rm -rf "$BUILD_ROOT/.init_b_cache/todelete"
 
-rm -rf $BUILD_ROOT/.init_b_cache/preinstalls
-mkdir -p $BUILD_ROOT/.init_b_cache/preinstalls
+rm -rf "$BUILD_ROOT/.init_b_cache/preinstalls"
+mkdir -p "$BUILD_ROOT/.init_b_cache/preinstalls"
 for PKG in $PACKAGES_TO_PREINSTALL $PACKAGES_TO_CBPREINSTALL; do
     touch "$BUILD_ROOT/.init_b_cache/preinstalls/$PKG"
 done
 
-rm -rf $BUILD_ROOT/installed-pkg
-mkdir -p $BUILD_ROOT/installed-pkg
+rm -rf "$BUILD_ROOT/installed-pkg"
+mkdir -p "$BUILD_ROOT/installed-pkg"
 
 RPMCHECKOPTS=
 RPMCHECKOPTS_HOST=
@@ -921,34 +996,52 @@ RPMCHECKOPTS_HOST=
 test -x $BUILD_ROOT/usr/bin/rpmsign && RPMCHECKOPTS="--nodigest --nosignature"
 test -x /usr/bin/rpmsign && RPMCHECKOPTS_HOST="--nodigest --nosignature"
 
-MAIN_LIST="$PACKAGES_TO_INSTALL_FIRST $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL"
-progress_setup MAIN_LIST
-for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL; do
-    case $PKG in
-      RUN_LDCONFIG)
-       test -x $BUILD_ROOT/sbin/ldconfig && chroot $BUILD_ROOT /sbin/ldconfig 2>&1
-       continue
-      ;;
-    esac
+test -x $BUILD_ROOT/sbin/ldconfig && chroot $BUILD_ROOT /sbin/ldconfig 2>&1
 
+MAIN_LIST="$PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL"
+progress_setup MAIN_LIST
+for PKG in $PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL; do
     test -f $BUILD_ROOT/installed-pkg/$PKG && continue
     progress_step MAIN_LIST
 
+    if test -e "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -a ! -s "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" ; then
+       # preinstallimage package, make sure it's 
+       if ! test -e $BUILD_ROOT/.preinstall_image/$PKG ; then
+           echo "Package $PKG is missing from the preinstall image"
+           cleanup_and_exit 1
+       fi
+       read PKG_HDRMD5 PKGID < $BUILD_ROOT/.preinstall_image/$PKG
+        if test $PSUF = deb -o $PSUF = arch ; then
+           echo "preinstalled ${PKGID%_*}"
+       else
+           echo "preinstalled ${PKGID%% *}"
+       fi
+       continue
+    fi
+    PKG_HDRMD5=
+    if test -d $BUILD_ROOT/.preinstall_image ; then
+       if ! test -e $BUILD_ROOT/.preinstall_image/$PKG ; then
+           PKG_HDRMD5=`perl -I$BUILD_DIR -MBuild -e 'print Build::queryhdrmd5($ARGV[0])' $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF`
+           test -n "$PKG_HDRMD5" || cleanup_and_exit 1
+       fi
+    fi
+    test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF || continue
+
     if test $PSUF = deb ; then
        # debian world, install deb files
-       test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.deb || continue
        if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.deb" -ef "$BUILD_ROOT/.init_b_cache/$PKG.deb" ; then
            rm -f $BUILD_ROOT/.init_b_cache/$PKG.deb
            cp $BUILD_ROOT/.init_b_cache/rpms/$PKG.deb $BUILD_ROOT/.init_b_cache/$PKG.deb || cleanup_and_exit 1
        fi
        PKGID=`readlink $BUILD_ROOT/.init_b_cache/rpms/$PKG.deb`
        PKGID="${PKGID##*/}"
-       PKGID="${PKGID%.deb}"
+       PKGID="${PKGID%.deb} debian"
        echo "installing ${PKGID%_*}"
        ( chroot $BUILD_ROOT dpkg --install --force all .init_b_cache/$PKG.deb 2>&1 || touch $BUILD_ROOT/exit ) | \
            perl -ne '$|=1;/^(Configuration file|Installing new config file|Selecting previously deselected|\(Reading database|Unpacking |Setting up|Creating config file|Preparing to replace dpkg)/||/^$/||print'
        check_exit
-       echo "$PKGID debian" > $BUILD_ROOT/installed-pkg/$PKG
+       echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+       test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > $BUILD_ROOT/.preinstall_image/$PKG
         # ugly workaround for upstart system. some packages (procps) try
         # to start a service in their configure phase. As we don't have
         # a running upstart, we just link the start binary to /bin/true
@@ -965,7 +1058,6 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGE
     fi
 
     if test $PSUF = arch ; then
-       test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF || continue
        if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -ef "$BUILD_ROOT/.init_b_cache/$PKG.$PSUF" ; then 
            rm -f $BUILD_ROOT/.init_b_cache/$PKG.$PSUF
            cp $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF $BUILD_ROOT/.init_b_cache/$PKG.$PSUF || cleanup_and_exit 1
@@ -973,24 +1065,24 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGE
        PKGID=`readlink $BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF`
        PKGID="${PKGID##*/}"
        PKGID="${PKGID/%.pkg.tar.?z/.arch}"
-       PKGID="${PKGID%.$PSUF}"
+       PKGID="${PKGID%.$PSUF} $PSUF"
        echo "installing ${PKGID%_*}"
        # -d -d disables deps checking
        ( chroot $BUILD_ROOT pacman -Uf -d -d --noconfirm .init_b_cache/$PKG.$PSUF 2>&1 || touch $BUILD_ROOT/exit ) | \
            perl -ne '$|=1;/^(warning: could not get filesystem information for |loading packages|looking for inter-conflicts|Targets |Total Installed Size: |Net Upgrade Size: |Proceed with installation|checking package integrity|loading package files|checking available disk space|installing |upgrading |warning:.*is up to date -- reinstalling|Optional dependencies for|    )/||/^$/||print'
        check_exit
-       echo "$PKGID $PSUF" > $BUILD_ROOT/installed-pkg/$PKG
+       echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+       test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > $BUILD_ROOT/.preinstall_image/$PKG
        continue
     fi
 
-    test -L $BUILD_ROOT/.init_b_cache/rpms/$PKG.rpm || continue
-
     if test -f $BUILD_ROOT/.init_b_cache/rpms/$PKG.id -a -f $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG ; then
        read PKGID < $BUILD_ROOT/.init_b_cache/rpms/$PKG.id
        read OLDPKGID < $BUILD_ROOT/.init_b_cache/alreadyinstalled/$PKG
        if test "$PKGID" = "$OLDPKGID" ; then
            #echo "keeping ${PKGID%% *}"
            echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+           test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > $BUILD_ROOT/.preinstall_image/$PKG
            continue
        fi
     fi
@@ -1010,11 +1102,13 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGE
            else
                #echo "keeping ${PKGID%% *}"
                echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+               test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > $BUILD_ROOT/.preinstall_image/$PKG
                continue
            fi
        else
            #echo "keeping ${PKGID%% *}"
            echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+           test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > $BUILD_ROOT/.preinstall_image/$PKG
            continue
        fi
        if test -e "$BUILD_ROOT/.init_b_cache/preinstalls/$PKG" ; then
@@ -1029,7 +1123,7 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGE
     if test "$USE_FORCE" = true ; then
        export ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --force"
     fi
-    # work around for cross-build installs, we must not overwrite the running rpm
+    # FIXME: work around for cross-build installs, we must not overwrite the running rpm
     if test "$PKG" = rpm ; then
        for i in $BUILD_ROOT/.init_b_cache/preinstalls/rpm-x86-* ; do
            test -e "$i" && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --justdb"
@@ -1048,11 +1142,12 @@ for PKG in $PACKAGES_TO_INSTALL_FIRST RUN_LDCONFIG $PACKAGES_TO_INSTALL $PACKAGE
     rm -f $BUILD_ROOT/.init_b_cache/$PKG.rpm
     check_exit
     echo "$PKGID" > $BUILD_ROOT/installed-pkg/$PKG
+    test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > $BUILD_ROOT/.preinstall_image/$PKG
 
 done
 
 if test $PSUF = deb ; then
-    echo "configure all installed packages..."
+    echo "configuring all installed packages..."
     # configure all packages after complete installation, not for each package like rpm does
     # We need to run this twice, because of cyclic dependencies as it does not succeed on most
     # debian based distros in the first attempt.
@@ -1215,7 +1310,7 @@ fi
 #fi
 
 rm -f $BUILD_ROOT/.rpmmacros $BUILD_ROOT/root/.rpmmacros
-rm -rf $BUILD_ROOT/.init_b_cache
+rm -rf "$BUILD_ROOT/.init_b_cache"
 rm -f $BUILD_IS_RUNNING
 rm -f $TMPFILE