SliTaz Repositories

     1.1 --- a/linux/receipt	Mon Apr 16 09:30:43 2012 +0200
     1.2 +++ b/linux/receipt	Mon Apr 16 09:42:04 2012 +0200
     1.3 @@ -100,7 +100,7 @@
     1.4  	sed -i 's|SUBLEVEL =.*|SUBLEVEL =|g' Makefile
     1.5  
     1.6  	[ ! -x /usr/bin/cook ] && report step "Make kernel proper and then build lguest"
     1.7 -	
     1.8 +	[ -x /usr/bin/cook ] && echo "Make kernel proper and then build lguest"
     1.9  	make mrproper
    1.10  	cd Documentation/virtual/lguest
    1.11  	if [ -x /usr/bin/cook ]; then
    1.12 @@ -109,47 +109,13 @@
    1.13  		make lguest || { report close-bloc; return 1; }
    1.14  	fi
    1.15  	cd $src
    1.16 -
    1.17 -	[ ! -x /usr/bin/cook ] && report step "Make bzImage without modules first"
    1.18 -
    1.19 -	# Build bzImage without modules first
    1.20 -	cp -f $stuff/$PACKAGE-slitaz.config .config
    1.21 -	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
    1.22  	
    1.23 -	# We can't keep every driver in staging 
    1.24 -	sed -i -e 's/^CONFIG_RTL8192/#&/' \
    1.25 -	       -e 's/^CONFIG_R8187SE/#&/' \
    1.26 -	       -e 's/^CONFIG_RT2870/#&/' .config
    1.27 -	yes '' | make oldconfig
    1.28 -	if [ -x /usr/bin/cook ]; then
    1.29 -		make -j 4 bzImage || exit 1
    1.30 -	elif [ -x /usr/bin/tazwok ]; then
    1.31 -		make -j 4 bzImage || { report close-bloc; return 1; }
    1.32 -	fi
    1.33 -	[ -d $DESTDIR ] || mkdir -p $DESTDIR
    1.34 -	mv arch/x86/boot/bzImage $DESTDIR
    1.35 -	mv System.map System.map-without-modules
    1.36 -
    1.37 -	[ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules"
    1.38 +	#
    1.39 +	# Arch x86_64
    1.40 +	#
    1.41 +	[ ! -x /usr/bin/cook ] && report step "Make bzImage64 without modules first"
    1.42 +	[ -x /usr/bin/cook ] && echo "Building x86_64 Kernel"
    1.43  	
    1.44 -	# Build bzImage with modules
    1.45 -	cp -f $stuff/$PACKAGE-slitaz.config .config
    1.46 -	#make oldconfig
    1.47 -	ln .config $WOK/$PACKAGE/source/slitaz/config
    1.48 -	make -j 4 bzImage &&
    1.49 -	make -j 4 modules &&
    1.50 -	make INSTALL_MOD_PATH=$DESTDIR modules_install &&
    1.51 -	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
    1.52 -	if [ -x /usr/bin/cook ]; then
    1.53 -		[ -s arch/x86/boot/bzImage ] || return 1
    1.54 -	elif [ -x /usr/bin/tazwok ]; then
    1.55 -		[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
    1.56 -	fi
    1.57 -	mkdir -p $DESTDIR/boot 2> /dev/null
    1.58 -	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
    1.59 -	
    1.60 -	[ ! -x /usr/bin/cook ] && report step "Make bzImage64 without modules first"
    1.61 -
    1.62  	# Build bzImage64 without modules first
    1.63  	cp -f $stuff/$PACKAGE-slitaz.config64 .config
    1.64  	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
    1.65 @@ -188,6 +154,48 @@
    1.66  	ln System.map System.map-modules64
    1.67  	ln Module.symvers Module.symvers-modules64
    1.68  	
    1.69 +	#
    1.70 +	# Standard kernel
    1.71 +	#
    1.72 +	[ ! -x /usr/bin/cook ] && report step "Make bzImage without modules first"
    1.73 +	[ -x /usr/bin/cook ] && echo "Building standard kernel..."
    1.74 +	
    1.75 +	# Build bzImage without modules first
    1.76 +	cp -f $stuff/$PACKAGE-slitaz.config .config
    1.77 +	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
    1.78 +	
    1.79 +	# We can't keep every driver in staging 
    1.80 +	sed -i -e 's/^CONFIG_RTL8192/#&/' \
    1.81 +	       -e 's/^CONFIG_R8187SE/#&/' \
    1.82 +	       -e 's/^CONFIG_RT2870/#&/' .config
    1.83 +	yes '' | make oldconfig
    1.84 +	if [ -x /usr/bin/cook ]; then
    1.85 +		make -j 4 bzImage || exit 1
    1.86 +	elif [ -x /usr/bin/tazwok ]; then
    1.87 +		make -j 4 bzImage || { report close-bloc; return 1; }
    1.88 +	fi
    1.89 +	[ -d $DESTDIR ] || mkdir -p $DESTDIR
    1.90 +	mv arch/x86/boot/bzImage $DESTDIR
    1.91 +	mv System.map System.map-without-modules
    1.92 +
    1.93 +	[ ! -x /usr/bin/cook ] && report step "Now build bzImage with modules"
    1.94 +	
    1.95 +	# Build bzImage with modules
    1.96 +	cp -f $stuff/$PACKAGE-slitaz.config .config
    1.97 +	#make oldconfig
    1.98 +	ln .config $WOK/$PACKAGE/source/slitaz/config
    1.99 +	make -j 4 bzImage &&
   1.100 +	make -j 4 modules &&
   1.101 +	make INSTALL_MOD_PATH=$DESTDIR modules_install &&
   1.102 +	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
   1.103 +	if [ -x /usr/bin/cook ]; then
   1.104 +		[ -s arch/x86/boot/bzImage ] || return 1
   1.105 +	elif [ -x /usr/bin/tazwok ]; then
   1.106 +		[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
   1.107 +	fi
   1.108 +	mkdir -p $DESTDIR/boot 2> /dev/null
   1.109 +	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
   1.110 +	
   1.111  	[ ! -x /usr/bin/cook ] && report step "Compressing all modules"
   1.112  	
   1.113  	# Compress all modules.