wok diff linux/receipt @ rev 20261

Up linux 3.16.55
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Mar 15 11:24:25 2018 +0100 (2018-03-15)
parents e564e12169b9
children f078c217decc
line diff
     1.1 --- a/linux/receipt	Tue Jan 16 13:05:30 2018 +0100
     1.2 +++ b/linux/receipt	Thu Mar 15 11:24:25 2018 +0100
     1.3 @@ -1,19 +1,18 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="linux"
     1.7 -VERSION="3.2.98"
     1.8 +VERSION="3.16.55"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux kernel and modules."
    1.11  MAINTAINER="devel@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.14  WEB_SITE="http://www.kernel.org/"
    1.15 -WGET_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$TARBALL"
    1.16 +WGET_URL="https://cdn.kernel.org/pub/linux/kernel/v${VERSION%%.*}.x/$TARBALL"
    1.17  HOST_ARCH="i486 arm x86_64"
    1.18  
    1.19  DEPENDS="kmod"
    1.20 -BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch kmod \
    1.21 -uclibc-cross-compiler-x86_64"
    1.22 +BUILD_DEPENDS="perl git xz lzma patch kmod uclibc-cross-compiler-x86_64 bc"
    1.23  
    1.24  #
    1.25  # The Linux receipt handle cross compilation. For x86_64 we actually use
    1.26 @@ -58,10 +57,8 @@
    1.27  		$1/$path/.config
    1.28  	mkdir -p $1/$path/include
    1.29  
    1.30 -	for i in acpi asm-generic config crypto drm generated linux math-emu \
    1.31 -		media net pcmcia scsi sound trace video xen; do
    1.32 -		cp -a $src/include/$i $1/$path/include/
    1.33 -	done
    1.34 +	cp -a $src/include/* $1/$path/include/
    1.35 +	rm -f $1/$path/include/Kbuild
    1.36  
    1.37  	# copy arch includes for external modules
    1.38  	mkdir -p $1/$path/arch/x86
    1.39 @@ -80,13 +77,9 @@
    1.40  	cp -a $src/arch/x86/kernel/asm-offsets.s $1/$path/arch/x86/kernel/
    1.41  
    1.42  	# add headers for lirc package
    1.43 -	mkdir -p $1/$path/drivers/media/video
    1.44 -	cp -a $src/drivers/media/video/*.h  $1/$path/drivers/media/video/
    1.45 -
    1.46 -	for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 ; do
    1.47 -   		mkdir -p $1/$path/drivers/media/video/$i
    1.48 -   		cp -a $src/drivers/media/video/$i/*.h $1/$path/drivers/media/video/$i
    1.49 -	done
    1.50 +	mkdir -p $1/$path/drivers/media
    1.51 +	( cd $src/drivers/media ; find i2c -name '*.h' | cpio -o -H newc ) | \
    1.52 +	( cd $1/$path/drivers/media ; cpio -idmu )
    1.53  
    1.54  	# add docbook makefile
    1.55  	install -D -m644 $src/Documentation/DocBook/Makefile \
    1.56 @@ -107,8 +100,8 @@
    1.57  	# add dvb headers for external modules
    1.58  	# in reference to:
    1.59  	# http://bugs.archlinux.org/task/9912
    1.60 -	mkdir -p $1/$path/drivers/media/dvb/dvb-core
    1.61 -	cp -a $src/drivers/media/dvb/dvb-core/*.h $1/$path/drivers/media/dvb/dvb-core/
    1.62 +	mkdir -p $1/$path/drivers/media/dvb-core
    1.63 +	cp -a $src/drivers/media/dvb-core/*.h $1/$path/drivers/media/dvb-core/
    1.64  
    1.65  	# add dvb headers for external modules
    1.66  	# in reference to:
    1.67 @@ -121,24 +114,25 @@
    1.68  	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
    1.69  	# in reference to:
    1.70  	# http://bugs.archlinux.org/task/13146
    1.71 -	mkdir -p $1/$path/drivers/media/dvb/frontends/
    1.72 -	cp -a $src/drivers/media/dvb/frontends/lgdt330x.h $1/$path/drivers/media/dvb/frontends/
    1.73 -	cp -a $src/drivers/media/video/msp3400-driver.h $1/$path/drivers/media/dvb/frontends/
    1.74 +	mkdir -p $1/$path/drivers/media/dvb-frontends/
    1.75 +	cp -a $src/drivers/media/dvb-frontends/lgdt330x.h $1/$path/drivers/media/dvb-frontends/
    1.76 +	cp -a $src/drivers/media/i2c/msp3400-driver.h $1/$path/drivers/media/dvb-frontends/
    1.77  
    1.78  	# add dvb headers  
    1.79  	# in reference to:
    1.80  	# http://bugs.archlinux.org/task/20402
    1.81 -	mkdir -p $1/$path/drivers/media/dvb/dvb-usb
    1.82 -	cp -a $src/drivers/media/dvb/dvb-usb/*.h $1/$path/drivers/media/dvb/dvb-usb/
    1.83 -	mkdir -p $1/$path/drivers/media/dvb/frontends
    1.84 -	cp -a $src/drivers/media/dvb/frontends/*.h $1/$path/drivers/media/dvb/frontends/
    1.85 -	mkdir -p $1/$path/drivers/media/common/tuners
    1.86 -	cp -a $src/drivers/media/common/tuners/*.h $1/$path/drivers/media/common/tuners/
    1.87 +	mkdir -p $1/$path/drivers/media/usb/dvb-usb
    1.88 +	cp -a $src/drivers/media/usb/dvb-usb/*.h $1/$path/drivers/media/usb/dvb-usb/
    1.89 +	mkdir -p $1/$path/drivers/media/dvb-frontends
    1.90 +	cp -a $src/drivers/media/dvb-frontends/*.h $1/$path/drivers/media/dvb-frontends/
    1.91 +	mkdir -p $1/$path/drivers/media/tuners
    1.92 +	cp -a $src/drivers/media/tuners/*.h $1/$path/drivers/media/tuners/
    1.93  
    1.94  	# add xfs and shmem for aufs building
    1.95  	mkdir -p $1/$path/fs/xfs
    1.96  	mkdir -p $1/$path/mm
    1.97  	cp -a $src/fs/xfs/xfs_sb.h $1/$path/fs/xfs/xfs_sb.h
    1.98 +	cp -a $src/fs/*.h $1/$path/fs/
    1.99  	
   1.100  	# copy in Kconfig files
   1.101  	for i in $(find . -name "Kconfig*"); do 
   1.102 @@ -197,6 +191,8 @@
   1.103  
   1.104  	echo "Copying Aufs files and patches..."
   1.105  	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
   1.106 +
   1.107 +	# Use fixed patchs from stuff
   1.108  	cp -a $AUFSDIR/aufs3-*.patch $stuff
   1.109  
   1.110  	# SliTaz db stuff
   1.111 @@ -219,7 +215,6 @@
   1.112  		touch done.$patch_file
   1.113  	done <<EOT
   1.114  $PACKAGE-diff.u
   1.115 -$PACKAGE-header.u
   1.116  $PACKAGE-freeinitrd.u
   1.117  $PACKAGE-subroot.u
   1.118  $PACKAGE-romfs.u
   1.119 @@ -227,14 +222,12 @@
   1.120  aufs3-standalone.patch
   1.121  aufs3-loopback.patch
   1.122  aufs3-mmap.patch
   1.123 -channel-negative-one-maxim.patch
   1.124 -mac80211.compat08082009.wl_frag+ack_v1.patch
   1.125  EOT
   1.126  	
   1.127  	# Mrproper and lguest
   1.128  	echo "Make kernel proper and then build lguest..."
   1.129  	make mrproper
   1.130 -	cd Documentation/virtual/lguest
   1.131 +	cd tools/lguest
   1.132  	make lguest || return 1
   1.133  	cd $src
   1.134  	
   1.135 @@ -248,10 +241,6 @@
   1.136  		if [ ! "$nonomods" ]; then
   1.137  			cp -f $stuff/$PACKAGE-slitaz.config64 .config
   1.138  			sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
   1.139 -			# We can't keep every driver in staging ???
   1.140 -			sed -i -e 's/^CONFIG_RTL8192/#&/' \
   1.141 -				-e 's/^CONFIG_R8187SE/#&/' \
   1.142 -				-e 's/^CONFIG_RT2870/#&/' .config
   1.143  			echo -e "\n* Configure bzImage64 without modules...\n"
   1.144  			yes '' | make ARCH=x86_64 oldconfig
   1.145  			echo -e "\n* Building bzImage64 without modules...\n"
   1.146 @@ -295,10 +284,6 @@
   1.147  	if [ ! "$nonomods" ]; then
   1.148  		cp -f $stuff/$PACKAGE-slitaz.config .config
   1.149  		sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
   1.150 -		# We can't keep every driver in staging ???
   1.151 -		sed -i -e 's/^CONFIG_RTL8192/#&/' \
   1.152 -			-e 's/^CONFIG_R8187SE/#&/' \
   1.153 -			-e 's/^CONFIG_RT2870/#&/' .config
   1.154  		echo -e "\n* Configure bzImage without modules...\n"
   1.155  		yes '' | make ARCH=i386 oldconfig
   1.156  		echo -e "\n* Building bzImage without modules...\n"
   1.157 @@ -394,7 +379,9 @@
   1.158  	# Check any module in kernel .config that's not added to a linux-* pkgs
   1.159  	# and remove aufs patches: we dont need them in HG wok.
   1.160  	$stuff/check_modules.sh
   1.161 -	rm -f $stuff/aufs3-*
   1.162 +
   1.163 +	# Keep fixed patches !
   1.164 +	#rm -f $stuff/aufs3-*
   1.165  }
   1.166  
   1.167  # Pre and post install commands for Tazpkg.