# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1306484580 -7200
# Node ID 51dc38f6efcad3a40d9c8df09b27a466ca428aa6
# Parent  1518333a0bc26e69b3352c531421ff9c16367f37
linmodem-*: clean-up, tab ident and user $kvers set by pkg builders

diff -r 1518333a0bc2 -r 51dc38f6efca linmodem-agrsm/receipt
--- a/linmodem-agrsm/receipt	Fri May 27 09:55:17 2011 +0200
+++ b/linmodem-agrsm/receipt	Fri May 27 10:23:00 2011 +0200
@@ -15,28 +15,24 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	KVERS=$(grep ^VERSION= $INSTALLED/linux/receipt | cut -d '"' -f 2)
 	sed -i \
 		-e 's/\([^_]\)usb_buffer_free/\1usb_free_coherent/' \
 		-e 's/\([^_]\)usb_buffer_alloc/\1usb_alloc_coherent/' \
 		agrsoftmodem.c
-	make KERNEL_DIR=/usr/src/linux-$KVERS-slitaz KRELEASE=$KVERS
+	make KERNEL_DIR=/usr/src/linux-$kvers-slitaz KRELEASE=$kvers
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
-{	
-	KVERS=$(grep ^VERSION= $INSTALLED/linux/receipt | cut -d '"' -f 2)
-	EXTRAVERSION=_$KVERS
-	echo "EXTRAVERSION: $EXTRAVERSION"
-	
-	mkdir -p $fs/lib/modules/$KVERS-slitaz/kernel/drivers/net
+{
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/net
 	
 	# Compress and install module
-	lzma e $src/agrmodem.ko $fs/lib/modules/$KVERS-slitaz/kernel/drivers/net/agrmodem.ko.gz
-	lzma e $src/agrserial.ko $fs/lib/modules/$KVERS-slitaz/kernel/drivers/net/agrserial.ko.gz		
-	chown root $fs/lib/modules/$KVERS-slitaz/kernel/drivers/net/*.ko.gz
-	chmod 0644 $fs/lib/modules/$KVERS-slitaz/kernel/drivers/net/*.ko.gz			
+	lzma e $src/agrmodem.ko $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/agrmodem.ko.gz
+	lzma e $src/agrserial.ko $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/agrserial.ko.gz		
+	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/*.ko.gz
+	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/*.ko.gz			
 }
 
 post_install()
diff -r 1518333a0bc2 -r 51dc38f6efca linmodem-hsfmodem/receipt
--- a/linmodem-hsfmodem/receipt	Fri May 27 09:55:17 2011 +0200
+++ b/linmodem-hsfmodem/receipt	Fri May 27 10:23:00 2011 +0200
@@ -6,39 +6,38 @@
 CATEGORY="non-free"
 SHORT_DESC="Driver for the Conexant (formerly Rockwell) HSF Softmodem family."
 MAINTAINER="orphaned@sliatz.org"
-DEPENDS="module-init-tools perl usbutils"
-BUILD_DEPENDS="cpio linux lzma linux-module-headers util-linux-ng-getopt"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.linuxant.com/drivers"
 WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$SOURCE-$VERSION/$TARBALL"
 
+DEPENDS="module-init-tools perl usbutils"
+BUILD_DEPENDS="cpio linux lzma linux-module-headers util-linux-ng-getopt \
+usbutils-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
 	cd $src
 	echo "Apply $file..."
 	patch -p1 < $(ls $stuff/$SOURCE-*.diff) || return 1
-	grep -rl 'uname -r' . | xargs sed -i "s/uname -r/echo $KERNEL_VERSION/g"
+	grep -rl 'uname -r' . | xargs sed -i "s/uname -r/echo $kvers/g"
 	# build driver
 	echo "Build driver"
-	make ROOT=$PWD/_pkg install
+	make ROOT=$DESTDIR install
 	# build kernel modules
-	echo "Running $PWD/_pkg/usr/sbin/hsfconfig -ka"
-	$PWD/_pkg/usr/sbin/hsfconfig -ka
-	echo "done."
-	[ -d /lib/modules/$KERNEL_VERSION/extra ]
+	echo "Running $DESTDIR/usr/sbin/hsfconfig -ka..."
+	$DESTDIR/usr/sbin/hsfconfig -ka
+	echo " OK"
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
 	# kernel modules
-	mkdir -p $fs/lib/modules/$KERNEL_VERSION
-	cp -a /lib/modules/$KERNEL_VERSION/extra $fs/lib/modules/$KERNEL_VERSION
+	mkdir -p $fs/lib/modules/$kvers
+	cp -a /lib/modules/$kvers/extra $fs/lib/modules/$kvers
 	# cleaning up
-	rm -r /lib/modules/$KERNEL_VERSION/extra
+	rm -r /lib/modules/$kvers/extra
 	# command files
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/sbin $fs/usr
diff -r 1518333a0bc2 -r 51dc38f6efca linmodem-intel-536ep/receipt
--- a/linmodem-intel-536ep/receipt	Fri May 27 09:55:17 2011 +0200
+++ b/linmodem-intel-536ep/receipt	Fri May 27 10:23:00 2011 +0200
@@ -5,49 +5,46 @@
 CATEGORY="network"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="Intel Modem Drivers for 536EP chipset"
-DEPENDS="linux"
-BUILD_DEPENDS="linux-module-headers lzma"
 WEB_SITE="http://linmodems.technion.ac.il/packages/Intel/"
 TARBALL="intel-536EP-537EP_2009_07_04.tar.bz2"
 WGET_URL="$WEB_SITE/Philippe.Vouters/$TARBALL"
-TAGS=""
+
+DEPENDS="linux"
+BUILD_DEPENDS="linux-module-headers lzma"
 
 # Rules to configure and make the package.
-
-compile_rules() {
-    
-  KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-  cd $src
-
-  while read file; do
-    	[ -f done.$file ] && continue
-    	echo "Apply $file..."
-    	patch -p1 < $stuff/$PACKAGE-$file || return 1
+compile_rules()
+{
+	cd $src	
+	while read file; do
+		[ -f done.$file ] && continue
+		echo "Apply $file..."
+		patch -p1 < $stuff/$PACKAGE-$file || return 1
 	touch done.$file
-    done <<EOT
+	done <<EOT
 kernel-2.6.30.patch
 kernel-2.6.33.patch
 kernel-2.6.37.patch
 EOT
-  grep -rl 'uname -r' * | xargs sed -i "s/uname -r/echo $KERNEL_VERSION/"
-   # Bypass linux source package check
-  sed -i 's/@bash config_check/#@bash config_check/' makefile
-  grep -rl 'linux/autoconf.h' * | xargs sed -i 's|linux/autoconf.h|generated/autoconf.h|'
-  make KERNEL_SOURCE_PATH=/usr/src/linux KDIR=/usr/src/linux MODEM_TYPE=536 536
+	grep -rl 'uname -r' * | xargs sed -i "s/uname -r/echo $kvers/"
+	# Bypass linux source package check
+	sed -i 's/@bash config_check/#@bash config_check/' makefile
+	grep -rl 'linux/autoconf.h' * | xargs sed -i \
+		's|linux/autoconf.h|generated/autoconf.h|'
+	make KERNEL_SOURCE_PATH=/usr/src/linux KDIR=/usr/src/linux MODEM_TYPE=536 536
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {	
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	EXTRAVERSION=_$KERNEL_VERSION
-	
-	mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/net
 	
 	# Compress and install module
-	lzma e $src/Intel536.ko $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/intel536.ko.gz
-	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/intel536.ko.gz
-	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/intel536.ko.gz		
+	lzma e $src/Intel536.ko \
+		$fs/lib/modules/$kvers-slitaz/kernel/drivers/net/intel536.ko.gz
+	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/intel536.ko.gz
+	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/intel536.ko.gz		
 }
 
 post_install()
diff -r 1518333a0bc2 -r 51dc38f6efca linmodem-intel-537/receipt
--- a/linmodem-intel-537/receipt	Fri May 27 09:55:17 2011 +0200
+++ b/linmodem-intel-537/receipt	Fri May 27 10:23:00 2011 +0200
@@ -13,42 +13,38 @@
 TAGS=""
 
 # Rules to configure and make the package.
-
-compile_rules() {
-	 
- KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
- cd $src
-
-  while read file; do
-    	[ -f done.$file ] && continue
-    	echo "Apply $file..."
-    	patch -p1 < $stuff/$PACKAGE-$file || return 1
-	touch done.$file
-    done <<EOT
+compile_rules()
+{
+	cd $src
+	while read file; do
+		[ -f done.$file ] && continue
+		echo "Apply $file..."
+		patch -p1 < $stuff/$PACKAGE-$file || return 1
+		touch done.$file
+	done <<EOT
 kernel-2.6.30.patch
 kernel-2.6.33.patch
 kernel-2.6.37.patch
 EOT
-  grep -rl 'uname -r' * | xargs sed -i "s/uname -r/echo $KERNEL_VERSION/"
-   # Bypass linux source package check
-  sed -i 's/@bash config_check/#@bash config_check/' makefile
-  grep -rl 'linux/autoconf.h' * | xargs sed -i 's|linux/autoconf.h|generated/autoconf.h|'
-  make KERNEL_SOURCE_PATH=/usr/src/linux KDIR=/usr/src/linux MODEM_TYPE=537 537
-  
+	grep -rl 'uname -r' * | xargs sed -i "s/uname -r/echo $kvers/"
+	# Bypass linux source package check
+	sed -i 's/@bash config_check/#@bash config_check/' makefile
+	grep -rl 'linux/autoconf.h' * | xargs sed -i \
+		's|linux/autoconf.h|generated/autoconf.h|'
+	make KERNEL_SOURCE_PATH=/usr/src/linux KDIR=/usr/src/linux MODEM_TYPE=537 537
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {	
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	EXTRAVERSION=_$KERNEL_VERSION
-	
-	mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/net
 	
 	# Compress and install module
-	lzma e $src/Intel537.ko $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/intel537.ko.gz
-	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/intel537.ko.gz
-	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/intel537.ko.gz			
+	lzma e $src/Intel537.ko \
+		$fs/lib/modules/$kvers-slitaz/kernel/drivers/net/intel537.ko.gz
+	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/intel537.ko.gz
+	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/intel537.ko.gz			
 }
 
 post_install()
diff -r 1518333a0bc2 -r 51dc38f6efca linmodem-slmodem/receipt
--- a/linmodem-slmodem/receipt	Fri May 27 09:55:17 2011 +0200
+++ b/linmodem-slmodem/receipt	Fri May 27 10:23:00 2011 +0200
@@ -5,51 +5,44 @@
 CATEGORY="network"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="Drivers for the Smartlink winmodems"
-BUILD_DEPENDS="linux lzma"
 WEB_SITE="http://linmodems.technion.ac.il/packages/smartlink/"
 SOURCE="slmodem"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS=""
+
+BUILD_DEPENDS="linux-module-headers lzma"
 
 # Rules to configure and make the package.
 
 compile_rules() {
-    
- KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
- [ -d $WOK/linux/taz ] || tazwok cook linux
- 
- ungrab=ungrab-winmodem-20090716
- [ -f $SOURCES_REPOSITORY/$ungrab.tar.gz ] ||
-	wget $WEB_SITE/$ungrab.tar.gz -P $SOURCES_REPOSITORY
- [ -d $ungrab ] || tar -xzf $SOURCES_REPOSITORY/$ungrab.tar.gz
- cd $ungrab
- make KERNEL_DIR=$WOK/linux/linux-$KERNEL_VERSION
- cd $src
-  for i in utsrelease.h ; do
-    grep -rl linux/$i * | xargs sed -i "s|linux/$i|generated/$i|"
-  done
-  sed -i 's|^obj-m := slamr.o slusb.o|obj-m := slamr.o|' drivers/Makefile
-  sed -i 's/\.ioctl/.unlocked_ioctl/' drivers/amrmo_init.c
-  make KERNEL_DIR=$WOK/linux/linux-$KERNEL_VERSION SUPPORT_ALSA=1 DESTDIR=$PWD/_pkg drivers
+	ungrab=ungrab-winmodem-20090716
+	[ -f $SOURCES_REPOSITORY/$ungrab.tar.gz ] ||
+		wget $WEB_SITE/$ungrab.tar.gz -P $SOURCES_REPOSITORY
+	[ -d $ungrab ] || tar -xzf $SOURCES_REPOSITORY/$ungrab.tar.gz
+	cd $ungrab
+	make KERNEL_DIR=/usr/src/linux
+	cd $src
+	for i in utsrelease.h ; do
+		grep -rl linux/$i * | xargs sed -i "s|linux/$i|generated/$i|"
+	done
+	sed -i 's|^obj-m := slamr.o slusb.o|obj-m := slamr.o|' drivers/Makefile
+	sed -i 's/\.ioctl/.unlocked_ioctl/' drivers/amrmo_init.c
+	make KERNEL_DIR=/usr/src/linux SUPPORT_ALSA=1 DESTDIR=$DESTDIR drivers
 }
 	
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {	
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	EXTRAVERSION=_$KERNEL_VERSION
-	
-	mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net
+	EXTRAVERSION=_${kvers}
+	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/net
 	
 	# Compress and install module
-	lzma e $src/drivers/slamr.ko $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/slamr.ko.gz
-	lzma e ungrab-winmodem-20090716/ungrab-winmodem.ko $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/ungrab-winmodem.ko.gz
-	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/slamr.ko.gz
-	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/ungrab-winmodem.ko.gz
-	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/slamr.ko.gz	
-	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/net/ungrab-winmodem.ko.gz
-		
+	lzma e $src/drivers/slamr.ko \
+		$fs/lib/modules/$kvers-slitaz/kernel/drivers/net/slamr.ko.gz
+	lzma e ungrab-winmodem-20090716/ungrab-winmodem.ko \
+		$fs/lib/modules/$kvers-slitaz/kernel/drivers/net/ungrab-winmodem.ko.gz
+	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/*.ko.gz
+	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/*.ko.gz	
 }
 
 post_install()