openmamba/makedist-openmamba-milestone3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to pre/post rpm database installation

Browse Source
This commit is contained in:
Silvan Calarco 2013-12-30 16:51:27 +01:00
parent e5327f3a21
commit e13e90daae
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
makedist.inc.sh
View File

@ -108,9 +108,6 @@ ONBOOT=yes
_EOF _EOF
fi fi
#erase_rpm_database
clean_rpm_database
# delete unused localizations # delete unused localizations
# #
echo "Deleting other languages l10n files..." echo "Deleting other languages l10n files..."
@ -140,13 +137,10 @@ fi
# execute platform specific script # execute platform specific script
[ -e $TARGETDIR/platforms/$PLATFORM/post.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/post.inc.sh [ -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 # cleanup: prevent generating a cleanfs script crash due to a unionfs bug
rm -rf $MOUNTDIR/tmp/.ICE-unix rm -rf $MOUNTDIR/tmp/.ICE-unix
rm -rf $MOUNTDIR/tmp/kde-root rm -rf $MOUNTDIR/tmp/kde-root
# copy static files for target # copy static files for target
[ -e $TARGETDIR/root ] && [ -e $TARGETDIR/root ] &&
cp -a --no-preserve=ownership $TARGETDIR/root/* $MOUNTDIR/ cp -a --no-preserve=ownership $TARGETDIR/root/* $MOUNTDIR/
@ -174,6 +168,10 @@ if [ ! "$KERNEL_IGNORE" ]; then
done done
fi fi
# rpm database
post_install_rpms
clean_rpm_database
[ "$QEMU_COPIED_FOR_INST" ] && post_qemu [ "$QEMU_COPIED_FOR_INST" ] && post_qemu
produce_media produce_media

2
platforms/rootfs/Makefile
View File

@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4: \
$(MAKEDIST_TARGET)-$(PLATFORM)-arm: \ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \ kernel-iconia kernel-iconia-modules kernel-hannspad kernel-hannspad-modules \
kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless \ 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: \ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
kernel-mamba kernel-mamba-sound kernel-mamba-wireless \ kernel-mamba kernel-mamba-sound kernel-mamba-wireless \