# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1309955281 0
# Node ID 5dbe2cc5a2e10caefcb471f490c4dc020f6ba2b4
# Parent  ba40ec6eac2b21c1f059a62e31db5b36904d4c1c# Parent  a1fb349257d86a57b428913e6818af6b73a84a79
Merge default.

diff -r ba40ec6eac2b -r 5dbe2cc5a2e1 .hgtags
--- a/.hgtags	Wed Jul 06 12:24:43 2011 +0000
+++ b/.hgtags	Wed Jul 06 12:28:01 2011 +0000
@@ -30,3 +30,4 @@
 621bcc0de8ca7e029c7ca34060786f4cf8fba0f9 4.2.13
 1165e2c0ac23be43123fef2fc5b3b13ef11e2099 4.2.14
 40ed5424dbfcbd93a0e59376495f916552f57f34 4.2.15
+a771874e05d6b7b3e74c71fd6a67f7f6d511f4b9 4.2.16
diff -r ba40ec6eac2b -r 5dbe2cc5a2e1 examples/tazwok.conf
--- a/examples/tazwok.conf	Wed Jul 06 12:24:43 2011 +0000
+++ b/examples/tazwok.conf	Wed Jul 06 12:28:01 2011 +0000
@@ -64,7 +64,7 @@
 # with same hardware and newest of the same family :
 #CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
 #CFLAGS="-mtune=$ARCH -O2 -pipe -fomit-frame-pointer"
-CFLAGS="-march=$ARCH -0s -pipe -fomit-frame-pointer"
+CFLAGS="-march=$ARCH -Os -pipe -fomit-frame-pointer"
 CXXFLAGS="$CFLAGS"
 
 # Default tool prefix.
diff -r ba40ec6eac2b -r 5dbe2cc5a2e1 tazwok
--- a/tazwok	Wed Jul 06 12:24:43 2011 +0000
+++ b/tazwok	Wed Jul 06 12:28:01 2011 +0000
@@ -480,6 +480,11 @@
 	fi
 	stuff=$WOK/$PACKAGE/stuff
 	[ "$WANTED" ] && wanted_stuff=$WOK/$WANTED/stuff
+	# Kernel version is set from linux-api-headers since it part of toolchain.
+	if [ -f "$LOCALSTATE/installed/linux-api-headers/receipt" ]; then
+		kvers=$(grep ^VERSION= $LOCALSTATE/installed/linux-api-headers/receipt | \
+			cut -d '"' -f 2)
+	fi
 }
 
 set_pkg_path()
@@ -527,17 +532,17 @@
 	fi
 	tmp_src=$tmp/tarball-$$
 	if [ ! -f "$SOURCES_REPOSITORY/$TARBALL" ] && \
-		[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] ; then
+		[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ] ; then
 		cd $SOURCES_REPOSITORY
 		if [ "$SOURCE" ]; then
-			alt_url="http://mirror.slitaz.org/sources/packages/${SOURCE:0:1}/$SOURCE-$VERSION.tar.lzma"
+			alt_url="http://mirror.slitaz.org/sources/packages/${SOURCE:0:1}/$SOURCE-${KBASEVER:-$VERSION}.tar.lzma"
 		else
-			alt_url="http://mirror.slitaz.org/sources/packages/${PACKAGE:0:1}/$PACKAGE-$VERSION.tar.lzma"
+			alt_url="http://mirror.slitaz.org/sources/packages/${PACKAGE:0:1}/$PACKAGE-${KBASEVER:-$VERSION}.tar.lzma"
 		fi
 		download $WGET_URL $alt_url http://mirror.slitaz.org/sources/packages/${TARBALL:0:1}/$TARBALL
 		unset alt_url
 		if [ ! -f "$SOURCES_REPOSITORY/$TARBALL" ] && \
-			[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && \
+			[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ] && \
 			[ ! -d $tmp_src ]; then
 			echo -e "\nDownload failed, exiting. Please check WGET_URL variable.\n" >&2
 			report end-step
@@ -545,7 +550,7 @@
 		fi
 	fi
 	report end-step
-	if { [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$nounpack" ] ; } || \
+	if { [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ] && [ "$nounpack" ] ; } || \
 	{ [ -f "$SOURCES_REPOSITORY/$TARBALL" ] && [ "$repack_src" != yes ] && [ "$nounpack" ] ; }; then
 		[ -d "$tmp_src" ] && rm -r "$tmp_src"
 		return 0
@@ -559,11 +564,11 @@
 	# If $tmp_src exists, there's already a unpacked tarball in it.
 	if ! [ -d "$tmp_src" ]; then
 		mkdir "$tmp_src"
-		if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$repack_src" = yes ]; then
-			lzma d $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma -so | \
+		if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" ] && [ "$repack_src" = yes ]; then
+			lzma d $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma -so | \
 				tar xf - -C "$tmp_src"
 			repack_src=no
-			TARBALL=${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
+			TARBALL=${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
 		elif [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
 			case "$TARBALL" in
 				*zip|*xpi) cd $tmp_src && unzip -o $SOURCES_REPOSITORY/$TARBALL ;;
@@ -574,6 +579,7 @@
 				*Z|*taz) uncompress -c $SOURCES_REPOSITORY/$TARBALL | tar xf - -C $tmp_src;;
 				*gz) tar xzf $SOURCES_REPOSITORY/$TARBALL -C $tmp_src;;
 				*rpm) cd $tmp_src && rpm2cpio $SOURCES_REPOSITORY/$TARBALL | cpio -idm --quiet;;
+				*.run) cd $tmp_src && sh $SOURCES_REPOSITORY/$TARBALL $RUN_OPTS;;
 
 				# It's a plain file or something receipt unpack itself.	
 				*)
@@ -606,7 +612,7 @@
 	if [ "$repack_src" = yes ]; then
 			report step "Repacking sources in .tar.lzma format"
 			[ "$TARBALL" ] && rm -f $SOURCES_REPOSITORY/$TARBALL
-			TARBALL=${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
+			TARBALL=${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma
 			cd "$tmp_src"
 			tar -c * | lzma e $SOURCES_REPOSITORY/$TARBALL -si
 	fi
@@ -663,8 +669,8 @@
 		[ "$WGET_URL" ] || continue
 		if grep -q "^$PACKAGE | $VERSION" $PACKAGES_REPOSITORY/packages.desc; then
 			main_version="$VERSION"
-			if [ -f $src_repository/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then
-				echo -e "$PACKAGE:main\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $src_repository/sources.list
+			if [ -f $src_repository/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma ]; then
+				echo -e "$PACKAGE:main\t${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" >> $src_repository/sources.list
 			elif [ -f "$src_repository/$TARBALL" ]; then
 				echo -e "$PACKAGE:main\t$TARBALL" >> $src_repository/sources.list
 			fi
@@ -678,8 +684,8 @@
 			fi
 		fi
 		if [ ! "$main_version" ] || [ $(grep -q "^$PACKAGE | $VERSION" $INCOMING_REPOSITORY/packages.desc 2>/dev/null) ]; then
-			if [ -f $src_repository/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma ]; then
-				echo -e "$PACKAGE:incoming\t${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" >> $src_repository/sources.list
+			if [ -f $src_repository/${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma ]; then
+				echo -e "$PACKAGE:incoming\t${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma" >> $src_repository/sources.list
 			elif [ -f "$src_repository/$TARBALL" ]; then
 				echo -e "$PACKAGE:incoming\t$TARBALL" >> $src_repository/sources.list
 			fi
@@ -1550,7 +1556,8 @@
 	unset PACKAGE SOURCE VERSION EXTRAVERSION CATEGORY SHORT_DESC \
 		MAINTAINER WEB_SITE WGET_URL DEPENDS BUILD_DEPENDS WANTED \
 		PACKED_SIZE UNPACKED_SIZE COOK_OPT PROVIDE CONFIG_FILES TAGS \
-		src _pkg DESTDIR CONFIG_SITE BRANCH TARBALL stuff wanted_stuff
+		src _pkg DESTDIR CONFIG_SITE BRANCH TARBALL KBASEVER \
+		stuff wanted_stuff
 	. ${RECEIPT:-$PWD/receipt}
 }