wok-next rev 19597

Up linux-source.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jan 22 06:59:53 2017 +0200 (2017-01-22)
parents dd1205f552b8
children b19a1b511a74
files linux-source/receipt linux-source/stuff/get-linux-source linux-source/stuff/make-tazpkg.u
line diff
     1.1 --- a/linux-source/receipt	Sun Jan 22 06:14:23 2017 +0200
     1.2 +++ b/linux-source/receipt	Sun Jan 22 06:59:53 2017 +0200
     1.3 @@ -14,7 +14,7 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	local _AUFSVER=$(grep  ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
     1.8 +	local _AUFSVER=$(. $WOK/aufs/receipt; echo $VERSION)
     1.9  	local AUFSDIR="aufs-${_AUFSVER}"
    1.10  	kps=$fs/usr/src/kernel-patches/slitaz
    1.11  	mkdir -p $kps \
    1.12 @@ -25,11 +25,15 @@
    1.13  	echo $(. $WOK/linux/receipt; echo $WGET_URL) > $kps/url
    1.14  	# stuff
    1.15  	cp $wanted_stuff/tools/* $wanted_stuff/bootloader.sh $kps
    1.16 +	# Kernel patch
    1.17 +	xzcat $SRC/patch-$VERSION.xz > $kps/linux-$VERSION.patch
    1.18 +	echo "linux-$VERSION.patch" > $kps/patches
    1.19  	# Aufs patches
    1.20 -	sed '/^aufs4.*patch$/!d' $wanted_stuff/tools/aufs-patches > $kps/patches
    1.21 +	sed '/^aufs4.*patch$/!d' $wanted_stuff/tools/aufs-patches | \
    1.22 +	tee -a $kps/patches | \
    1.23  	while read i; do
    1.24  		cp $WOK/aufs/source/*/$i $kps
    1.25 -	done < $kps/patches
    1.26 +	done
    1.27  	# misc. patches
    1.28  	cat $wanted_stuff/patches/patch.order >> $kps/patches
    1.29  	cp $wanted_stuff/patches/* $kps
    1.30 @@ -55,8 +59,7 @@
    1.31  			$fs/usr/src/kernel-patches/slitaz/aufs4
    1.32  	fi
    1.33  
    1.34 -	ln -s /usr/src/linux-$VERSION \
    1.35 -		$fs/lib/modules/$VERSION-slitaz/source
    1.36 +	ln -s ../../../usr/src/linux-$VERSION $fs/lib/modules/$VERSION-slitaz/source
    1.37  
    1.38  	chown -R root:root $fs
    1.39  }
     2.1 --- a/linux-source/stuff/get-linux-source	Sun Jan 22 06:14:23 2017 +0200
     2.2 +++ b/linux-source/stuff/get-linux-source	Sun Jan 22 06:59:53 2017 +0200
     2.3 @@ -14,24 +14,19 @@
     2.4  mirror_src=http://mirror.slitaz.org/sources/packages-$(cat /etc/slitaz-release)
     2.5  busybox wget -s $url || url=$mirror_src/l/$(basename $url)
     2.6  
     2.7 -if [ ! -d $SOURCES_REPOSITORY ]; then
     2.8 -	mkdir -p $SOURCES_REPOSITORY
     2.9 -fi
    2.10 +mkdir -p $SOURCES_REPOSITORY
    2.11  
    2.12  cd /usr/src/
    2.13  if [ -f $SOURCE_REPOSITORY/$(basename ${url//bz2/lzma}) ]; then
    2.14 -	unlzma -c $SOURCES_REPOSITORY/$(basename ${url//bz2/lzma}) | tar xf - -C $PWD
    2.15 +	unlzma -c $SOURCES_REPOSITORY/$(basename ${url//bz2/lzma}) | tar -xf - -C $PWD
    2.16  elif [ -f $SOURCES_REPOSITORY/$(basename $url) ]; then
    2.17 -	tar xf $SOURCES_REPOSITORY/$(basename $url)
    2.18 +	tar -xf $SOURCES_REPOSITORY/$(basename $url)
    2.19  else
    2.20  	wget -O $SOURCES_REPOSITORY/$(basename $url) -c $url
    2.21 -	tar xf $SOURCES_REPOSITORY/$(basename $url)
    2.22 +	tar -xf $SOURCES_REPOSITORY/$(basename $url)
    2.23  fi
    2.24  
    2.25  cp -a /usr/src/kernel-patches/slitaz /usr/src/linux-$VERSION
    2.26 -if [ -d /usr/src/linux-$VERSION/slitaz/aufs2 ]; then
    2.27 -	cp -pa /usr/src/linux-$VERSION/slitaz/aufs2/* /usr/src/linux-$VERSION
    2.28 -fi
    2.29  
    2.30  # Add tazpkg support
    2.31  if [ -d "/usr/src/linux-$VERSION/scripts/package" ]; then
    2.32 @@ -45,6 +40,7 @@
    2.33  	echo "Apply $patch_file"
    2.34  	patch -p1 < slitaz/$patch_file
    2.35  done < slitaz/patches
    2.36 +
    2.37  [ ! -f System.map ] && cp slitaz/config .config &&
    2.38  make oldconfig && make modules_prepare
    2.39  ln -s /usr/src/linux-$VERSION /lib/modules/$VERSION-slitaz/build
     3.1 --- a/linux-source/stuff/make-tazpkg.u	Sun Jan 22 06:14:23 2017 +0200
     3.2 +++ b/linux-source/stuff/make-tazpkg.u	Sun Jan 22 06:59:53 2017 +0200
     3.3 @@ -1,23 +1,22 @@
     3.4 ---- linux-2.6.36.1-ori/scripts/package/Makefile	Mon Nov 22 20:03:49 2010
     3.5 -+++ linux-2.6.36.1/scripts/package/Makefile	Sat Nov 27 09:56:12 2010
     3.6 -@@ -101,6 +101,13 @@
     3.7 +--- a/scripts/package/Makefile
     3.8 ++++ b/scripts/package/Makefile
     3.9 +@@ -100,6 +100,14 @@
    3.10 + clean-dirs += $(objtree)/debian/
    3.11   
    3.12 - clean-dirs += $(objtree)/debian/
    3.13   
    3.14  +# tazpkg target
    3.15  +# ---------------------------------------------------------------------------
    3.16  +tazpkg: FORCE
    3.17  +	$(MAKE) KBUILD_SRC=
    3.18  +	$(CONFIG_SHELL) $(srctree)/scripts/package/buildtaz
    3.19 -+ 
    3.20 ++
    3.21  +clean-dirs += $(objtree)/taz/
    3.22 - 
    3.23 ++
    3.24   # tarball targets
    3.25   # ---------------------------------------------------------------------------
    3.26 -@@ -145,4 +152,4 @@
    3.27 - 	@echo '  perf-tar-src-pkg    - Build $(perf-tar).tar source tarball'
    3.28 + tar%pkg: FORCE
    3.29 +@@ -151,3 +159,4 @@
    3.30   	@echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
    3.31   	@echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
    3.32 --
    3.33 -+	@echo '  tazpkg          - Build the kernel as a SliTaz package'
    3.34 -Only in linux-2.6.36.1: scripts/package/buildtaz
    3.35 + 	@echo '  perf-tarxz-src-pkg  - Build $(perf-tar).tar.xz source tarball'
    3.36 ++	@echo '  tazpkg              - Build the kernel as a SliTaz package'