wok rev 20264

Up lguest (3.16.55), linux64-aufs (20150928), remove linux-radio
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Mar 15 15:50:34 2018 +0100 (2018-03-15)
parents f10c2b5c57d6
children c4e857aec2bd
files lguest/receipt linux-aufs/receipt linux-radio/receipt linux64-aufs/receipt tinyssh/receipt
line diff
     1.1 --- a/lguest/receipt	Thu Mar 15 14:45:35 2018 +0100
     1.2 +++ b/lguest/receipt	Thu Mar 15 15:50:34 2018 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lguest"
     1.7 -VERSION="3.2.98"
     1.8 +VERSION="3.16.55"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux kernel paravirtualization tool."
    1.11  MAINTAINER="devel@slitaz.org"
    1.12 @@ -13,5 +13,5 @@
    1.13  genpkg_rules()
    1.14  {
    1.15  	mkdir -p $fs/usr/sbin
    1.16 -	cp $src/Documentation/virtual/lguest/lguest $fs/usr/sbin
    1.17 +	cp $src/tools/lguest/lguest $fs/usr/sbin
    1.18  }
     2.1 --- a/linux-aufs/receipt	Thu Mar 15 14:45:35 2018 +0100
     2.2 +++ b/linux-aufs/receipt	Thu Mar 15 15:50:34 2018 +0100
     2.3 @@ -45,7 +45,8 @@
     2.4  genpkg_rules()
     2.5  {
     2.6  	EXTRAVERSION=_${kvers}
     2.7 -	mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs
     2.8 +	mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs \
     2.9 +		$install/usr/include/linux
    2.10  	install -o root -m 0644 $src/fs/aufs/aufs.ko.xz \
    2.11  		$fs/lib/modules/${kvers}-slitaz/kernel/fs/aufs/aufs.ko.xz
    2.12  	install -o root -m 0644 $src/include/uapi/linux/aufs_type.h \
     3.1 --- a/linux-radio/receipt	Thu Mar 15 14:45:35 2018 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,46 +0,0 @@
     3.4 -# SliTaz package receipt.
     3.5 -
     3.6 -PACKAGE="linux-radio"
     3.7 -VERSION="3.16.55"
     3.8 -CATEGORY="base-system"
     3.9 -SHORT_DESC="The Linux kernel radio modules."
    3.10 -MAINTAINER="slaxemulator@gmail.com"
    3.11 -LICENSE="GPL2"
    3.12 -WANTED="linux"
    3.13 -WEB_SITE="http://kernel.org/"
    3.14 -DEPENDS="linux"
    3.15 -
    3.16 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.17 -genpkg_rules()
    3.18 -{
    3.19 -    local path
    3.20 -    path=lib/modules/$VERSION-slitaz/kernel
    3.21 -    mkdir -p $fs/$path
    3.22 -    
    3.23 -    export src install
    3.24 -    
    3.25 -    $wanted_stuff/list_modules.sh  drivers/media/radio | while read module; do
    3.26 -    	dir=$path/$(dirname $module)
    3.27 -    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
    3.28 -        cp -a $install/$path/$module $fs/$dir
    3.29 -    done
    3.30 -
    3.31 -    for i in $(cat $wanted_stuff/modules.list); do
    3.32 -        if [ -f $fs/$path/$i ]; then
    3.33 -	    rm -f $fs/$path/$i
    3.34 -	fi
    3.35 -    done
    3.36 -}
    3.37 -
    3.38 -
    3.39 -# Post install/remove commands for Tazpkg.
    3.40 -post_install()
    3.41 -{
    3.42 -	chroot "$root/" depmod -a $VERSION-slitaz
    3.43 -}
    3.44 -
    3.45 -post_remove()
    3.46 -{
    3.47 -	chroot "$root/" depmod -a $VERSION-slitaz
    3.48 -}
    3.49 -
     4.1 --- a/linux64-aufs/receipt	Thu Mar 15 14:45:35 2018 +0100
     4.2 +++ b/linux64-aufs/receipt	Thu Mar 15 15:50:34 2018 +0100
     4.3 @@ -2,7 +2,7 @@
     4.4  
     4.5  PACKAGE="linux64-aufs"
     4.6  SOURCE="aufs"
     4.7 -VERSION="20130311"
     4.8 +VERSION="20150928"
     4.9  CATEGORY="base-system"
    4.10  SHORT_DESC="aufs3 kernel module"
    4.11  MAINTAINER="godane@slitaz.org"
    4.12 @@ -10,7 +10,7 @@
    4.13  WEB_SITE="http://aufs.sf.net/"
    4.14  TARBALL="$SOURCE-$VERSION.tar.bz2"
    4.15  WGET_URL="git|git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
    4.16 -BRANCH="origin/${PACKAGE}3.2"
    4.17 +BRANCH="origin/${PACKAGE}3.16"
    4.18  PROVIDE="aufs:linux64"
    4.19  
    4.20  DEPENDS="linux64"
    4.21 @@ -34,10 +34,10 @@
    4.22  		-e 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' config.mk
    4.23  
    4.24  	# The sed fixes are from gentoo portage build.
    4.25 +	sed -i "s:aufs.ko usr/include/uapi/linux/aufs_type.h:aufs.ko:g" Makefile
    4.26  	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
    4.27 -	sed -i "s:__user::g" include/linux/aufs_type.h
    4.28 -
    4.29 -	# Linux 3.2.71 support
    4.30 +	sed -i "s:__user::g" include/uapi/linux/aufs_type.h
    4.31 +	
    4.32  	sed -i 's/d_u.d_child/d_child/' fs/aufs/dcsub.c fs/aufs/hnotify.c
    4.33  	sed -i 's/ d_alias/ d_u.d_alias/' fs/aufs/hnotify.c fs/aufs/export.c
    4.34  
    4.35 @@ -49,20 +49,21 @@
    4.36  genpkg_rules()
    4.37  {
    4.38  	EXTRAVERSION=_${kvers}
    4.39 -	mkdir -p $fs/lib/modules/${kvers}-slitaz64/kernel/fs/aufs
    4.40 +	mkdir -p $fs/lib/modules/${kvers}-slitaz64/kernel/fs/aufs \
    4.41 +		$install/usr/include/linux
    4.42  	install -o root -m 0644 $src/fs/aufs/aufs.ko.xz \
    4.43  		$fs/lib/modules/${kvers}-slitaz64/kernel/fs/aufs/aufs.ko.xz
    4.44 -	install -D -o root -m 0644 $src/include/linux/aufs_type.h \
    4.45 -		$fs/usr/include/linux/aufs_type.h
    4.46 +	install -o root -m 0644 $src/include/uapi/linux/aufs_type.h \
    4.47 +		$install/usr/include/linux/aufs_type.h
    4.48  }
    4.49  
    4.50  # Post install/remove commands for Tazpkg.
    4.51  post_install()
    4.52  {
    4.53 -	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz64
    4.54 +	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz64
    4.55  }
    4.56  
    4.57  post_remove()
    4.58  {
    4.59 -	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz64
    4.60 +	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz64
    4.61  }
     5.1 --- a/tinyssh/receipt	Thu Mar 15 14:45:35 2018 +0100
     5.2 +++ b/tinyssh/receipt	Thu Mar 15 15:50:34 2018 +0100
     5.3 @@ -31,7 +31,7 @@
     5.4  	[ -d $1/etc/tinyssh/sshkeydir ] ||
     5.5  	chroot $1/ tinysshd-makekey /etc/tinyssh/sshkeydir
     5.6  	grep -q ^ssh $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
     5.7 -ssh stream tcp nowait root /usr/sbin/tinysshd tinysshd -l -v /etc/tinyssh/sshkeydir
     5.8 +ssh stream tcp nowait root /usr/sbin/tinysshd tinysshd -s -o -l -v /etc/tinyssh/sshkeydir -x sftp=/usr/sbin/sftp-server
     5.9  EOT
    5.10  }
    5.11