wok diff linux/receipt @ rev 886

Up: linux (2.5.25.5)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jun 07 22:04:11 2008 +0000 (2008-06-07)
parents 7a8f9456adc2
children da3467381855
line diff
     1.1 --- a/linux/receipt	Fri Jun 06 23:15:25 2008 +0000
     1.2 +++ b/linux/receipt	Sat Jun 07 22:04:11 2008 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="linux"
     1.7 -VERSION="2.6.24.2"
     1.8 +VERSION="2.6.25.5"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux kernel and modules."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -13,34 +13,22 @@
    1.13  compile_rules()
    1.14  {
    1.15  	cd $src
    1.16 -	# lzma and boot patch from pascal
    1.17 +	# lzma and misc patches from pascal
    1.18  	while read patch_file; do
    1.19  		echo "Apply $patch_file"
    1.20  		patch -p1 < ../stuff/$patch_file || return 1
    1.21  	done <<EOT
    1.22 -boot-kernel.u
    1.23  $PACKAGE-lzma-$VERSION.u
    1.24 -decompress_unlzma.u
    1.25 +$PACKAGE-utf8-$VERSION.u
    1.26 +$PACKAGE-diff-$VERSION.u
    1.27  EOT
    1.28  	make mrproper	
    1.29  	cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.30 -	while read patch_file; do
    1.31 -		echo "Apply $patch_file"
    1.32 -		patch -p1 < ../stuff/$patch_file || return 1
    1.33 -	done <<EOT
    1.34 -config-acpi-$VERSION.u
    1.35 -linux-utf8-$VERSION.u
    1.36 -config-ieee1394-$VERSION.u
    1.37 -linux-lzma-export.u
    1.38 -config-tun-$VERSION.u
    1.39 -config-reiserfs-$VERSION.u
    1.40 -config-wireless-$VERSION.u
    1.41 -$PACKAGE-lzma-loram-$VERSION.u
    1.42 -EOT
    1.43  	make oldconfig
    1.44  	make bzImage
    1.45  	make modules
    1.46  	make INSTALL_MOD_PATH=$PWD/_pkg modules_install
    1.47 +	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install
    1.48  } 
    1.49  
    1.50  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.51 @@ -57,18 +45,27 @@
    1.52      path=$fs/lib/modules/$VERSION-slitaz/kernel
    1.53      mkdir -p $path
    1.54      cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* $fs/lib/modules/$VERSION-slitaz
    1.55 +    cp ./stuff/list_modules.sh $src
    1.56 +    export src
    1.57 +    export _pkg
    1.58 +    $src/list_modules.sh $(cat stuff/modules-$VERSION.list) > $src/modules.list
    1.59      while read module; do
    1.60      	dir=$(dirname $module)
    1.61      	[ -d $path/$dir ] || mkdir -p $path/$dir
    1.62          cp -a $_pkg/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
    1.63 -    done < stuff/modules-$VERSION.list
    1.64 +    done < $src/modules.list
    1.65      # Remove unresolved links
    1.66      rm -f $fs/lib/modules/$VERSION-slitaz/build
    1.67      rm -f $fs/lib/modules/$VERSION-slitaz/source
    1.68 -    # Packages all linux pkgs
    1.69 -    for i in acpi ieee1394 reiserfs sound wireless
    1.70 +    # Package all linux pkgs
    1.71 +    for i in $(cd $WOK; ls -d linux-*)
    1.72      do
    1.73 -    	tazwok genpkg linux-$i
    1.74 +    	tazwok genpkg $i
    1.75 +    done
    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  
    1.83 @@ -77,13 +74,15 @@
    1.84  post_install()
    1.85  {
    1.86      echo "Processing post-install commands..."
    1.87 -    depmod -a -b "$1/"
    1.88 -    echo "----"
    1.89 -    echo "If you have GRUB installed, you can add tree lines to boot SliTaz."
    1.90 -    echo "Example /boot/grub/menu.lst"
    1.91 -    echo -e "
    1.92 +    depmod -a -b "$1/" $VERSION-slitaz
    1.93 +    cat <<EOT
    1.94 +----
    1.95 +If you have GRUB installed, you can add tree lines to boot SliTaz.
    1.96 +Example /boot/grub/menu.lst
    1.97 + 
    1.98  title  SliTaz GNU/Linux (Kernel $VERSION-slitaz)
    1.99         root(hd0,0)
   1.100 -       kernel /boot/vmlinuz-$VERSION-slitaz root=/dev/hda1 vga=771\n"
   1.101 -    echo "----"
   1.102 +       kernel /boot/vmlinuz-$VERSION-slitaz root=/dev/hda1 vga=771
   1.103 +----
   1.104 +EOT
   1.105  }