SliTaz Repositories

     1.1 --- a/linux/receipt	Mon Feb 14 15:47:37 2011 +0000
     1.2 +++ b/linux/receipt	Thu Feb 17 19:06:05 2011 +0100
     1.3 @@ -24,28 +24,29 @@
     1.4  	report open-bloc
     1.5  
     1.6  	report step "Installing aufs source"
     1.7 -	AUFSDIR=$WOK/$PACKAGE/aufs
     1.8 -	tazwok get-src aufs --target=$AUFSDIR
     1.9 +	_AUFSVER=`grep  ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.10 +	AUFSDIR=$WOK/$PACKAGE/aufs-${_AUFSVER}
    1.11 +	tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; }
    1.12  	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
    1.13  	cp -a $AUFSDIR/*.patch $WOK/$PACKAGE/stuff
    1.14  	cd $src
    1.15  	# SliTaz db
    1.16 -	[ -d slitaz ] && rm -rf slitaz 2> /dev/null
    1.17 -	mkdir slitaz
    1.18 +	[ -d $WOK/$PACKAGE/slitaz ] && rm -rf $WOK/$PACKAGE/slitaz 2> /dev/null
    1.19 +	mkdir $WOK/$PACKAGE/slitaz
    1.20  	echo "$WGET_URL" > slitaz/url
    1.21 -	cp ../stuff/gztazmod.sh ../stuff/list_modules.sh slitaz
    1.22 -	cp ../stuff/bootloader.sh slitaz
    1.23 +	cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/slitaz
    1.24 +	cp $stuff/bootloader.sh $WOK/$PACKAGE/slitaz
    1.25  	# Apply patches
    1.26  	report step "Applying patches"
    1.27  	while read patch_file; do
    1.28 -		echo "$patch_file" >> slitaz/patches
    1.29 -		cp ../stuff/$patch_file slitaz
    1.30 +		echo "$patch_file" >> $WOK/$PACKAGE/slitaz/patches
    1.31 +		cp $stuff/$patch_file $WOK/$PACKAGE/slitaz
    1.32  		if [ -f done.$patch_file ]; then
    1.33  			echo "Skipping $patch_file"
    1.34  			continue
    1.35  		fi
    1.36  		echo "Apply $patch_file"
    1.37 -		patch -p1 < slitaz/$patch_file || return 1
    1.38 +		patch -p1 < $WOK/$PACKAGE/slitaz/$patch_file || { report close-bloc; return 1; }
    1.39  		touch done.$patch_file
    1.40  	done <<EOT
    1.41  $PACKAGE-diff-$VERSION.u
    1.42 @@ -63,38 +64,38 @@
    1.43  	report step "Make kernel proper and then build lguest"
    1.44  	make mrproper
    1.45  	cd Documentation/lguest
    1.46 -	make lguest || return 1
    1.47 -	cd ../..
    1.48 +	make lguest || { report close-bloc; return 1; }
    1.49 +	cd $src
    1.50  
    1.51  	report step "Make bzImage without modules first"
    1.52  	# Build bzImage without modules first
    1.53 -	cp -f ../stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.54 +	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.55  	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
    1.56  	# We can't keep every driver in staging 
    1.57  	sed -i -e 's/^CONFIG_RTL8192/#&/' \
    1.58  	       -e 's/^CONFIG_R8187SE/#&/' \
    1.59  	       -e 's/^CONFIG_RT2870/#&/' .config
    1.60  	yes '' | make oldconfig
    1.61 -	make -j 4 bzImage || return 1
    1.62 +	make -j 4 bzImage || { report close-bloc; return 1; }
    1.63  	[ -d $PWD/_pkg ] || mkdir -p $PWD/_pkg
    1.64  	mv arch/x86/boot/bzImage $PWD/_pkg
    1.65  	mv System.map System.map-without-modules
    1.66  
    1.67  	report step "Now build bzImage with modules"
    1.68  	# Build bzImage with modules
    1.69 -	cp -f ../stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.70 +	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.71  	make oldconfig
    1.72 -	ln .config slitaz/config
    1.73 +	ln .config $WOK/$PACKAGE/slitaz/config
    1.74  	make -j 4 bzImage &&
    1.75  	make -j 4 modules &&
    1.76  	make INSTALL_MOD_PATH=$PWD/_pkg modules_install &&
    1.77  	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install &&
    1.78 -	[ -s arch/x86/boot/bzImage ] || return 1
    1.79 +	[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
    1.80  	mkdir -p $PWD/_pkg/boot 2> /dev/null
    1.81  	mv arch/x86/boot/bzImage $PWD/_pkg/boot/vmlinuz-$VERSION-slitaz
    1.82  	# Compress all modules.
    1.83  	report step "Compressing all modules"
    1.84 -	$WOK/$PACKAGE/stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz
    1.85 +	$stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz
    1.86  	ln System.map System.map-modules
    1.87  	ln Module.symvers Module.symvers-modules
    1.88  	report close-bloc
    1.89 @@ -114,13 +115,14 @@
    1.90      # Get the base modules
    1.91      export src
    1.92      export _pkg
    1.93 -    $src/slitaz/list_modules.sh \
    1.94 -	$(cat stuff/modules-$VERSION.list) > $src/modules.list
    1.95 +    mkdir $WOK/tmp
    1.96 +    $WOK/$PACKAGE/stuff/list_modules.sh \
    1.97 +	$(cat stuff/modules-$VERSION.list) > $WOK/tmp/modules.list
    1.98      while read module; do
    1.99      	dir=$(dirname $module)
   1.100      	[ -d $path/$dir ] || mkdir -p $path/$dir
   1.101          cp -a $_pkg/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
   1.102 -    done < $src/modules.list
   1.103 +    done < $WOK/tmp/modules.list
   1.104      # Remove unresolved links
   1.105      rm -f $fs/lib/modules/$VERSION-slitaz/build
   1.106      rm -f $fs/lib/modules/$VERSION-slitaz/source