wok rev 6719

Fixed linux recepit so there will be not need for them to be repackage twiced.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Oct 14 17:57:21 2010 +0000 (2010-10-14)
parents 37417e21084f
children 473886fe148a
files linux-dlm/receipt linux-toshiba/receipt linux-video/receipt linux/receipt
line diff
     1.1 --- a/linux-dlm/receipt	Thu Oct 14 13:00:07 2010 +0000
     1.2 +++ b/linux-dlm/receipt	Thu Oct 14 17:57:21 2010 +0000
     1.3 @@ -11,7 +11,7 @@
     1.4  CONFIG_FILES="/etc/filesystems"
     1.5  
     1.6  # Modules paths and list
     1.7 -MOD_PATH="/lib/modules/$VERSION-slitaz/kernel"
     1.8 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
     1.9  MODULES="fs/dlm/dlm.ko.gz"
    1.10  
    1.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/linux-toshiba/receipt	Thu Oct 14 13:00:07 2010 +0000
     2.2 +++ b/linux-toshiba/receipt	Thu Oct 14 17:57:21 2010 +0000
     2.3 @@ -10,7 +10,7 @@
     2.4  WEB_SITE="http://www.kernel.org/"
     2.5  
     2.6  # Modules paths and list
     2.7 -MOD_PATH="/lib/modules/$VERSION-slitaz/kernel"
     2.8 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
     2.9  MODULES="drivers/char/toshiba.ko.gz"
    2.10  
    2.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     3.1 --- a/linux-video/receipt	Thu Oct 14 13:00:07 2010 +0000
     3.2 +++ b/linux-video/receipt	Thu Oct 14 17:57:21 2010 +0000
     3.3 @@ -10,7 +10,7 @@
     3.4  WEB_SITE="http://www.kernel.org/"
     3.5  
     3.6  # Modules paths and list
     3.7 -MOD_PATH="/lib/modules/$VERSION-slitaz/kernel"
     3.8 +MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
     3.9  MODULES="drivers/video/output.ko.gz
    3.10  drivers/video/backlight/lcd.ko.gz
    3.11  drivers/video/backlight/generic_bl.ko.gz
     4.1 --- a/linux/receipt	Thu Oct 14 13:00:07 2010 +0000
     4.2 +++ b/linux/receipt	Thu Oct 14 17:57:21 2010 +0000
     4.3 @@ -15,12 +15,20 @@
     4.4  # Rules to configure and make the package.
     4.5  compile_rules()
     4.6  {
     4.7 -	# Aufs2 from git repository
     4.8 -	if [ ! -d aufs2 ]; then
     4.9 -		git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2
    4.10 -		cd aufs2 && git checkout origin/aufs2-34
    4.11 +	local _AUFSVER="20101014"
    4.12 +	[ -d "aufs2-$_AUFSVER-$VERSION" ] && rm -rf aufs2-$_AUFSVER-$VERSION
    4.13 +	TARBALL=$SOURCES_REPOSITORY/aufs2-$_AUFSVER-$VERSION.tar.gz
    4.14 +	if [ -f $TARBALL ]; then
    4.15 +		tar xzf $TARBALL
    4.16 +		cd aufs2-$_AUFSVER-$VERSION && git checkout origin/aufs2-34
    4.17 +	else
    4.18 +		# Aufs2 from git repository
    4.19 +		git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-$_AUFSVER-$VERSION
    4.20 +		cd aufs2-$_AUFSVER-$VERSION && git checkout origin/aufs2-34
    4.21 +		tar czf $TARBALL aufs2-$_AUFSVER-$VERSION
    4.22 +		
    4.23  	fi
    4.24 -	cd aufs2
    4.25 +	#cd aufs2-$_AUFSVER-$VERSION 2>/dev/null
    4.26  	cp -a Documentation fs include $src
    4.27  	cp -a *.patch ../stuff
    4.28  	# We need the real GNU patch
    4.29 @@ -65,6 +73,8 @@
    4.30  	make INSTALL_MOD_PATH=$PWD/_pkg modules_install &&
    4.31  	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install &&
    4.32  	[ -s arch/x86/boot/bzImage ]
    4.33 +	# Compress all modules.
    4.34 +	$WOK/$PACKAGE/stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz
    4.35  }
    4.36  
    4.37  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.38 @@ -75,7 +85,7 @@
    4.39      cp -a $src/arch/x86/boot/bzImage \
    4.40  		$fs/boot/vmlinuz-$VERSION-slitaz
    4.41      # Compress all modules.
    4.42 -    ./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz
    4.43 +    #./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz
    4.44      path=$fs/lib/modules/$VERSION-slitaz/kernel
    4.45      mkdir -p $path
    4.46      cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* \