wok rev 21391

updated lxc and lxc-dev (1.0.0 -> 3.1.0)
author Hans-G?nter Theisgen
date Mon Apr 22 15:49:05 2019 +0100 (2019-04-22)
parents 346038d5909f
children 56253db1eb5e
files lxc-dev/receipt lxc/receipt
line diff
     1.1 --- a/lxc-dev/receipt	Mon Apr 22 15:19:39 2019 +0100
     1.2 +++ b/lxc-dev/receipt	Mon Apr 22 15:49:05 2019 +0100
     1.3 @@ -1,20 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="lxc-dev"
     1.7 -VERSION="1.0.0"
     1.8 +VERSION="3.1.0"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Userspace control package for Linux Containers development files."
    1.11 +SHORT_DESC="Userspace control package for Linux Containers - development files."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="LGPL2.1"
    1.14 -WEB_SITE="http://lxc.sourceforge.net/"
    1.15 -WANTED="lxc"
    1.16 +WEB_SITE="https://linuxcontainers.org/lxc/"
    1.17  
    1.18  DEPENDS="lxc pkg-config"
    1.19 +WANTED="lxc"
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.   
    1.22  genpkg_rules()                                      
    1.23  {
    1.24  	mkdir -p $fs/usr/lib
    1.25 -	cp -a $install/usr/include $fs/usr
    1.26 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.27 +
    1.28 +	cp -a $install/usr/include		$fs/usr
    1.29 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    1.30  }
     2.1 --- a/lxc/receipt	Mon Apr 22 15:19:39 2019 +0100
     2.2 +++ b/lxc/receipt	Mon Apr 22 15:49:05 2019 +0100
     2.3 @@ -1,41 +1,51 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="lxc"
     2.7 -VERSION="1.0.0"
     2.8 +VERSION="3.1.0"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Userspace control package for Linux Containers."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  LICENSE="LGPL2.1"
    2.13 +WEB_SITE="https://linuxcontainers.org/lxc/"
    2.14 +
    2.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.16 -WEB_SITE="http://linuxcontainers.org/"
    2.17 -WGET_URL="${WEB_SITE}downloads/$TARBALL"
    2.18 +WGET_URL="https://linuxcontainers.org/downloads/$PACKAGE/$TARBALL"
    2.19  
    2.20 -DEPENDS="libcap perl util-linux-getopt linux-netfilter linux-bridge iptables bridge-utils"
    2.21 -BUILD_DEPENDS="libcap-dev util-linux-getopt"
    2.22 +DEPENDS="bridge-utils gnutls iptables libcap linux-bridge linux-netfilter \
    2.23 +	perl util-linux-getopt"
    2.24 +BUILD_DEPENDS="gcc83 gnutls-dev libcap-dev util-linux-getopt"
    2.25  
    2.26  # Rules to configure and make the package.
    2.27  compile_rules()
    2.28  {
    2.29 -	cd $src
    2.30 -	./configure --prefix=/usr --mandir=/usr/share/man \
    2.31 -		--sysconfdir=/etc \
    2.32 -		--libexec=/usr/lib/$PACKAGE \
    2.33 -		--localstatedir=/var \
    2.34 -	$CONFIGURE_ARGS &&
    2.35 -	make &&
    2.36 +	./configure				\
    2.37 +		CC=gcc-83			\
    2.38 +		CXX=g++-83			\
    2.39 +		--prefix=/usr			\
    2.40 +		--mandir=/usr/share/man		\
    2.41 +		--sysconfdir=/etc		\
    2.42 +		--libexec=/usr/lib/$PACKAGE	\
    2.43 +		--localstatedir=/var		\
    2.44 +		$CONFIGURE_ARGS &&
    2.45 +	make -j 1 &&
    2.46  	make DESTDIR=$DESTDIR install
    2.47  }
    2.48  
    2.49  # Rules to gen a SliTaz package suitable for Tazpkg.   
    2.50  genpkg_rules()                                      
    2.51  {
    2.52 -	mkdir -p $fs/usr/share $fs/var/lib/lxc
    2.53 -	cp -a $install/usr/share/lxc $fs/usr/share
    2.54 -	cp -a $install/usr/bin $fs/usr
    2.55 -	cp -a $install/usr/lib $fs/usr
    2.56 +	mkdir -p $fs/usr/share
    2.57 +	mkdir -p $fs/var/lib/lxc
    2.58 +
    2.59 +	cp -a $install/usr/share/lxc	$fs/usr/share
    2.60 +	cp -a $install/usr/bin		$fs/usr
    2.61 +	cp -a $install/usr/lib		$fs/usr
    2.62 +
    2.63  	rm -rf $fs/usr/lib/pkgconfig
    2.64 -	cp -a $install/etc $fs
    2.65 -	cp -a $install/var $fs
    2.66 +
    2.67 +	cp -a $install/etc		$fs
    2.68 +	cp -a $install/var		$fs
    2.69 +
    2.70  	sed -i -e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \
    2.71  		-e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \
    2.72  		$fs/usr/bin/lxc-checkconfig