wok rev 10630

linux-libre: should build now
author Christophe Lincoln <pankso@slitaz.org>
date Thu May 26 22:55:44 2011 +0200 (2011-05-26)
parents 140b8b3064be
children 45c5e7f02d5d
files linux-libre/receipt
line diff
     1.1 --- a/linux-libre/receipt	Thu May 26 22:40:08 2011 +0200
     1.2 +++ b/linux-libre/receipt	Thu May 26 22:55:44 2011 +0200
     1.3 @@ -23,11 +23,13 @@
     1.4  	#do
     1.5  	#	sed -i 's|VERSION="OLDVERSION"|VERSION="NEWVERSION"|g' $i
     1.6  	#done
     1.7 -	report open-bloc
     1.8 +	[ -x /usr/bin/tazwok ] && report open-bloc
     1.9  
    1.10  	_AUFSVER=`grep  ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.11  	AUFSDIR=$WOK/$PACKAGE/aufs-${_AUFSVER}
    1.12 -	tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; }
    1.13 +	if [ -x /usr/bin/tazwok ]; then
    1.14 +		tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; }
    1.15 +	fi
    1.16  	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
    1.17  	cp -a $AUFSDIR/*.patch $WOK/$PACKA$stuff
    1.18  	cd $src
    1.19 @@ -38,7 +40,7 @@
    1.20  	cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/slitaz
    1.21  	cp $stuff/bootloader.sh $WOK/$PACKAGE/slitaz
    1.22  	# Apply patches
    1.23 -	report step "Applying patches"
    1.24 +	echo "Applying patches"
    1.25  	while read patch_file; do
    1.26  		echo "$patch_file" >> $WOK/$PACKAGE/slitaz/patches
    1.27  		cp $stuff/$patch_file $WOK/$PACKAGE/slitaz
    1.28 @@ -62,13 +64,13 @@
    1.29  004-squashfs-add-xz-compression-support.patch
    1.30  005-squashfs-add-xz-compression-configuration-option.patch
    1.31  EOT
    1.32 -	report step "Make kernel proper and then build lguest"
    1.33 +	echo "Make kernel proper and then build lguest"
    1.34  	make mrproper
    1.35  	cd Documentation/lguest
    1.36  	make lguest || { report close-bloc; return 1; }
    1.37  	cd $src
    1.38  
    1.39 -	report step "Make bzImage without modules first"
    1.40 +	echo "Make bzImage without modules first"
    1.41  	# Build bzImage without modules first
    1.42  	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.43  	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
    1.44 @@ -82,7 +84,7 @@
    1.45  	mv arch/x86/boot/bzImage $PWD/_pkg
    1.46  	mv System.map System.map-without-modules
    1.47  
    1.48 -	report step "Now build bzImage with modules"
    1.49 +	echo "Now build bzImage with modules"
    1.50  	# Build bzImage with modules
    1.51  	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.52  	make oldconfig
    1.53 @@ -91,15 +93,15 @@
    1.54  	make -j 4 modules &&
    1.55  	make INSTALL_MOD_PATH=$PWD/_pkg modules_install &&
    1.56  	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install &&
    1.57 -	[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
    1.58 +	#[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
    1.59  	mkdir -p $PWD/_pkg/boot 2> /dev/null
    1.60  	mv arch/x86/boot/bzImage $PWD/_pkg/boot/vmlinuz-$VERSION-slitaz
    1.61  	# Compress all modules.
    1.62 -	report step "Compressing all modules"
    1.63 +	echo "Compressing all modules"
    1.64  	$stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz
    1.65  	ln System.map System.map-modules
    1.66  	ln Module.symvers Module.symvers-modules
    1.67 -	report close-bloc
    1.68 +	[ -x /usr/bin/tazwok ] && report close-bloc
    1.69  }
    1.70  
    1.71  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.72 @@ -127,14 +129,10 @@
    1.73      # Remove unresolved links
    1.74      rm -f $fs/lib/modules/$VERSION-slitaz/build
    1.75      rm -f $fs/lib/modules/$VERSION-slitaz/source
    1.76 -    # Cook all packages with a kernel module
    1.77 -    for i in $(cd $WOK; grep -l 'tazwok cook linux$' */receipt)
    1.78 -    do
    1.79 -    	echo tazwok cook ${i%/receipt}
    1.80 -    done
    1.81 +
    1.82      # Check and echo any module in kernel .config that's not added to 
    1.83      # one of linux-* pkgs
    1.84 -$stuff/check_modules.sh 
    1.85 +	$stuff/check_modules.sh 
    1.86  }
    1.87  
    1.88  # Pre and post install commands for Tazpkg.