# HG changeset patch # User Aleksej Bobylev # Date 1510056220 -7200 # Node ID d247e85339a4f1721ee5aa7cd13889aa83ed9fba # Parent f84149441859f86402f64182af0307cba8d8bc8b 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++ diff -r f84149441859 -r d247e85339a4 aufs/receipt --- a/aufs/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/aufs/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,7 +2,7 @@ PACKAGE="aufs" VERSION="5b18dc7" -EXTRAVERSION=_${kvers} +EXTRAVERSION="_$kvers" CATEGORY="base-system" SHORT_DESC="The Linux Kernel 4.9 aufs module" MAINTAINER="godane@slitaz.org" diff -r f84149441859 -r d247e85339a4 broadcom-wl/receipt --- a/broadcom-wl/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/broadcom-wl/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,6 +2,7 @@ PACKAGE="broadcom-wl" VERSION="6_30_223_271" +EXTRAVERSION="_$kvers" CATEGORY="network" MAINTAINER="jozee@slitaz.org" LICENSE="other" @@ -26,7 +27,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTRAVERSION=_${kvers} mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless # Compress and install module install -o root -m 0644 $src/wl.ko.xz \ diff -r f84149441859 -r d247e85339a4 dahdi-linux/receipt --- a/dahdi-linux/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/dahdi-linux/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,6 +2,7 @@ PACKAGE="dahdi-linux" VERSION="2.11.1" +EXTRAVERSION="_$kvers" CATEGORY="network" SHORT_DESC="Digium Asterisk Hardware Device Interface: kernel modules." MAINTAINER="pascal.bellard@slitaz.org" @@ -46,13 +47,10 @@ case $PACKAGE in dahdi-linux) DEPENDS="linux udev" - EXTRAVERSION=_${kvers} cp -a $install/* $fs rm -rf $fs/usr/include ;; dahdi-linux-dev) - CAT="development|Digium Asterisk Hardware Device Interface: kernel modules dev files." - EXTRAVERSION=_${kvers} mkdir -p $fs/usr cp -a $install/usr/include $fs/usr ;; diff -r f84149441859 -r d247e85339a4 iptables/receipt --- a/iptables/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/iptables/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,7 +2,7 @@ PACKAGE="iptables" VERSION="1.6.1" -EXTRAVERSION=_$kvers +EXTRAVERSION="_$kvers" CATEGORY="security" SHORT_DESC="Packet filtering framework (Firewall)" MAINTAINER="pankso@slitaz.org" diff -r f84149441859 -r d247e85339a4 linux-cloop/receipt --- a/linux-cloop/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/linux-cloop/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -4,6 +4,7 @@ SOURCE="cloop" GITHASH="9acc0fcad420b5ff7062fdd1c90d27ada5278b97" # 3.14 VERSION="${GITHASH:0:7}" +EXTRAVERSION="_$kvers" CATEGORY="base-system" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" @@ -30,11 +31,10 @@ make cloop_suspend && make KERNEL_DIR="/usr/src/linux" cloop.ko && xz cloop.ko } - + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() -{ - EXTRAVERSION=_$kvers +{ mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/misc $fs/dev $fs/usr/bin cp $src/cloop_suspend $fs/usr/bin cp $src/cloop.ko.xz $fs/lib/modules/$kvers-slitaz/kernel/misc diff -r f84149441859 -r d247e85339a4 lucene++/receipt --- a/lucene++/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/lucene++/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="lucene++" VERSION="3.0.7" @@ -7,26 +7,39 @@ MAINTAINER="al.bobylev@gmail.com" LICENSE="Apache" WEB_SITE="https://github.com/luceneplusplus/LucenePlusPlus" + TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$WEB_SITE/archive/rel_$VERSION.tar.gz" -DEPENDS="libboost-date-time libboost-filesystem libboost-iostreams \ -libboost-regex libboost-system libboost-thread libboost-chrono" BUILD_DEPENDS="cmake libboost-dev libboost-date-time libboost-filesystem \ -libboost-regex libboost-thread libboost-iostreams" +libboost-regex libboost-thread libboost-iostreams python" +SPLIT="lucene++-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { mkdir build; cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. && + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_DESTINATION=/usr/lib \ + -DBoost_LIBRARY_DIR=/usr/lib \ + -DENABLE_CUSTOM_ALLOCATOR='FALSE' \ + -DCMAKE_CXX_FLAGS='-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT' \ + .. && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib +genpkg_rules() { + case $PACKAGE in + lucene++) + copy @std + DEPENDS="libboost-date-time libboost-filesystem libboost-iostreams \ + libboost-regex libboost-system libboost-thread libboost-chrono" + ;; + *-dev) + copy @dev + DEPENDS="libboost-dev libboost-date-time libboost-filesystem \ + libboost-iostreams libboost-regex libboost-system libboost-thread \ + libboost-chrono" + ;; + esac } diff -r f84149441859 -r d247e85339a4 mygestures/receipt --- a/mygestures/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/mygestures/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -21,7 +21,7 @@ ./configure \ --sysconfdir=/etc/$PACKAGE \ $CONFIGURE_ARGS && - make && make j 1 install + make && make -j 1 install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r f84149441859 -r d247e85339a4 ndiswrapper-driver/receipt --- a/ndiswrapper-driver/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/ndiswrapper-driver/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,6 +2,7 @@ PACKAGE="ndiswrapper-driver" VERSION="1.59" +EXTRAVERSION="_$kvers" CATEGORY="system-tools" SHORT_DESC="Add Windows network drivers support to Linux kernel." MAINTAINER="erjo@slitaz.org" @@ -25,7 +26,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTRAVERSION=_${kvers} mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/${kvers}-slitaz/kernel/misc # Install utilities diff -r f84149441859 -r d247e85339a4 nvidia-173xx/receipt --- a/nvidia-173xx/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/nvidia-173xx/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,6 +2,7 @@ PACKAGE="nvidia-173xx" VERSION="173.14.39" +EXTRAVERSION="_$kvers" CATEGORY="non-free" MAINTAINER="jozee@slitaz.org" LICENSE="other" @@ -31,7 +32,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTRAVERSION=_${kvers} mkdir -p \ $fs/usr/share \ diff -r f84149441859 -r d247e85339a4 nvidia-96xx/receipt --- a/nvidia-96xx/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/nvidia-96xx/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,6 +2,7 @@ PACKAGE="nvidia-96xx" VERSION="96.43.23" +EXTRAVERSION="_$kvers" CATEGORY="network" MAINTAINER="psychomaniak@xakep.ru" LICENSE="other" @@ -31,7 +32,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTRAVERSION=_${kvers} mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/video diff -r f84149441859 -r d247e85339a4 open-vm-tools-kernel/receipt --- a/open-vm-tools-kernel/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/open-vm-tools-kernel/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,6 +2,7 @@ PACKAGE="open-vm-tools-kernel" VERSION="10.0.0-3000743" +EXTRAVERSION="_$kvers" CATEGORY="utilities" TAGS="vmware kernel" SHORT_DESC="Open VMware Tools" @@ -41,7 +42,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTRAVERSION=_${kvers} mkdir -p $fs/lib cp -a $install/lib/modules $fs/lib diff -r f84149441859 -r d247e85339a4 spl/receipt --- a/spl/receipt Tue Nov 07 12:15:09 2017 +0100 +++ b/spl/receipt Tue Nov 07 14:03:40 2017 +0200 @@ -2,8 +2,9 @@ PACKAGE="spl" VERSION="0.6.2" +EXTRAVERSION="_$kvers" CATEGORY="system-tools" -SHORT_DESC="Solaris Porting LAyer for ZFS." +SHORT_DESC="Solaris Porting Layer for ZFS" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://zfsonlinux.org/" @@ -27,7 +28,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTRAVERSION="_${kvers}" mkdir -p $fs/usr cp -a $install/usr/sbin $fs/usr cp -a $install/lib $fs