wok diff squashfs/receipt @ rev 1596

midori: fix depends
author Paul Issott <paul@slitaz.org>
date Fri Oct 17 18:01:06 2008 +0000 (2008-10-17)
parents b4ca1619acb9
children ca15fff92039
line diff
     1.1 --- a/squashfs/receipt	Fri Oct 03 13:57:14 2008 +0000
     1.2 +++ b/squashfs/receipt	Fri Oct 17 18:01:06 2008 +0000
     1.3 @@ -9,7 +9,7 @@
     1.4  TARBALL="squashfs$VERSION.tgz"
     1.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     1.6  DEPENDS="zlib squashfs-module"
     1.7 -BUILD_DEPENDS="zlib-dev patch"
     1.8 +BUILD_DEPENDS="zlib-dev patch lzma"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
    1.12 @@ -17,7 +17,9 @@
    1.13  	local kver
    1.14  	local patch_dir
    1.15  
    1.16 -	ln -s . $src
    1.17 +	mkdir -p $src
    1.18 +	cd $src
    1.19 +	mv ../$PACKAGE$VERSION .
    1.20  	# get kernel version
    1.21  	if [ ! -d $WOK/linux/taz ]; then
    1.22  		tazwok cook linux
    1.23 @@ -43,7 +45,7 @@
    1.24  	[ -d _kernel ] && rm -rf _kernel
    1.25  	mkdir _kernel
    1.26  	cd _kernel
    1.27 -	ln -fs ../../linux/linux-$kver* src
    1.28 +	ln -fs $WOK/linux/linux-$kver* src
    1.29  
    1.30  	# Copy files to be patched in local aera
    1.31  	# Do not alter kernel sources !!
    1.32 @@ -58,7 +60,7 @@
    1.33  	awk 'BEGIN { keep=1} /^---/ { keep=(index($0,"/fs/squashfs/") || index($0,"/include/linux/"))} { if (keep) print }' < \
    1.34  		../$patch_dir/${PACKAGE}${VERSION}-patch | patch -p1
    1.35  
    1.36 -	extra_patch=stuff/squashfs-patch-${kver%.*}
    1.37 +	extra_patch=../stuff/squashfs-patch-${kver%.*}
    1.38  	if [ -e ../$extra_patch ]; then
    1.39  		echo "Apply $extra_patch..."
    1.40  		patch -p1 < ../$extra_patch || return 1
    1.41 @@ -74,7 +76,7 @@
    1.42  	
    1.43  	# Apply lzma patches
    1.44  #	echo "Apply stuff/lzma.u.."
    1.45 -#	patch -p0 < ../stuff/lzma.u || return 1
    1.46 +#	patch -p0 < ../../stuff/lzma.u || return 1
    1.47  	
    1.48  	# Build kernel module
    1.49  	make -C src/. SUBDIRS=$(pwd)/fs/squashfs/ CONFIG_SQUASHFS=m modules || return 1
    1.50 @@ -82,9 +84,8 @@
    1.51  	[ -d _pkg ] && rm -rf _pkg
    1.52  	mkdir -p _pkg/lib/modules/$kver-slitaz/kernel/fs/squashfs
    1.53  	mkdir -p _pkg/usr/sbin _pkg/sbin
    1.54 -	cp _kernel/fs/squashfs/squashfs.ko \
    1.55 -        	_pkg/lib/modules/$kver-slitaz/kernel/fs/squashfs/squashfs.ko
    1.56 -	gzip -9 _pkg/lib/modules/$kver-slitaz/kernel/fs/squashfs/squashfs.ko
    1.57 +	lzma e _kernel/fs/squashfs/squashfs.ko \
    1.58 +        	_pkg/lib/modules/$kver-slitaz/kernel/fs/squashfs/squashfs.ko.gz
    1.59  
    1.60  	# Build user land tools
    1.61  	cd ${PACKAGE}${VERSION}/squashfs-tools
    1.62 @@ -96,5 +97,5 @@
    1.63  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.64  genpkg_rules()
    1.65  {
    1.66 -	cp -a _pkg/usr _pkg/sbin $fs
    1.67 +	cp -a $_pkg/usr $_pkg/sbin $fs
    1.68  }