wok-next rev 20251

Rethink $EXTRAVERSION: aufs, broadcom-wl, dahdi-linux, iptables, linux-cloop, ndiswrapper-driver, nvidia-173xx, nvidia-96xx, open-vm-tools-kernel, spl; typo: mygestures; fix build & v2: lucene++
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Nov 07 14:03:40 2017 +0200 (2017-11-07)
parents f84149441859
children 519b1ed1878f
files aufs/receipt broadcom-wl/receipt dahdi-linux/receipt iptables/receipt linux-cloop/receipt lucene++/receipt mygestures/receipt ndiswrapper-driver/receipt nvidia-173xx/receipt nvidia-96xx/receipt open-vm-tools-kernel/receipt spl/receipt
line diff
     1.1 --- a/aufs/receipt	Tue Nov 07 12:15:09 2017 +0100
     1.2 +++ b/aufs/receipt	Tue Nov 07 14:03:40 2017 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4  
     1.5  PACKAGE="aufs"
     1.6  VERSION="5b18dc7"
     1.7 -EXTRAVERSION=_${kvers}
     1.8 +EXTRAVERSION="_$kvers"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux Kernel 4.9 aufs module"
    1.11  MAINTAINER="godane@slitaz.org"
     2.1 --- a/broadcom-wl/receipt	Tue Nov 07 12:15:09 2017 +0100
     2.2 +++ b/broadcom-wl/receipt	Tue Nov 07 14:03:40 2017 +0200
     2.3 @@ -2,6 +2,7 @@
     2.4  
     2.5  PACKAGE="broadcom-wl"
     2.6  VERSION="6_30_223_271"
     2.7 +EXTRAVERSION="_$kvers"
     2.8  CATEGORY="network"
     2.9  MAINTAINER="jozee@slitaz.org"
    2.10  LICENSE="other"
    2.11 @@ -26,7 +27,6 @@
    2.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.13  genpkg_rules()
    2.14  {
    2.15 -	EXTRAVERSION=_${kvers}
    2.16  	mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless
    2.17  	# Compress and install module
    2.18  	install -o root -m 0644 $src/wl.ko.xz \
     3.1 --- a/dahdi-linux/receipt	Tue Nov 07 12:15:09 2017 +0100
     3.2 +++ b/dahdi-linux/receipt	Tue Nov 07 14:03:40 2017 +0200
     3.3 @@ -2,6 +2,7 @@
     3.4  
     3.5  PACKAGE="dahdi-linux"
     3.6  VERSION="2.11.1"
     3.7 +EXTRAVERSION="_$kvers"
     3.8  CATEGORY="network"
     3.9  SHORT_DESC="Digium Asterisk Hardware Device Interface: kernel modules."
    3.10  MAINTAINER="pascal.bellard@slitaz.org"
    3.11 @@ -46,13 +47,10 @@
    3.12  	case $PACKAGE in
    3.13  	dahdi-linux)
    3.14  		DEPENDS="linux udev"
    3.15 -		EXTRAVERSION=_${kvers}
    3.16  		cp -a $install/* $fs
    3.17  		rm -rf $fs/usr/include
    3.18  		;;
    3.19  	dahdi-linux-dev)
    3.20 -		CAT="development|Digium Asterisk Hardware Device Interface: kernel modules dev files."
    3.21 -		EXTRAVERSION=_${kvers}
    3.22  		mkdir -p $fs/usr
    3.23  		cp -a $install/usr/include $fs/usr
    3.24  		;;
     4.1 --- a/iptables/receipt	Tue Nov 07 12:15:09 2017 +0100
     4.2 +++ b/iptables/receipt	Tue Nov 07 14:03:40 2017 +0200
     4.3 @@ -2,7 +2,7 @@
     4.4  
     4.5  PACKAGE="iptables"
     4.6  VERSION="1.6.1"
     4.7 -EXTRAVERSION=_$kvers
     4.8 +EXTRAVERSION="_$kvers"
     4.9  CATEGORY="security"
    4.10  SHORT_DESC="Packet filtering framework (Firewall)"
    4.11  MAINTAINER="pankso@slitaz.org"
     5.1 --- a/linux-cloop/receipt	Tue Nov 07 12:15:09 2017 +0100
     5.2 +++ b/linux-cloop/receipt	Tue Nov 07 14:03:40 2017 +0200
     5.3 @@ -4,6 +4,7 @@
     5.4  SOURCE="cloop"
     5.5  GITHASH="9acc0fcad420b5ff7062fdd1c90d27ada5278b97" # 3.14
     5.6  VERSION="${GITHASH:0:7}"
     5.7 +EXTRAVERSION="_$kvers"
     5.8  CATEGORY="base-system"
     5.9  MAINTAINER="pascal.bellard@slitaz.org"
    5.10  LICENSE="GPL2"
    5.11 @@ -30,11 +31,10 @@
    5.12  	make cloop_suspend &&
    5.13  	make KERNEL_DIR="/usr/src/linux" cloop.ko && xz cloop.ko
    5.14  }
    5.15 -	
    5.16 +
    5.17  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.18  genpkg_rules()
    5.19 -{	
    5.20 -	EXTRAVERSION=_$kvers
    5.21 +{
    5.22  	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/misc $fs/dev $fs/usr/bin
    5.23  	cp $src/cloop_suspend $fs/usr/bin
    5.24  	cp $src/cloop.ko.xz $fs/lib/modules/$kvers-slitaz/kernel/misc
     6.1 --- a/lucene++/receipt	Tue Nov 07 12:15:09 2017 +0100
     6.2 +++ b/lucene++/receipt	Tue Nov 07 14:03:40 2017 +0200
     6.3 @@ -1,4 +1,4 @@
     6.4 -# SliTaz package receipt.
     6.5 +# SliTaz package receipt v2.
     6.6  
     6.7  PACKAGE="lucene++"
     6.8  VERSION="3.0.7"
     6.9 @@ -7,26 +7,39 @@
    6.10  MAINTAINER="al.bobylev@gmail.com"
    6.11  LICENSE="Apache"
    6.12  WEB_SITE="https://github.com/luceneplusplus/LucenePlusPlus"
    6.13 +
    6.14  TARBALL="$PACKAGE-$VERSION.tar.gz"
    6.15  WGET_URL="$WEB_SITE/archive/rel_$VERSION.tar.gz"
    6.16  
    6.17 -DEPENDS="libboost-date-time libboost-filesystem libboost-iostreams \
    6.18 -libboost-regex libboost-system libboost-thread libboost-chrono"
    6.19  BUILD_DEPENDS="cmake libboost-dev libboost-date-time libboost-filesystem \
    6.20 -libboost-regex libboost-thread libboost-iostreams"
    6.21 +libboost-regex libboost-thread libboost-iostreams python"
    6.22 +SPLIT="lucene++-dev"
    6.23  
    6.24 -# Rules to configure and make the package.
    6.25 -compile_rules()
    6.26 -{
    6.27 +compile_rules() {
    6.28  	mkdir build; cd build
    6.29 -	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
    6.30 +	cmake \
    6.31 +		-DCMAKE_INSTALL_PREFIX=/usr \
    6.32 +		-DLIB_DESTINATION=/usr/lib \
    6.33 +		-DBoost_LIBRARY_DIR=/usr/lib \
    6.34 +		-DENABLE_CUSTOM_ALLOCATOR='FALSE' \
    6.35 +		-DCMAKE_CXX_FLAGS='-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT' \
    6.36 +		.. &&
    6.37  	make &&
    6.38  	make install
    6.39  }
    6.40  
    6.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.42 -genpkg_rules()
    6.43 -{
    6.44 -	mkdir -p $fs/usr/lib
    6.45 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.46 +genpkg_rules() {
    6.47 +	case $PACKAGE in
    6.48 +		lucene++)
    6.49 +			copy @std
    6.50 +			DEPENDS="libboost-date-time libboost-filesystem libboost-iostreams \
    6.51 +			libboost-regex libboost-system libboost-thread libboost-chrono"
    6.52 +			;;
    6.53 +		*-dev)
    6.54 +			copy @dev
    6.55 +			DEPENDS="libboost-dev libboost-date-time libboost-filesystem \
    6.56 +			libboost-iostreams libboost-regex libboost-system libboost-thread \
    6.57 +			libboost-chrono"
    6.58 +			;;
    6.59 +	esac
    6.60  }
     7.1 --- a/mygestures/receipt	Tue Nov 07 12:15:09 2017 +0100
     7.2 +++ b/mygestures/receipt	Tue Nov 07 14:03:40 2017 +0200
     7.3 @@ -21,7 +21,7 @@
     7.4  	./configure \
     7.5  		--sysconfdir=/etc/$PACKAGE \
     7.6  		$CONFIGURE_ARGS &&
     7.7 -	make && make j 1 install
     7.8 +	make && make -j 1 install
     7.9  }
    7.10  
    7.11  # Rules to gen a SliTaz package suitable for Tazpkg.
     8.1 --- a/ndiswrapper-driver/receipt	Tue Nov 07 12:15:09 2017 +0100
     8.2 +++ b/ndiswrapper-driver/receipt	Tue Nov 07 14:03:40 2017 +0200
     8.3 @@ -2,6 +2,7 @@
     8.4  
     8.5  PACKAGE="ndiswrapper-driver"
     8.6  VERSION="1.59"
     8.7 +EXTRAVERSION="_$kvers"
     8.8  CATEGORY="system-tools"
     8.9  SHORT_DESC="Add Windows network drivers support to Linux kernel."
    8.10  MAINTAINER="erjo@slitaz.org"
    8.11 @@ -25,7 +26,6 @@
    8.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.13  genpkg_rules()
    8.14  {
    8.15 -	EXTRAVERSION=_${kvers}
    8.16  	mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/${kvers}-slitaz/kernel/misc
    8.17  
    8.18  	# Install utilities
     9.1 --- a/nvidia-173xx/receipt	Tue Nov 07 12:15:09 2017 +0100
     9.2 +++ b/nvidia-173xx/receipt	Tue Nov 07 14:03:40 2017 +0200
     9.3 @@ -2,6 +2,7 @@
     9.4  
     9.5  PACKAGE="nvidia-173xx"
     9.6  VERSION="173.14.39"
     9.7 +EXTRAVERSION="_$kvers"
     9.8  CATEGORY="non-free"
     9.9  MAINTAINER="jozee@slitaz.org"
    9.10  LICENSE="other"
    9.11 @@ -31,7 +32,6 @@
    9.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.13  genpkg_rules()
    9.14  {
    9.15 -	EXTRAVERSION=_${kvers}
    9.16  
    9.17  	mkdir -p \
    9.18  		$fs/usr/share \
    10.1 --- a/nvidia-96xx/receipt	Tue Nov 07 12:15:09 2017 +0100
    10.2 +++ b/nvidia-96xx/receipt	Tue Nov 07 14:03:40 2017 +0200
    10.3 @@ -2,6 +2,7 @@
    10.4  
    10.5  PACKAGE="nvidia-96xx"
    10.6  VERSION="96.43.23"
    10.7 +EXTRAVERSION="_$kvers"
    10.8  CATEGORY="network"
    10.9  MAINTAINER="psychomaniak@xakep.ru"
   10.10  LICENSE="other"
   10.11 @@ -31,7 +32,6 @@
   10.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.13  genpkg_rules()
   10.14  {
   10.15 -	EXTRAVERSION=_${kvers}
   10.16  
   10.17  	mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE
   10.18  	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/video
    11.1 --- a/open-vm-tools-kernel/receipt	Tue Nov 07 12:15:09 2017 +0100
    11.2 +++ b/open-vm-tools-kernel/receipt	Tue Nov 07 14:03:40 2017 +0200
    11.3 @@ -2,6 +2,7 @@
    11.4  
    11.5  PACKAGE="open-vm-tools-kernel"
    11.6  VERSION="10.0.0-3000743"
    11.7 +EXTRAVERSION="_$kvers"
    11.8  CATEGORY="utilities"
    11.9  TAGS="vmware kernel"
   11.10  SHORT_DESC="Open VMware Tools"
   11.11 @@ -41,7 +42,6 @@
   11.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   11.13  genpkg_rules()
   11.14  {
   11.15 -	EXTRAVERSION=_${kvers}
   11.16  
   11.17  	mkdir -p $fs/lib
   11.18  	cp -a $install/lib/modules $fs/lib
    12.1 --- a/spl/receipt	Tue Nov 07 12:15:09 2017 +0100
    12.2 +++ b/spl/receipt	Tue Nov 07 14:03:40 2017 +0200
    12.3 @@ -2,8 +2,9 @@
    12.4  
    12.5  PACKAGE="spl"
    12.6  VERSION="0.6.2"
    12.7 +EXTRAVERSION="_$kvers"
    12.8  CATEGORY="system-tools"
    12.9 -SHORT_DESC="Solaris Porting LAyer for ZFS."
   12.10 +SHORT_DESC="Solaris Porting Layer for ZFS"
   12.11  MAINTAINER="pascal.bellard@slitaz.org"
   12.12  LICENSE="GPL2"
   12.13  WEB_SITE="http://zfsonlinux.org/"
   12.14 @@ -27,7 +28,6 @@
   12.15  # Rules to gen a SliTaz package suitable for Tazpkg.
   12.16  genpkg_rules()
   12.17  {
   12.18 -	EXTRAVERSION="_${kvers}"
   12.19  	mkdir -p $fs/usr
   12.20  	cp -a $install/usr/sbin $fs/usr
   12.21  	cp -a $install/lib $fs