SliTaz Repositories

     1.1 --- a/linux/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/linux/receipt	Fri Feb 12 16:05:17 2016 +0100
     1.3 @@ -348,43 +348,42 @@
     1.4  			return 0 ;;
     1.5  	esac
     1.6  
     1.7 -    export PACKAGE VERSION
     1.8 -    local path
     1.9 -    cp -a $install/boot $fs
    1.10 -    
    1.11 -    # Compress all modules.
    1.12 -    path=$fs/lib/modules/$VERSION-slitaz/kernel
    1.13 -    mkdir -p $path
    1.14 -	
    1.15 -    # Get the base modules
    1.16 -    export src install
    1.17 -    mkdir -p $WOK/$PACKAGE/source/tmp
    1.18 -    # Warning stuff/list_modules.sh must find the generated modules.list
    1.19 -    $stuff/list_modules.sh \
    1.20 +	export PACKAGE VERSION
    1.21 +	local path
    1.22 +	cp -a $install/boot $fs
    1.23 +
    1.24 +	# Compress all modules.
    1.25 +	path=$fs/lib/modules/$VERSION-slitaz/kernel
    1.26 +	mkdir -p $path
    1.27 +
    1.28 +	# Get the base modules
    1.29 +	export src install
    1.30 +	mkdir -p $WOK/$PACKAGE/source/tmp
    1.31 +	# Warning stuff/list_modules.sh must find the generated modules.list
    1.32 +	$stuff/list_modules.sh \
    1.33  		$(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list
    1.34 -    while read module; do
    1.35 -    	dir=$(dirname $module)
    1.36 -    	[ -d $path/$dir ] || mkdir -p $path/$dir
    1.37 -        cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
    1.38 -    done < $WOK/$PACKAGE/source/tmp/modules.list
    1.39 -    
    1.40 -    # Remove unresolved links
    1.41 -    rm -f $fs/lib/modules/$VERSION-slitaz/build
    1.42 -    rm -f $fs/lib/modules/$VERSION-slitaz/source
    1.43 -    
    1.44 -    # We only need module.{order,builtin} because other map files are 
    1.45 -    # generated by depmod in post_install
    1.46 -    cp -a $install/lib/modules/$VERSION-slitaz/modules.order \
    1.47 +	while read module; do
    1.48 +		dir=$(dirname $module)
    1.49 +		[ -d $path/$dir ] || mkdir -p $path/$dir
    1.50 +		cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
    1.51 +	done < $WOK/$PACKAGE/source/tmp/modules.list
    1.52 +
    1.53 +	# Remove unresolved links
    1.54 +	rm -f $fs/lib/modules/$VERSION-slitaz/build
    1.55 +	rm -f $fs/lib/modules/$VERSION-slitaz/source
    1.56 +
    1.57 +	# We only need module.{order,builtin} because other map files are
    1.58 +	# generated by depmod in post_install
    1.59 +	cp -a $install/lib/modules/$VERSION-slitaz/modules.order \
    1.60  		$install/lib/modules/$VERSION-slitaz/modules.builtin \
    1.61  		$fs/lib/modules/$VERSION-slitaz
    1.62 -    
    1.63 -    # Pack all packages with a kernel module
    1.64 -    for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt)
    1.65 -    do
    1.66 +
    1.67 +	# Pack all packages with a kernel module
    1.68 +	for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt); do
    1.69  		[ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1
    1.70  		cook ${i%/receipt}
    1.71 -    done
    1.72 -	
    1.73 +	done
    1.74 +
    1.75  	# Check any module in kernel .config that's not added to a linux-* pkgs
    1.76  	# and remove aufs patches: we dont need them in HG wok.
    1.77  	$stuff/check_modules.sh
    1.78 @@ -394,17 +393,16 @@
    1.79  # Pre and post install commands for Tazpkg.
    1.80  post_install()
    1.81  {
    1.82 -    echo "Processing post-install commands..."
    1.83 -    chroot "$root/" depmod -a $VERSION-slitaz
    1.84 -    
    1.85 -    # Handle multiarch installation
    1.86 -    case "$SLITAZ_ARCH" in
    1.87 +	chroot "$root/" depmod -a $VERSION-slitaz
    1.88 +
    1.89 +	# Handle multiarch installation
    1.90 +	case "$SLITAZ_ARCH" in
    1.91  		arm)
    1.92  			echo "Kernel : /boot/linux-$VERSION-slitaz-$ARCH"
    1.93  			echo "Modules: /lib/modules/$VERSION-slitaz"
    1.94  			return 0 ;;
    1.95  	esac
    1.96 -	
    1.97 +
    1.98  	# GRUB stuff.
    1.99  	if [ -f "$1/boot/grub/menu.lst" ]; then
   1.100  		# Current root device
   1.101 @@ -413,10 +411,10 @@
   1.102  		# Use device.map to find grub device number
   1.103  		grub_dev="$(grep $(echo $root_dev | grep -o  '^/dev/.d.' ) \
   1.104  			"$1/boot/grub/device.map" | cut -f1 | sed "s/)$/.$grub_part)/g")" 
   1.105 -    	
   1.106 +
   1.107  		# Add and clean kernel entries in case of upgrade for installed system.
   1.108  		if ! grep -q vmlinuz-$VERSION-slitaz "$1/boot/grub/menu.lst"; then
   1.109 -		
   1.110 +
   1.111  			# Clean the old entry
   1.112  			# TODO: old vmlinuz file is removed but the entry is still there.
   1.113  			# So grub error:15 when selected: http://bugs.slitaz.org/?id=74
   1.114 @@ -432,9 +430,10 @@
   1.115  			last_entry=$(( $(grep -c '^title' "$1/boot/grub/menu.lst")-1 ))
   1.116  			sed -e "s/^default.*/default $last_entry/g" -i "$1/boot/grub/menu.lst"
   1.117  		fi
   1.118 -		
   1.119 +
   1.120  		# Display information message.
   1.121  		cat <<EOT
   1.122 +
   1.123  ----
   1.124  GRUB is installed, these tree lines must be in your /boot/grub/menu.lst:
   1.125