wok-undigest rev 201
Up: vzctl (3.0.25.1)
| author | Eric Joseph-Alexandre <erjo@slitaz.org> |
|---|---|
| date | Sun Jan 02 22:25:36 2011 +0100 (2011-01-02) |
| parents | db38a28f4300 |
| children | 3b9431a40ff2 |
| files | vzctl/receipt vzctl/stuff/vzctl-3.0.23-Makefile.u vzctl/stuff/vzctl-3.0.25.1-Makefile.u |
line diff
1.1 --- a/vzctl/receipt Sun Jan 02 08:25:38 2011 +0000 1.2 +++ b/vzctl/receipt Sun Jan 02 22:25:36 2011 +0100 1.3 @@ -1,50 +1,56 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="vzctl" 1.7 -VERSION="3.0.23" 1.8 +VERSION="3.0.25.1" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="OpenVZ containers control utility" 1.11 MAINTAINER="erjo@slitaz.org" 1.12 DEPENDS="udev bash procmail bridge-utils logrotate" 1.13 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.14 -WEB_SITE="http://www.openvz.org" 1.15 -WGET_URL="http://download.openvz.org/utils/$PACKAGE/$VERSION/src/$TARBALL" 1.16 +WEB_SITE="http://wiki.openvz.org/Main_Page" 1.17 +WGET_URL="http://download.openvz.org/utils/${PACKAGE}/${VERSION}/src/${TARBALL}" 1.18 1.19 # Rules to configure and make the package. 1.20 compile_rules() 1.21 { 1.22 cd $src 1.23 - busybox patch -p1 -i ../stuff/vzctl-3.0.23.u || exit false 1.24 + 1.25 + # Apply patches 1.26 + while read patch_file; do 1.27 + if [ -f done.$patch_file ]; then 1.28 + echo "Skipping $patch_file" 1.29 + continue 1.30 + fi 1.31 + echo "Apply $patch_file" 1.32 + patch -p1 < ../stuff/$patch_file || exit 1 1.33 + touch done.$patch_file 1.34 + done <<EOT 1.35 +vzctl-${VERSION}-Makefile.u 1.36 +EOT 1.37 ./configure \ 1.38 --prefix=/usr \ 1.39 --localstatedir=/var \ 1.40 --enable-bashcomp \ 1.41 - --enable-logrotate \ 1.42 - --disable-static && \ 1.43 + --enable-logrotate && 1.44 make && make DESTDIR=$PWD/_pkg install && make DESTDIR=$PWD/_pkg install-slitaz 1.45 } 1.46 1.47 # Rules to gen a SliTaz package suitable for Tazpkg. 1.48 genpkg_rules() 1.49 { 1.50 - mkdir -p $fs/usr/share \ 1.51 - -p $fs/etc/conf.d 1.52 - 1.53 + mkdir -p $fs/usr/lib \ 1.54 + $fs/usr/share 1.55 + 1.56 + cp -a $_pkg/usr/sbin $fs/usr 1.57 + cp -a $_pkg/usr/lib/vzctl $fs/usr/lib 1.58 + cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 1.59 cp -a $_pkg/etc $fs/ 1.60 - cp -a $_pkg/var $fs/ 1.61 - cp -a $_pkg/vz $fs/ 1.62 - cp -a $_pkg/usr/sbin $fs/usr 1.63 - cp -a $_pkg/usr/lib $fs/usr 1.64 - cp -a $_pkg/usr/share/vzctl $fs/usr/share 1.65 + cp -a $_pkg/var/ $fs/ 1.66 + cp -a $_pkg/vz/ $fs/ 1.67 1.68 - rm -f $fs/usr/lib/*.la 1.69 - 1.70 - # Fix permission 1.71 - chmod 755 $fs/usr/sbin/* 1.72 - chmod 755 $fs/etc/init.d/* 1.73 - chmod 755 $fs/usr/share/vzctl/scripts/* 1.74 - chmod 755 $fs/usr/lib/vzctl/scripts/* 1.75 - 1.76 - 1.77 + # fix permissions 1.78 + chmod 0755 $fs/usr/lib/vzctl/scripts/v* 1.79 + chmod 0755 $fs/usr/sbin/* 1.80 + chmod 0755 $fs/etc/init.d/vz 1.81 } 1.82
2.1 --- a/vzctl/stuff/vzctl-3.0.23-Makefile.u Sun Jan 02 08:25:38 2011 +0000 2.2 +++ b/vzctl/stuff/vzctl-3.0.23-Makefile.u Sun Jan 02 22:25:36 2011 +0100 2.3 @@ -1,5 +1,5 @@ 2.4 --- vzctl-3.0.23-ori/Makefile.am Thu Oct 30 14:24:43 2008 2.5 -+++ vzctl-3.0.23/Makefile.am Mon Nov 16 21:43:03 2009 2.6 ++++ vzctl-3.0.23/Makefile.am Mon Nov 16 16:32:40 2009 2.7 @@ -49,7 +49,8 @@ 2.8 install-redhat \ 2.9 install-gentoo \ 2.10 @@ -11,7 +11,7 @@ 2.11 $(DISTRO_TARGETS): 2.12 $(MAKE) $(AM_MAKEFLAGS) -C etc $@ 2.13 --- vzctl-3.0.23-ori/Makefile.in Thu Oct 30 14:24:52 2008 2.14 -+++ vzctl-3.0.23/Makefile.in Mon Nov 16 21:43:03 2009 2.15 ++++ vzctl-3.0.23/Makefile.in Mon Nov 16 16:33:11 2009 2.16 @@ -217,7 +217,8 @@ 2.17 install-redhat \ 2.18 install-gentoo \ 2.19 @@ -23,7 +23,7 @@ 2.20 all: all-recursive 2.21 2.22 --- vzctl-3.0.23-ori/etc/Makefile.am Thu Oct 30 14:24:43 2008 2.23 -+++ vzctl-3.0.23/etc/Makefile.am Mon Nov 16 21:43:03 2009 2.24 ++++ vzctl-3.0.23/etc/Makefile.am Mon Nov 16 16:33:39 2009 2.25 @@ -43,6 +43,9 @@ 2.26 2.27 install-debian: 2.28 @@ -35,7 +35,7 @@ 2.29 install-gentoo: 2.30 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 2.31 --- vzctl-3.0.23-ori/etc/Makefile.in Thu Oct 30 14:24:49 2008 2.32 -+++ vzctl-3.0.23/etc/Makefile.in Mon Nov 16 21:43:03 2009 2.33 ++++ vzctl-3.0.23/etc/Makefile.in Mon Nov 16 16:34:00 2009 2.34 @@ -563,6 +563,9 @@ 2.35 install-debian: 2.36 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 2.37 @@ -47,29 +47,23 @@ 2.38 $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 2.39 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d 2.40 --- vzctl-3.0.23-ori/etc/init.d/Makefile.am Thu Oct 30 14:24:43 2008 2.41 -+++ vzctl-3.0.23/etc/init.d/Makefile.am Mon Nov 16 21:46:42 2009 2.42 -@@ -31,6 +31,11 @@ 2.43 ++++ vzctl-3.0.23/etc/init.d/Makefile.am Mon Nov 16 16:34:25 2009 2.44 +@@ -31,6 +31,8 @@ 2.45 2.46 install-debian: install-redhat 2.47 2.48 -+install-slitaz: 2.49 -+ $(mkinstalldirs) $(DESTDIR)$(initddir) 2.50 -+ $(INSTALL_SCRIPT) vz-redhat $(DESTDIR)$(initddir)/vz 2.51 -+ sed -e 's!/subsys!!' 2.52 ++install-slitaz: install-redhat 2.53 + 2.54 install-gentoo: vz-gentoo 2.55 $(mkinstalldirs) $(DESTDIR)$(initddir) 2.56 $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 2.57 --- vzctl-3.0.23-ori/etc/init.d/Makefile.in Thu Oct 30 14:24:50 2008 2.58 -+++ vzctl-3.0.23/etc/init.d/Makefile.in Mon Nov 16 22:12:15 2009 2.59 -@@ -404,6 +404,11 @@ 2.60 ++++ vzctl-3.0.23/etc/init.d/Makefile.in Mon Nov 16 16:34:40 2009 2.61 +@@ -404,6 +404,8 @@ 2.62 2.63 install-debian: install-redhat 2.64 2.65 +install-slitaz: install-redhat 2.66 -+ sed -i -e 's!/subsys!!' $(DESTDIR)$(initddir)/vz 2.67 -+ sed -i -e 's/sysctl -q/sysctl -n/' $(DESTDIR)$(initddir)/vz 2.68 -+ 2.69 + 2.70 install-gentoo: vz-gentoo 2.71 $(mkinstalldirs) $(DESTDIR)$(initddir)
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/vzctl/stuff/vzctl-3.0.25.1-Makefile.u Sun Jan 02 22:25:36 2011 +0100 3.3 @@ -0,0 +1,133 @@ 3.4 +--- vzctl-3.0.25.1-ori/Makefile.am Fri Dec 24 12:45:32 2010 3.5 ++++ vzctl-3.0.25.1/Makefile.am Fri Dec 31 09:27:42 2010 3.6 +@@ -49,7 +49,8 @@ 3.7 + install-redhat \ 3.8 + install-gentoo \ 3.9 + install-suse \ 3.10 +- install-debian 3.11 ++ install-debian\ 3.12 ++ install-slitaz 3.13 + 3.14 + DISTRO_TARGETS_ALL = \ 3.15 + $(DISTRO_TARGETS) \ 3.16 +--- vzctl-3.0.25.1-ori/Makefile.in Fri Dec 24 12:45:44 2010 3.17 ++++ vzctl-3.0.25.1/Makefile.in Fri Dec 31 09:27:42 2010 3.18 +@@ -266,7 +266,8 @@ 3.19 + install-redhat \ 3.20 + install-gentoo \ 3.21 + install-suse \ 3.22 +- install-debian 3.23 ++ install-debian \ 3.24 ++ install-slitaz 3.25 + 3.26 + DISTRO_TARGETS_ALL = \ 3.27 + $(DISTRO_TARGETS) \ 3.28 +--- vzctl-3.0.25.1-ori/bin/Makefile.am Fri Dec 24 12:45:38 2010 3.29 ++++ vzctl-3.0.25.1/bin/Makefile.am Fri Dec 31 09:35:38 2010 3.30 +@@ -57,6 +57,8 @@ 3.31 + 3.32 + install-debian: 3.33 + 3.34 ++install-slitaz: 3.35 ++ 3.36 + install-gentoo: 3.37 + @echo 3.38 + @echo "***************************************************" 3.39 +--- vzctl-3.0.25.1-ori/bin/Makefile.in Fri Dec 24 12:45:43 2010 3.40 ++++ vzctl-3.0.25.1/bin/Makefile.in Fri Dec 31 09:35:39 2010 3.41 +@@ -530,6 +530,8 @@ 3.42 + 3.43 + install-debian: 3.44 + 3.45 ++install-slitaz: 3.46 ++ 3.47 + install-gentoo: 3.48 + @echo 3.49 + @echo "***************************************************" 3.50 +--- vzctl-3.0.25.1-ori/etc/Makefile.am Fri Dec 24 12:45:34 2010 3.51 ++++ vzctl-3.0.25.1/etc/Makefile.am Fri Dec 31 09:27:42 2010 3.52 +@@ -50,3 +50,6 @@ 3.53 + $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 3.54 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d 3.55 + $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz 3.56 ++ 3.57 ++install-slitaz: 3.58 ++ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 3.59 +--- vzctl-3.0.25.1-ori/etc/Makefile.in Fri Dec 24 12:45:43 2010 3.60 ++++ vzctl-3.0.25.1/etc/Makefile.in Fri Dec 31 09:27:42 2010 3.61 +@@ -683,6 +683,10 @@ 3.62 + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d 3.63 + $(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz 3.64 + 3.65 ++install-slitaz: 3.66 ++ $(MAKE) $(AM_MAKEFLAGS) -C init.d $@ 3.67 ++ 3.68 ++ 3.69 + # Tell versions [3.59,3.63) of GNU make to not export all variables. 3.70 + # Otherwise a system limit (for SysV at least) may be exceeded. 3.71 + .NOEXPORT: 3.72 +--- vzctl-3.0.25.1-ori/etc/init.d/Makefile.am Fri Dec 24 12:45:34 2010 3.73 ++++ vzctl-3.0.25.1/etc/init.d/Makefile.am Fri Dec 31 09:27:42 2010 3.74 +@@ -33,6 +33,8 @@ 3.75 + 3.76 + install-debian: install-redhat 3.77 + 3.78 ++install-slitaz: install-redhat 3.79 ++ 3.80 + install-gentoo: vz-gentoo vzeventd-gentoo 3.81 + $(mkinstalldirs) $(DESTDIR)$(initddir) 3.82 + $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 3.83 +--- vzctl-3.0.25.1-ori/etc/init.d/Makefile.in Fri Dec 24 12:45:43 2010 3.84 ++++ vzctl-3.0.25.1/etc/init.d/Makefile.in Fri Dec 31 09:27:40 2010 3.85 +@@ -492,6 +492,8 @@ 3.86 + 3.87 + install-debian: install-redhat 3.88 + 3.89 ++install-slitaz: install-redhat 3.90 ++ 3.91 + install-gentoo: vz-gentoo vzeventd-gentoo 3.92 + $(mkinstalldirs) $(DESTDIR)$(initddir) 3.93 + $(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz 3.94 +--- vzctl-3.0.25.1-ori/etc/init.d/initd-functions.in Fri Dec 24 12:45:35 2010 3.95 ++++ vzctl-3.0.25.1/etc/init.d/initd-functions.in Sun Jan 2 14:29:21 2011 3.96 +@@ -28,6 +28,9 @@ 3.97 + elif [ -r /etc/debian_version ]; then 3.98 + DISTR=debian 3.99 + VARLOCK=/var/lock 3.100 ++elif [ -r /etc/slitaz-release ]; then 3.101 ++ DISTR=slitaz 3.102 ++ VARLOCK=/var/lock 3.103 + fi 3.104 + 3.105 + print_success() 3.106 +--- vzctl-3.0.25.1-ori/etc/init.d/vz-redhat.in Fri Dec 24 12:45:35 2010 3.107 ++++ vzctl-3.0.25.1/etc/init.d/vz-redhat.in Fri Dec 31 14:50:22 2010 3.108 +@@ -189,7 +189,7 @@ 3.109 + if [ "${IPV6}" = "yes" ]; then 3.110 + ip -6 addr add fe80::1/128 dev $VZDEV 3.111 + fi 3.112 +- sysctl -q -w net.ipv4.conf.$VZDEV.send_redirects=0 3.113 ++ sysctl -w net.ipv4.conf.$VZDEV.send_redirects=0 3.114 + if [ "$(sysctl -n -e net.ipv4.ip_forward)" != "1" ]; then 3.115 + print_warning "IP forwarding is not enabled" 3.116 + fi 3.117 +@@ -242,7 +242,7 @@ 3.118 + need_restart="" 3.119 + velist=$(vzlist -aH -octid,onboot -s-bootorder | 3.120 + awk '$2 == "yes" {print $1}') 3.121 +- sysctl -q -w net.ipv4.route.src_check=0 3.122 ++ sysctl -w net.ipv4.route.src_check=0 3.123 + for veid in $velist; do 3.124 + [ "${veid}" = "0" ] && continue 3.125 + __echo "Starting CT ${veid}: " 3.126 +--- vzctl-3.0.25.1-ori/scripts/vps-create.in Fri Dec 24 12:45:37 2010 3.127 ++++ vzctl-3.0.25.1/scripts/vps-create.in Fri Dec 31 14:53:35 2010 3.128 +@@ -38,7 +38,7 @@ 3.129 + vzerror "Tarball does not exist: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT} 3.130 + HEADER="$(od -A n -N 2 -t x1 -- "$PRIVATE_TEMPLATE")" || 3.131 + vzerror "Invalid tarball: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT} 3.132 +- TMP="$(df -P "$VE_PRVT")" || 3.133 ++ TMP="$(df "$VE_PRVT")" || 3.134 + vzerror "Failed to calculate available disk space on $VE_PRVT" ${VZ_FS_NEW_VE_PRVT} 3.135 + AVAIL="$(echo "$TMP" | awk 'END{print $4}')" 3.136 + if [ "$HEADER" = ' 1f 8b' ]; then