wok rev 15570
Up lxc (0.9.0) again
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Nov 26 09:00:34 2013 +0000 (2013-11-26) |
parents | c95f2bc361ec |
children | 3a91636c5606 |
files | lxc-dev/receipt lxc/receipt |
line diff
1.1 --- a/lxc-dev/receipt Tue Nov 26 07:50:32 2013 +0000 1.2 +++ b/lxc-dev/receipt Tue Nov 26 09:00:34 2013 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="lxc-dev" 1.7 -VERSION="0.7.4.1" 1.8 +VERSION="0.9.0" 1.9 CATEGORY="development" 1.10 SHORT_DESC="Userspace control package for Linux Containers development files." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 @@ -14,7 +14,7 @@ 1.13 # Rules to gen a SliTaz package suitable for Tazpkg. 1.14 genpkg_rules() 1.15 { 1.16 - mkdir -p $fs/usr/share 1.17 + mkdir -p $fs/usr/lib 1.18 cp -a $install/usr/include $fs/usr 1.19 - cp -a $install/usr/share/pkgconfig $fs/usr/share 1.20 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.21 }
2.1 --- a/lxc/receipt Tue Nov 26 07:50:32 2013 +0000 2.2 +++ b/lxc/receipt Tue Nov 26 09:00:34 2013 +0000 2.3 @@ -18,6 +18,8 @@ 2.4 { 2.5 cd $src 2.6 ./configure --prefix=/usr --mandir=/usr/share/man \ 2.7 + --sysconfdir=/etc \ 2.8 + --libexec=/usr/lib/$PACKAGE \ 2.9 --localstatedir=/var \ 2.10 $CONFIGURE_ARGS && 2.11 make && 2.12 @@ -27,17 +29,15 @@ 2.13 # Rules to gen a SliTaz package suitable for Tazpkg. 2.14 genpkg_rules() 2.15 { 2.16 - mkdir -p $fs/usr $fs/var/lib/lxc 2.17 + mkdir -p $fs/usr/share $fs/var/lib/lxc 2.18 + cp -a $install/usr/share/lxc $fs/usr/share 2.19 cp -a $install/usr/bin $fs/usr 2.20 cp -a $install/usr/lib $fs/usr 2.21 - sed -i 's|/usr/var/lib/lxc|/var/lib/lxc|;s|/bin/bash|/bin/ash|' \ 2.22 - $fs/usr/bin/lxc-version $fs/usr/bin/lxc-netstat \ 2.23 - $fs/usr/bin/lxc-destroy $fs/usr/bin/lxc-create \ 2.24 - $fs/usr/bin/lxc-setcap $fs/usr/bin/lxc-setuid \ 2.25 - $fs/usr/bin/lxc-ls 2.26 + rm -rf $install/usr/lib/pkgconfig 2.27 + cp -a $install/etc $fs 2.28 + cp -a $install/var $fs 2.29 sed -i -e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \ 2.30 -e 's/\(.*\$GREP .*\)\(\$CONFIG.*\)/\1< \2/' \ 2.31 - -e 's/ < 3/ -lt 3/;s/ > 3/ -gt 3/' -e 's|/bin/bash|/bin/ash|' \ 2.32 $fs/usr/bin/lxc-checkconfig 2.33 chmod +x $fs/usr/bin/lxc-* 2.34 }