From e13e90daaead3235d6c46c4811ae1bf798b7d5f5 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 30 Dec 2013 16:51:27 +0100
Subject: [PATCH] Fixes to pre/post rpm database installation

---
 makedist.inc.sh           | 10 ++++------
 platforms/rootfs/Makefile |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index bd11ff0..c44ef4d 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -108,9 +108,6 @@ ONBOOT=yes
 _EOF
 fi
 
-#erase_rpm_database
-clean_rpm_database
-
 # delete unused localizations
 #
 echo "Deleting other languages l10n files..."
@@ -140,13 +137,10 @@ fi
 # execute platform specific script
 [ -e $TARGETDIR/platforms/$PLATFORM/post.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/post.inc.sh
 
-post_install_rpms
-
 # cleanup: prevent generating a cleanfs script crash due to a unionfs bug
 rm -rf $MOUNTDIR/tmp/.ICE-unix
 rm -rf $MOUNTDIR/tmp/kde-root
 
-
 # copy static files for target
 [ -e $TARGETDIR/root ] && 
    cp -a --no-preserve=ownership $TARGETDIR/root/* $MOUNTDIR/
@@ -174,6 +168,10 @@ if [ ! "$KERNEL_IGNORE" ]; then
    done
 fi
 
+# rpm database
+post_install_rpms
+clean_rpm_database
+
 [ "$QEMU_COPIED_FOR_INST" ] && post_qemu
 
 produce_media
diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile
index 5672705..098399e 100644
--- a/platforms/rootfs/Makefile
+++ b/platforms/rootfs/Makefile
@@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \
 $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
              kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \
              kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \
-             kernel-mamba-arm-firmware brcm_patchram
+             kernel-mamba-arm-firmware brcm_patchram u-boot-tools
 
 $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
              kernel-mamba kernel-mamba-sound kernel-mamba-wireless \