SliTaz Repositories

     1.1 --- a/linux/receipt	Sat Jun 27 15:30:51 2009 +0000
     1.2 +++ b/linux/receipt	Fri Aug 07 23:18:34 2009 +0200
     1.3 @@ -1,12 +1,12 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="linux"
     1.7 -VERSION="2.6.29.3"
     1.8 +VERSION="2.6.30.4"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux kernel and modules."
    1.11  DEPENDS="depmod"
    1.12  BUILD_DEPENDS="slitaz-toolchain perl"
    1.13 -MAINTAINER="pascal.bellard@slitaz.org"
    1.14 +MAINTAINER="devel@slitaz.org"
    1.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.16  WEB_SITE="http://www.kernel.org/"
    1.17  WGET_URL="http://www.eu.kernel.org/pub/linux/kernel/v${VERSION:0:3}/$TARBALL"
    1.18 @@ -32,12 +32,10 @@
    1.19  		cp ../stuff/$patch_file slitaz/$patch_file
    1.20  		touch done.$patch_file
    1.21  	done <<EOT
    1.22 -$PACKAGE-lzma-$VERSION.u
    1.23  $PACKAGE-utf8-$VERSION.u
    1.24  $PACKAGE-diff-$VERSION.u
    1.25 -$PACKAGE-rootdev.u
    1.26  EOT
    1.27 -	make mrproper	
    1.28 +	make mrproper
    1.29  	cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.30  	make oldconfig
    1.31  	ln .config slitaz/config
    1.32 @@ -45,7 +43,7 @@
    1.33  	make modules
    1.34  	make INSTALL_MOD_PATH=$PWD/_pkg modules_install
    1.35  	make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install
    1.36 -} 
    1.37 +}
    1.38  
    1.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.40  genpkg_rules()
    1.41 @@ -64,16 +62,11 @@
    1.42      export src
    1.43      export _pkg
    1.44      $src/list_modules.sh $(cat stuff/modules-$VERSION.list) > $src/modules.list
    1.45 -    while read module firmwares; do
    1.46 +    while read module; do
    1.47      	dir=$(dirname $module)
    1.48      	[ -d $path/$dir ] || mkdir -p $path/$dir
    1.49          cp -a $_pkg/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
    1.50      done < $src/modules.list
    1.51 -    for i in $(cat stuff/firmwares-$VERSION.list) ; do
    1.52 -    	dir=$(dirname $i)
    1.53 -    	[ -d $fs/lib/firmware/$dir ] || mkdir -p $fs/lib/firmware/$dir
    1.54 -	cp -a $_pkg/lib/firmware/$i $fs/lib/firmware/$i
    1.55 -    done
    1.56      # Remove unresolved links
    1.57      rm -f $fs/lib/modules/$VERSION-slitaz/build
    1.58      rm -f $fs/lib/modules/$VERSION-slitaz/source
    1.59 @@ -87,10 +80,6 @@
    1.60      do
    1.61      	echo tazwok cook ${i%/receipt}
    1.62      done
    1.63 -	# check and echo modules
    1.64 -	 cp ./stuff/check_modules.sh $src
    1.65 -	 $src/check_modules.sh "$VERSION" "$WOK"
    1.66 -	
    1.67  }
    1.68  
    1.69  # Pre and post install commands for Tazpkg.
    1.70 @@ -99,35 +88,25 @@
    1.71  {
    1.72      echo "Processing post-install commands..."
    1.73      chroot "$1/" depmod -a $VERSION-slitaz
    1.74 -
    1.75 -    # Update in-kernel module list
    1.76 -    for module in ohci_hcd vfat msdos nls_utf8 fat snd_hda_intel ; do
    1.77 -	sed -i "s/$module//" $1/etc/rcS.conf
    1.78 -    done
    1.79 -
    1.80      if [ -f "$1/boot/grub/menu.lst" ]; then
    1.81 -		if ! grep -q "vmlinuz-$VERSION-slitaz" $1/boot/grub/menu.lst; then
    1.82 -    		root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1`
    1.83 -			grub_dev=`cat $1/boot/grub/menu.lst | grep "root.* (" | head -n 1`
    1.84 -			# Add new kernel entry in case of upgrade for installed system.
    1.85 -    		cat >> $1/boot/grub/menu.lst << EOT
    1.86 +    	root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/'`
    1.87 +		grub_dev=`cat $1/boot/grub/menu.lst | grep "root ("`
    1.88 +		# Add new kernel entry in case of upgrade for installed system.
    1.89 +    	cat >> $1/boot/grub/menu.lst << EOT
    1.90  
    1.91  title  SliTaz GNU/Linux (Kernel $VERSION-slitaz)
    1.92  $grub_dev
    1.93         kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
    1.94  EOT
    1.95 -			# Display information message.
    1.96 -    		cat <<EOT
    1.97 +		# Display information message.
    1.98 +    	cat <<EOT
    1.99  ----
   1.100  GRUB is installed, these tree lines has been added to the menu.lst:
   1.101 - 
   1.102 +
   1.103  title  SliTaz GNU/Linux (Kernel $VERSION-slitaz)
   1.104  $grub_dev
   1.105         kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
   1.106  ----
   1.107  EOT
   1.108 -		else
   1.109 -			echo "Grub menu.lst seems already configured to boot new Kernel..."
   1.110 -		fi
   1.111  	fi
   1.112  }