diff --git a/security/util-vserver/util-vserver.conf b/security/util-vserver/util-vserver.conf index 09d80516d..de84ba266 100644 --- a/security/util-vserver/util-vserver.conf +++ b/security/util-vserver/util-vserver.conf @@ -19,15 +19,13 @@ vserver_cqtools() { tar $taropt `match_source_file -p " cq-tools"` cd cq-tools-* - eval "$MAKE all" + eval "$MAKE $makeopt all" # no `make install` - cp -vdf $( grep '^all:' Makefile | cut -f2 ) $sbindir + cp -vdf $( grep '^all:' Makefile | cut -f2 ) $root$sbindir } var_append patchfiles ' ' $( match_source_file -p patch-$ver ) -makeopt= -makeinstopt='install' if [ "$SDECFG_PKG_VSERVER_QUOTA" = "1" ]; then hook_add postmake 5 'vserver_cqtools' @@ -43,3 +41,18 @@ vserver_tests() { chmod +x $root$docdir/test{me,fs}.sh } hook_add postmake 5 "vserver_tests" + +# some help to crosscompile +# +for x in ip iptables vconfig wget; do + case "$x" in + ip) y=iproute2 ;; + vconfig) + y=vlan ;; + esac + + z=$( echo "$x" | tr '[a-z]' '[A-Z]' ) + + pkgprefix -t $y + var_append configcache ' ' ac_cv_path_$z=$( pkgprefix bindir $y )/$x +done diff --git a/security/util-vserver/util-vserver.desc b/security/util-vserver/util-vserver.desc index b397e04a0..8aaec7bfd 100644 --- a/security/util-vserver/util-vserver.desc +++ b/security/util-vserver/util-vserver.desc @@ -28,15 +28,15 @@ [C] extra/security [L] GPL -[S] Beta -[V] 0.30.213-rc6 -[P] O -----5---9 190.200 +[S] Stable +[V] 0.30.213 +[P] O -?---5---9 190.200 [F] NOPARALLEL DIETLIBC NO-SSP # vserver utilities -#[D] 3426298380 util-vserver-0.30.212.tar.bz2 http://ftp.linux-vserver.org/pub/utils/util-vserver/ -[D] 871601915 util-vserver-0.30.213-rc6.tar.bz2 http://people.linux-vserver.org/~dhozac/t/uv-testing/ +[D] 1085810197 util-vserver-0.30.213.tar.bz2 http://ftp.linux-vserver.org/pub/utils/util-vserver/ +#[D] 871601915 util-vserver-0.30.213-rc6.tar.bz2 http://people.linux-vserver.org/~dhozac/t/uv-testing/ # and addons [D] 3365204218 cq-tools-0.06.tar.bz2 http://www.13thfloor.at/vserver/s_addons/quota/