# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1266856630 -3600
# Node ID 3fc95e228478a946d69d8a16b47a9e3107ff7ab2
# Parent  4e3d0f1fdb7e0681d0bc9fe0bb196f79764223a7
tazlito pack-flavor: merge extra file from first flavor

diff -r 4e3d0f1fdb7e -r 3fc95e228478 tazlito
--- a/tazlito	Mon Feb 22 16:15:38 2010 +0100
+++ b/tazlito	Mon Feb 22 17:37:10 2010 +0100
@@ -1054,14 +1054,28 @@
 				[ -f $FLAVORS_REPOSITORY/$2/packages.list ] ||
 					tazlito extract-flavor $2
 				get_pkglist $2 > $TMP_DIR/$FLAVOR.pkglist
+				for i in rootcd rootfs; do
+					mkdir $TMP_DIR/$i
+					# Copy extra files from the first flavor
+					[ -d $FLAVORS_REPOSITORY/$2/$i ] &&
+					cp -a $FLAVORS_REPOSITORY/$2/$i $TMP_DIR
+					# Overload extra files by meta flavor
+					[ -d $FLAVORS_REPOSITORY/$FLAVOR/$i ] &&
+					cp -a $FLAVORS_REPOSITORY/$FLAVOR/$i $TMP_DIR
+					[ -n "$(ls $TMP_DIR/$i)" ] &&
+					( cd $TMP_DIR/$i ; find . | cpio -o -H newc 2> /dev/null ) | \
+					gzip -9 >$TMP_DIR/$FLAVOR.$i
+					rm -rf $TMP_DIR/$i
+				done
+			else
+				for i in rootcd rootfs; do
+					[ -d $FLAVORS_REPOSITORY/$FLAVOR/$i ] || \
+						continue
+					( cd $FLAVORS_REPOSITORY/$FLAVOR/$i ; \
+					find . | cpio -o -H newc 2> /dev/null ) | \
+					gzip -9 >$TMP_DIR/$FLAVOR.$i
+				done
 			fi
-			for i in rootcd rootfs; do
-				[ -d $FLAVORS_REPOSITORY/$FLAVOR/$i ] || \
-					continue
-				( cd $FLAVORS_REPOSITORY/$FLAVOR/$i ; find . | \
-				cpio -o -H newc 2> /dev/null ) | \
-				gzip -9 >$TMP_DIR/$FLAVOR.$i
-			done
 			if [ -s $TMP_DIR/$FLAVOR.rootfs ]; then
 				packed_size=$(($packed_size \
 					+ $(cat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))