slitaz-modular diff mkiso.sh @ rev 117

mkiso.sh: Added option SRC_PKG to get the all SOURCE packages. This only works if there the same version though.
author: Christopher Rogers <slaxemulator@gmail.com>
date: Sun Jun 12 21:40:51 2011 +0000 (2011-06-12)
parents: 41cd6454e504
children: 37db3f3750ae
     1.1 --- a/mkiso.sh	Wed Jun 01 09:13:26 2011 +0000
     1.2 +++ b/mkiso.sh	Sun Jun 12 21:40:51 2011 +0000
     1.3 @@ -49,7 +49,7 @@
     1.4  PACKAGES_REPOSITORY="$LOCAL_REPOSITORY/packages"
     1.5  INCOMING_REPOSITORY="$LOCAL_REPOSITORY/packages-incoming"
     1.6  SOURCES_REPOSITORY="$LOCAL_REPOSITORY/src"
     1.7 -HG_LIST="cookutils flavors flavors-stable slitaz-base-files slitaz-boot-scripts slitaz-configs slitaz-dev-tools slitaz-doc slitaz-doc-wiki-data slitaz-forge slitaz-modular slitaz-pizza slitaz-tools tazlito tazpanel tazpkg tazusb tazweb tazwok website wok-tiny wok-undigest"
     1.8 +HG_LIST="cookutils flavors flavors-stable slitaz-base-files slitaz-boot-scripts slitaz-configs slitaz-dev-tools slitaz-doc slitaz-doc-wiki-data slitaz-forge slitaz-modular slitaz-pizza slitaz-tools ssfs tazlito tazpanel tazpkg tazusb tazweb tazwok website wok-tiny wok-undigest"
     1.9  MY_HG_LIST="my-cookutils wok-tank"
    1.10  MY_HG_URL="https://bitbucket.org/godane"
    1.11  
    1.12 @@ -337,33 +337,65 @@
    1.13  				tail -1 | sed 's/ *//')"
    1.14  			incoming_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $INCOMING_REPOSITORY/packages.txt | \
    1.15  				tail -1 | sed 's/ *//')"
    1.16 +			cache_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $LOCALSTATE/packages.txt | \
    1.17 +					tail -1 | sed 's/ *//')"
    1.18  			for wanted in $rwanted; do
    1.19  				if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
    1.20  					ln -sf $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$incoming_pkg_VERSION.tazpkg
    1.21  				elif [ -f $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg ]; then
    1.22  					ln -sf $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
    1.23 -				elif [ -f $CACHE_REPOSITORY/$Wanted-$pkg_VERSION.tazpkg ]; then
    1.24 -					ln -sf $CACHE_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
    1.25 +				elif [ -f $CACHE_REPOSITORY/$Wanted-$cache_pkg_VERSION.tazpkg ]; then
    1.26 +					ln -sf $CACHE_REPOSITORY/$wanted-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$cache_pkg_VERSION.tazpkg
    1.27  				fi
    1.28  			done
    1.29 +
    1.30 +			if [ -f $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg ]; then
    1.31 +				ln -sf $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$incoming_pkg_VERSION.tazpkg
    1.32 +			elif [ -f $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg ]; then
    1.33 +				ln -sf $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$pkg_VERSION.tazpkg
    1.34 +			elif [ -f $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg ]; then
    1.35 +				ln -sf $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$cache_pkg_VERSION.tazpkg
    1.36 +			fi
    1.37 +		done
    1.38  		
    1.39 -			for i in $(ls $WOK/$pkg/receipt); do
    1.40 -				unset SOURCE TARBALL WANTED PACKAGE VERSION pkg_VERSION COOK_OPT WGET_URL
    1.41 -				source $i
    1.42 -				pkg_VERSION="$(grep -m1 -A1 ^$PACKAGE$ $PACKAGES_REPOSITORY/packages.txt | \
    1.43 -					tail -1 | sed 's/ *//')"
    1.44 -				incoming_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $INCOMING_REPOSITORY/packages.txt | \
    1.45 -					tail -1 | sed 's/ *//')"
    1.46 -				#[ "$WGET_URL" ] || continue
    1.47 -				if [ -f $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg ]; then
    1.48 -					ln -sf $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$incoming_pkg_VERSION.tazpkg
    1.49 -				elif [ -f $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg ]; then
    1.50 -					ln -sf $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg
    1.51 -				elif [ -f $CACHE_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg ]; then
    1.52 -					ln -sf $CACHE_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg
    1.53 -				fi
    1.54 +		if [ "$SRC_PKG" = "yes" ]; then
    1.55 +			cat $ISODIR/cookorder.list | grep -v "^#" | while read pkg; do
    1.56 +				[ $(grep ^$pkg$ $PROFILE/list/srcpkg.banned) ] && continue
    1.57 +				for i in $(grep -l "^SOURCE=\"$pkg\"" $WOK/*/receipt); do
    1.58 +					unset SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL
    1.59 +					unset pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION src_pkg src_ver 
    1.60 +					source $i
    1.61 +					src_pkg=$(grep ^PACKAGE= $WOK/$pkg/receipt | cut -d "=" -f 2 | sed -e 's/"//g')
    1.62 +					src_ver=$(grep ^VERSION= $WOK/$pkg/receipt | cut -d "=" -f 2 | sed -e 's/"//g')
    1.63 +					[ "$VERSION" = "$src_ver" ] || continue
    1.64 +					pkg_VERSION="$(grep -m1 -A1 ^$PACKAGE$ $PACKAGES_REPOSITORY/packages.txt | \
    1.65 +						tail -1 | sed 's/ *//')"
    1.66 +					incoming_pkg_VERSION="$(grep -m1 -A1 ^$PACKAGE$ $INCOMING_REPOSITORY/packages.txt | \
    1.67 +						tail -1 | sed 's/ *//')"
    1.68 +					cache_pkg_VERSION="$(grep -m1 -A1 ^$PACKAGE$ $LOCALSTATE/packages.txt | \
    1.69 +						tail -1 | sed 's/ *//')"
    1.70 +					rwanted=$(grep $'\t'$PACKAGE$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1)
    1.71 +					
    1.72 +					for wanted in $rwanted; do
    1.73 +						if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
    1.74 +							ln -sf $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$incoming_pkg_VERSION.tazpkg
    1.75 +						elif [ -f $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg ]; then
    1.76 +							ln -sf $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
    1.77 +						elif [ -f $CACHE_REPOSITORY/$Wanted-$pkg_VERSION.tazpkg ]; then
    1.78 +							ln -sf $CACHE_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
    1.79 +						fi
    1.80 +					done
    1.81 +					
    1.82 +					if [ -f $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg ]; then
    1.83 +						ln -sf $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$incoming_pkg_VERSION.tazpkg
    1.84 +					elif [ -f $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg ]; then
    1.85 +						ln -sf $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg
    1.86 +					elif [ -f $CACHE_REPOSITORY/$PACKAGE-$cache_pkg_VERSION.tazpkg ]; then
    1.87 +						ln -sf $CACHE_REPOSITORY/$PACKAGE-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$cache_pkg_VERSION.tazpkg
    1.88 +					fi
    1.89 +				done
    1.90  			done
    1.91 -		done
    1.92 +		fi
    1.93  		
    1.94  		[ -f $LOG/packages-gen-list.log ] && rm -f $LOG/packages-gen-list.log
    1.95  		[ -d $PKGISO_DIR ] && tazwok gen-list $PKGISO_DIR | tee -a $LOG/packages-gen-list.log
author	Christopher Rogers <slaxemulator@gmail.com>
date	Sun Jun 12 21:40:51 2011 +0000 (2011-06-12)
parents	41cd6454e504
children	37db3f3750ae