wok-next diff linux-libre/receipt @ rev 21020

Cleaning is almost finished... I should proceed to upgrades.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Nov 02 14:15:08 2018 +0200 (2018-11-02)
parents c3a368c0cddb
children d457c4e37c1b
line diff
     1.1 --- a/linux-libre/receipt	Fri Mar 02 03:33:54 2018 +0200
     1.2 +++ b/linux-libre/receipt	Fri Nov 02 14:15:08 2018 +0200
     1.3 @@ -4,33 +4,37 @@
     1.4  VERSION="2.6.37-gnu"
     1.5  CATEGORY="base-system"
     1.6  SHORT_DESC="The Linux Libre kernel"
     1.7 -MAINTAINER="gokhlayeh@slitaz.org"
     1.8 +MAINTAINER="devel@slitaz.org"
     1.9  LICENSE="GPL2"
    1.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.11  WEB_SITE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
    1.12  WGET_URL="http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/$VERSION/$TARBALL"
    1.13  
    1.14  BUILD_DEPENDS="slitaz-toolchain perl git lzma patch gcc3"
    1.15 -SPLIT="linux-libre-acpi linux-libre-agp linux-libre-aoe linux-libre-appletalk \
    1.16 -linux-libre-autofs linux-libre-bluetooth linux-libre-bridge linux-libre-btrfs \
    1.17 -linux-libre-cifs linux-libre-coda linux-libre-configfs linux-libre-cpufreq \
    1.18 -linux-libre-cramfs linux-libre-crypto linux-libre-cryptoloop \
    1.19 -linux-libre-dialup linux-libre-dlm linux-libre-drm linux-libre-firewire \
    1.20 -linux-libre-gfs2 linux-libre-hfs linux-libre-hfsplus linux-libre-hwmon \
    1.21 -linux-libre-input-misc linux-libre-input-tablet linux-libre-input-touchscreen \
    1.22 -linux-libre-ipv6 linux-libre-irda linux-libre-isdn linux-libre-jfs \
    1.23 -linux-libre-joystick linux-libre-kvm linux-libre-logfs linux-libre-md \
    1.24 -linux-libre-memstick linux-libre-minix linux-libre-mmc \
    1.25 -linux-libre-module-headers linux-libre-mwave linux-libre-nbd linux-libre-ncpfs \
    1.26 -linux-libre-netfilter linux-libre-nfsd linux-libre-reiserfs linux-libre-sched \
    1.27 -linux-libre-scsi linux-libre-sound linux-libre-source linux-libre-speakup \
    1.28 -linux-libre-squashfs linux-libre-toshiba linux-libre-udf linux-libre-usbdsl \
    1.29 -linux-libre-usbip linux-libre-usb-misc linux-libre-uwb linux-libre-video \
    1.30 -linux-libre-wimax linux-libre-wireless linux-libre-without-modules lguest-libre"
    1.31 +SPLIT="\
    1.32 +$PACKAGE-acpi         $PACKAGE-agp                $PACKAGE-aoe \
    1.33 +$PACKAGE-appletalk    $PACKAGE-autofs             $PACKAGE-bluetooth \
    1.34 +$PACKAGE-bridge       $PACKAGE-btrfs              $PACKAGE-cifs \
    1.35 +$PACKAGE-coda         $PACKAGE-configfs           $PACKAGE-cpufreq \
    1.36 +$PACKAGE-cramfs       $PACKAGE-crypto             $PACKAGE-cryptoloop \
    1.37 +$PACKAGE-dialup       $PACKAGE-dlm                $PACKAGE-drm \
    1.38 +$PACKAGE-firewire     $PACKAGE-gfs2               $PACKAGE-hfs \
    1.39 +$PACKAGE-hfsplus      $PACKAGE-hwmon              $PACKAGE-input-misc \
    1.40 +$PACKAGE-input-tablet $PACKAGEe-input-touchscreen $PACKAGE-ipv6 \
    1.41 +$PACKAGE-irda         $PACKAGE-isdn               $PACKAGE-jfs \
    1.42 +$PACKAGE-joystick     $PACKAGE-kvm                $PACKAGE-logfs \
    1.43 +$PACKAGE-md           $PACKAGE-memstick           $PACKAGE-minix \
    1.44 +$PACKAGE-mmc          $PACKAGE-module-headers     $PACKAGE-mwave \
    1.45 +$PACKAGE-nbd          $PACKAGE-ncpfs              $PACKAGE-netfilter \
    1.46 +$PACKAGE-nfsd         $PACKAGE-reiserfs           $PACKAGE-sched \
    1.47 +$PACKAGE-scsi         $PACKAGE-sound              $PACKAGE-source \
    1.48 +$PACKAGE-speakup      $PACKAGE-squashfs           $PACKAGE-toshiba \
    1.49 +$PACKAGE-udf          $PACKAGE-usbdsl             $PACKAGE-usbip \
    1.50 +$PACKAGE-usb-misc     $PACKAGE-uwb                $PACKAGE-video \
    1.51 +$PACKAGE-wimax        $PACKAGE-wireless           $PACKAGE-without-modules \
    1.52 +lguest-libre"
    1.53  
    1.54 -# Rules to configure and make the package.
    1.55 -compile_rules()
    1.56 -{
    1.57 +compile_rules() {
    1.58  	# this is code to help update the kernel version faster
    1.59  	#for i in $(grep -l 'WANTED="linux-libre"' $WOK/*/receipt)
    1.60  	#do
    1.61 @@ -56,13 +60,13 @@
    1.62  	echo "Copying Aufs files and patches..."
    1.63  	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
    1.64  	cp -a $AUFSDIR/*.patch $stuff
    1.65 -	
    1.66 +
    1.67  	# SliTaz db
    1.68  	rm -rf $WOK/$PACKAGE/slitaz && mkdir $WOK/$PACKAGE/slitaz
    1.69  	echo "$WGET_URL" > $WOK/$PACKAGE/slitaz/url
    1.70  	cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/slitaz
    1.71  	cp $stuff/bootloader.sh $WOK/$PACKAGE/slitaz
    1.72 -	
    1.73 +
    1.74  	# Apply patches
    1.75  	echo "Applying patches..."
    1.76  	while read patch_file; do
    1.77 @@ -91,7 +95,7 @@
    1.78  
    1.79  	export LD_LIBRARY_PATH="/usr/libgcc3:$LD_LIBRARY_PATH"
    1.80  	export MAKEFLAGS="$MAKEFLAGS CC=gcc-3 CXX=g++-3"
    1.81 -	
    1.82 +
    1.83  	make mrproper
    1.84  	cd Documentation/lguest
    1.85  	make $MAKEFLAGS lguest || return 1
    1.86 @@ -107,8 +111,8 @@
    1.87  		-e 's/^CONFIG_RT2870/#&/' .config
    1.88  	yes '' | make oldconfig
    1.89  	make $MAKEFLAGS bzImage || return 1
    1.90 -	[ -d $DESTDIR ] || mkdir -p $DESTDIR
    1.91 -	mv arch/x86/boot/bzImage $DESTDIR
    1.92 +	[ -d $install ] || mkdir -p $install
    1.93 +	mv arch/x86/boot/bzImage $install
    1.94  	mv System.map System.map-without-modules
    1.95  
    1.96  	# Build bzImage with modules
    1.97 @@ -117,21 +121,19 @@
    1.98  	ln .config $WOK/$PACKAGE/slitaz/config
    1.99  	make $MAKEFLAGS bzImage &&
   1.100  	make $MAKEFLAGS modules &&
   1.101 -	make INSTALL_MOD_PATH=$DESTDIR modules_install &&
   1.102 -	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
   1.103 +	make INSTALL_MOD_PATH=$install modules_install &&
   1.104 +	make INSTALL_HDR_PATH=$install/usr headers_install &&
   1.105  	[ -s arch/x86/boot/bzImage ] return 1
   1.106 -	mkdir -p $DESTDIR/boot 2> /dev/null
   1.107 -	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
   1.108 +	mkdir -p $install/boot 2>/dev/null
   1.109 +	mv arch/x86/boot/bzImage $install/boot/vmlinuz-$VERSION-slitaz
   1.110  
   1.111  	# Compress all modules.
   1.112 -	$stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz
   1.113 +	$stuff/gztazmod.sh $install/lib/modules/$VERSION-slitaz
   1.114  	ln System.map System.map-modules
   1.115  	ln Module.symvers Module.symvers-modules
   1.116  }
   1.117  
   1.118 -# Rules to gen a SliTaz package suitable for Tazpkg.
   1.119 -genpkg_rules()
   1.120 -{
   1.121 +genpkg_rules() {
   1.122  	case $PACKAGE in
   1.123  		linux-libre)
   1.124  			local path
   1.125 @@ -147,7 +149,7 @@
   1.126  			export _pkg
   1.127  			mkdir $WOK/$PACKAGE/tmp
   1.128  			$stuff/list_modules.sh \
   1.129 -			$(cat stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list
   1.130 +			$(cat $stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list
   1.131  			while read module; do
   1.132  				dir=$(dirname $module)
   1.133  				[ -d $path/$dir ] || mkdir -p $path/$dir
   1.134 @@ -465,7 +467,7 @@
   1.135  			# Modules paths and list
   1.136  			MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
   1.137  			MODULES="fs/dlm/dlm.ko.gz"
   1.138 -			mkdir -p ${fs}${MOD_PATH} $fs/etc
   1.139 +			mkdir -p $fs${MOD_PATH} $fs/etc
   1.140  			for module in $MODULES; do
   1.141  				dir=$MOD_PATH/$(dirname $module)
   1.142  				[ -d $fs/$dir ] || mkdir -p $fs/$dir
   1.143 @@ -878,7 +880,7 @@
   1.144  			mkdir -p $fs/$path/drivers/media/video
   1.145  			cp -a $src/drivers/media/video/*.h  $fs/$path/drivers/media/video/
   1.146  
   1.147 -			for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo ; do
   1.148 +			for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do
   1.149  				mkdir -p $fs/$path/drivers/media/video/$i
   1.150  				cp -a $src/drivers/media/video/$i/*.h $fs/$path/drivers/media/video/$i
   1.151  			done
   1.152 @@ -1172,7 +1174,7 @@
   1.153  			# Modules paths and list
   1.154  			MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
   1.155  			MODULES="drivers/char/toshiba.ko.gz"
   1.156 -			mkdir -p ${fs}${MOD_PATH}
   1.157 +			mkdir -p $fs${MOD_PATH}
   1.158  			for module in $MODULES; do
   1.159  				dir=$MOD_PATH/$(dirname $module)
   1.160  				[ -d $fs/$dir ] || mkdir -p $fs/$dir
   1.161 @@ -1266,7 +1268,7 @@
   1.162  			MODULES="drivers/video/backlight/lcd.ko.gz
   1.163  			drivers/video/backlight/generic_bl.ko.gz
   1.164  			drivers/gpio/bt8xxgpio.ko.gz"
   1.165 -			mkdir -p ${fs}${MOD_PATH}
   1.166 +			mkdir -p $fs${MOD_PATH}
   1.167  			for module in $MODULES; do
   1.168  				dir=$MOD_PATH/$(dirname $module)
   1.169  				[ -d $fs/$dir ] || mkdir -p $fs/$dir
   1.170 @@ -1334,13 +1336,11 @@
   1.171  	esac
   1.172  }
   1.173  
   1.174 -# Pre and post install commands for Tazpkg.
   1.175 -post_install_linux_libre()
   1.176 -{
   1.177 +post_install_linux_libre() {
   1.178  	chroot "$1/" depmod -a $VERSION-slitaz
   1.179  	# GRUB stuff.
   1.180  	if [ -f "$1/boot/grub/menu.lst" ]; then
   1.181 -		root_dev=$(cat "$1/boot/grub/menu.lst" | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1)
   1.182 +		root_dev=$(cat "$1/boot/grub/menu.lst" | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1)	#'MC
   1.183  		grub_dev=$(cat "$1/boot/grub/menu.lst" | grep "root (" | head -n 1)
   1.184  		# Add new kernel entry in case of upgrade for installed system.
   1.185  		if ! grep -q $PACKAGE-$VERSION-slitaz "$1/boot/grub/menu.lst"; then