# HG changeset patch # User Pascal Bellard # Date 1216278927 0 # Node ID 5dc31e0d2cc043620f9cf7ee4d7059ec6ca501fd # Parent 39d61fbb1d4497f0215792bc0a780dbe9f9097e2 tazpkg: install md5sum, check volatile.cpio.gz for modifiers diff -r 39d61fbb1d44 -r 5dc31e0d2cc0 tazpkg --- a/tazpkg Tue Jul 15 23:33:47 2008 +0200 +++ b/tazpkg Thu Jul 17 07:15:27 2008 +0000 @@ -13,7 +13,7 @@ # Pascal Bellard # Eric Joseph-Alexandre # -VERSION=2.3 +VERSION=2.2 #################### # Script variables # @@ -304,6 +304,12 @@ for j in $(grep -l "^$i$" $ROOT$INSTALLED/*/files.list); do [ "$j" = "$ROOT$INSTALLED/$PACKAGE/files.list" ] && continue grep -qs ^$PACKAGE$ $(dirname $j)/modifiers && continue + if [ -s "$(dirname $j)/volatile.cpio.gz" ]; then + # We can modify backuped files + zcat $(dirname $j)/volatile.cpio.gz | \ + cpio -t 2> /dev/null | \ + grep -q "^${i#/}$" && continue + fi echo "$PACKAGE" >> $(dirname $j)/modifiers done done @@ -312,6 +318,10 @@ if [ -f "description.txt" ]; then cp description.txt $ROOT$INSTALLED/$PACKAGE fi + # Copy the md5sum if found. + if [ -f "md5sum" ]; then + cp md5sum $ROOT$INSTALLED/$PACKAGE + fi # Pre install commands. if grep -q ^pre_install $ROOT$INSTALLED/$PACKAGE/receipt; then pre_install $ROOT @@ -1135,6 +1145,8 @@ mkdir -p $TMP_DIR && cd $TMP_DIR FILES="fs.cpio.gz\n" for i in $(ls $INSTALLED/$PACKAGE) ; do + [ "$i" = "volatile.cpio.gz" ] && continue + [ "$i" = "modifiers" ] && continue cp $INSTALLED/$PACKAGE/$i . && FILES="$FILES$i\n" done ln -s / rootfs @@ -1189,8 +1201,8 @@ echo -n "Creating full cpio archive... " find . -print | cpio -o -H newc > ../$PACKAGE.tazpkg echo -n "Restoring original package tree... " - gzip -d fs.cpio.gz && cpio -id < fs.cpio - rm fs.cpio && cd .. + zcat fs.cpio.gz | cpio -id + rm fs.cpio.gz && cd .. echo "================================================================================" echo "Package $PACKAGE compressed successfully." echo "Size : `du -sh $PACKAGE.tazpkg`"