# HG changeset patch # User Hans-G?nter Theisgen # Date 1555944545 -3600 # Node ID 4175a35819c88ec002138e333a77e9adc077982d # Parent 346038d5909fc84e59f37abc4e9f64d545068246 updated lxc and lxc-dev (1.0.0 -> 3.1.0) diff -r 346038d5909f -r 4175a35819c8 lxc-dev/receipt --- a/lxc-dev/receipt Mon Apr 22 15:19:39 2019 +0100 +++ b/lxc-dev/receipt Mon Apr 22 15:49:05 2019 +0100 @@ -1,20 +1,21 @@ # SliTaz package receipt. PACKAGE="lxc-dev" -VERSION="1.0.0" +VERSION="3.1.0" CATEGORY="development" -SHORT_DESC="Userspace control package for Linux Containers development files." +SHORT_DESC="Userspace control package for Linux Containers - development files." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="LGPL2.1" -WEB_SITE="http://lxc.sourceforge.net/" -WANTED="lxc" +WEB_SITE="https://linuxcontainers.org/lxc/" DEPENDS="lxc pkg-config" +WANTED="lxc" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/pkgconfig $fs/usr/lib + + cp -a $install/usr/include $fs/usr + cp -a $install/usr/lib/pkgconfig $fs/usr/lib } diff -r 346038d5909f -r 4175a35819c8 lxc/receipt --- a/lxc/receipt Mon Apr 22 15:19:39 2019 +0100 +++ b/lxc/receipt Mon Apr 22 15:49:05 2019 +0100 @@ -1,41 +1,51 @@ # SliTaz package receipt. PACKAGE="lxc" -VERSION="1.0.0" +VERSION="3.1.0" CATEGORY="system-tools" SHORT_DESC="Userspace control package for Linux Containers." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="LGPL2.1" +WEB_SITE="https://linuxcontainers.org/lxc/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://linuxcontainers.org/" -WGET_URL="${WEB_SITE}downloads/$TARBALL" +WGET_URL="https://linuxcontainers.org/downloads/$PACKAGE/$TARBALL" -DEPENDS="libcap perl util-linux-getopt linux-netfilter linux-bridge iptables bridge-utils" -BUILD_DEPENDS="libcap-dev util-linux-getopt" +DEPENDS="bridge-utils gnutls iptables libcap linux-bridge linux-netfilter \ + perl util-linux-getopt" +BUILD_DEPENDS="gcc83 gnutls-dev libcap-dev util-linux-getopt" # Rules to configure and make the package. compile_rules() { - cd $src - ./configure --prefix=/usr --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --libexec=/usr/lib/$PACKAGE \ - --localstatedir=/var \ - $CONFIGURE_ARGS && - make && + ./configure \ + CC=gcc-83 \ + CXX=g++-83 \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --libexec=/usr/lib/$PACKAGE \ + --localstatedir=/var \ + $CONFIGURE_ARGS && + make -j 1 && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share $fs/var/lib/lxc - cp -a $install/usr/share/lxc $fs/usr/share - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr + mkdir -p $fs/usr/share + mkdir -p $fs/var/lib/lxc + + cp -a $install/usr/share/lxc $fs/usr/share + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib $fs/usr + rm -rf $fs/usr/lib/pkgconfig - cp -a $install/etc $fs - cp -a $install/var $fs + + cp -a $install/etc $fs + cp -a $install/var $fs + sed -i -e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \ -e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \ $fs/usr/bin/lxc-checkconfig