tazlito diff tazlito @ rev 108
tazlito: more info in flavors
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Aug 22 12:40:28 2009 +0200 (2009-08-22) |
parents | c13aac05efdc |
children | df3ecfba7e32 |
line diff
1.1 --- a/tazlito Fri Aug 21 13:44:40 2009 +0200 1.2 +++ b/tazlito Sat Aug 22 12:40:28 2009 +0200 1.3 @@ -676,13 +676,13 @@ 1.4 exit 1 1.5 fi 1.6 mkdir $TMP_DIR 1.7 - zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i 2> /dev/null ) 1.8 + zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i > /dev/null ) 1.9 if [ "$3" = "--brief" ]; then 1.10 if [ "$4" != "--noheader" ]; then 1.11 - echo "Name Sizes Description" 1.12 + echo "Name ISO Rootfs Description" 1.13 echo "================================================================================" 1.14 fi 1.15 - printf "%-15.15s %5.5s/%5.5s %-51s\n" "$FLAVOR" \ 1.16 + printf "%-16.16s %6.6s %6.6s %s\n" "$FLAVOR" \ 1.17 "$(field ISO $TMP_DIR/$FLAVOR.desc)" \ 1.18 "$(field Rootfs $TMP_DIR/$FLAVOR.desc)" \ 1.19 "$(grep ^Description $TMP_DIR/$FLAVOR.desc | cut -d: -f2)" 1.20 @@ -832,9 +832,9 @@ 1.21 + $(zcat $TMP_DIR/$FLAVOR.rootcd | wc -c ) / 100 )) 1.22 fi 1.23 sed -i -e '/Image is ready/d' \ 1.24 - -e "s/Rootfs size\( *:\) \(.*\)/Rootfs size\1 $(cent2human $unpacked_size) (estimated)/" \ 1.25 - -e "s/Initramfs size\( *:\) \(.*\)/Initramfs size\1 $(cent2human $packed_size) (estimated)/" \ 1.26 - -e "s/ISO image size\( *:\) \(.*\)/ISO image size\1 $(cent2human $iso_size) (estimated)/" \ 1.27 + -e "s/Rootfs size\( *:\) \(.*\)/Rootfs size\1 $(cent2human $unpacked_size) (estimated)/" \ 1.28 + -e "s/Initramfs size\( *:\) \(.*\)/Initramfs size\1 $(cent2human $packed_size) (estimated)/" \ 1.29 + -e "s/ISO image size\( *:\) \(.*\)/ISO image size\1 $(cent2human $iso_size) (estimated)/" \ 1.30 -e "s/date\( *:\) \(.*\)/date\1 $(date +%Y%m%d\ \at\ \%H:%M:%S)/" \ 1.31 $TMP_DIR/$FLAVOR.desc 1.32 ( cd $TMP_DIR ; ls | cpio -o -H newc ) | gzip -9 > \ 1.33 @@ -852,9 +852,19 @@ 1.34 echo -n "Extract $FLAVOR..." 1.35 rm -rf $FLAVORS_REPOSITORY/$FLAVOR 2> /dev/null 1.36 mkdir -p $FLAVORS_REPOSITORY/$FLAVOR 1.37 + echo "FLAVOR=\"$FLAVOR\"" > $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.38 grep ^Description $TMP_DIR/$FLAVOR.desc | \ 1.39 - sed 's/.*: \(.*\)$/\1/' > \ 1.40 - $FLAVORS_REPOSITORY/$FLAVOR/desc.txt 1.41 + sed 's/.*: \(.*\)$/SHORT_DESC="\1"/' >> \ 1.42 + $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.43 + grep ^Rootfs $TMP_DIR/$FLAVOR.desc | \ 1.44 + sed 's/.*: \(.*\)$/ROOTFS_SIZE="\1"/' >> \ 1.45 + $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.46 + grep ^Initramfs $TMP_DIR/$FLAVOR.desc | \ 1.47 + sed 's/.*: \(.*\)$/INITRAMFS_SIZE="\1"/' >> \ 1.48 + $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.49 + grep ^ISO $TMP_DIR/$FLAVOR.desc | \ 1.50 + sed 's/.*: \(.*\)$/ISO_SIZE="\1"/' >> \ 1.51 + $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.52 for i in rootcd rootfs; do 1.53 [ -f $TMP_DIR/$FLAVOR.$i ] || continue 1.54 mkdir $FLAVORS_REPOSITORY/$FLAVOR/$i 1.55 @@ -873,7 +883,7 @@ 1.56 done 1.57 echo $pkg 1.58 done < $TMP_DIR/$FLAVOR.pkglist \ 1.59 - > $FLAVORS_REPOSITORY/$FLAVOR/pkglist.txt 1.60 + > $FLAVORS_REPOSITORY/$FLAVOR/packages.list 1.61 status 1.62 rm -Rf $TMP_DIR 1.63 fi 1.64 @@ -881,12 +891,12 @@ 1.65 pack-flavor) 1.66 # Create a flavor from $FLAVORS_REPOSITORY. 1.67 FLAVOR=${2%.flavor} 1.68 - if [ -s $FLAVORS_REPOSITORY/$FLAVOR/desc.txt ]; then 1.69 + if [ -s $FLAVORS_REPOSITORY/$FLAVOR/receipt ]; then 1.70 mkdir $TMP_DIR 1.71 echo -n "Create $FLAVOR..." 1.72 [ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge 1.73 packed_size=0; unpacked_size=0 1.74 - grep -v ^# $FLAVORS_REPOSITORY/$FLAVOR/pkglist.txt > \ 1.75 + grep -v ^# $FLAVORS_REPOSITORY/$FLAVOR/packages.list > \ 1.76 $TMP_DIR/$FLAVOR.pkg 1.77 while read pkg; do 1.78 set -- $(get_size $pkg) 1.79 @@ -917,14 +927,31 @@ 1.80 iso_size=$(($iso_size \ 1.81 + $(zcat $TMP_DIR/$FLAVOR.rootcd | wc -c ) / 100 )) 1.82 fi 1.83 + VERSION="" 1.84 + MAINTAINER="" 1.85 + ROOTFS_SIZE="$(cent2human $unpacked_size) (estimated)" 1.86 + INITRAMFS_SIZE="$(cent2human $packed_size) (estimated)" 1.87 + ISO_SIZE="$(cent2human $iso_size) (estimated)" 1.88 + . $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.89 cat > $TMP_DIR/$FLAVOR.desc <<EOT 1.90 Flavor : $FLAVOR 1.91 -Description : $(grep -v ^# $FLAVORS_REPOSITORY/$FLAVOR/desc.txt) 1.92 +Description : $SHORT_DESC 1.93 +EOT 1.94 + [ -n "$VERSION" ] && cat >> $TMP_DIR/$FLAVOR.desc <<EOT 1.95 +Version : $VERSION 1.96 +EOT 1.97 + [ -n "$MAINTAINER" ] && cat >> $TMP_DIR/$FLAVOR.desc <<EOT 1.98 +Maintainer : $MAINTAINER 1.99 +EOT 1.100 + [ -n "$FRUGAL_RAM" ] && cat >> $TMP_DIR/$FLAVOR.desc <<EOT 1.101 +LiveCD RAM size : $FRUGAL_RAM 1.102 +EOT 1.103 + cat >> $TMP_DIR/$FLAVOR.desc <<EOT 1.104 Build date : $(date +%Y%m%d\ \at\ \%H:%M:%S) 1.105 -Packages : $(grep -v ^# $FLAVORS_REPOSITORY/$FLAVOR/pkglist.txt | wc -l) 1.106 -Rootfs size : $(cent2human $unpacked_size) (estimated) 1.107 -Initramfs size : $(cent2human $packed_size) (estimated) 1.108 -ISO image size : $(cent2human $iso_size) (estimated) 1.109 +Packages : $(grep -v ^# $FLAVORS_REPOSITORY/$FLAVOR/packages.list | wc -l) 1.110 +Rootfs size : $ROOTFS_SIZE 1.111 +Initramfs size : $INITRAMFS_SIZE 1.112 +ISO image size : $ISO_SIZE 1.113 ================================================================================ 1.114 1.115 EOT