diff options
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/util-vserver-svn/Manifest | 4 | ||||
| -rwxr-xr-x | sys-cluster/util-vserver-svn/files/init.d/vprocunhide | 20 | ||||
| -rwxr-xr-x | sys-cluster/util-vserver-svn/files/init.d/vservers.default | 15 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/Manifest | 5 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/files/bash_completion (renamed from sys-cluster/util-vserver-svn/files/bash_completion) | 0 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-0.30.215_pre20080113.ebuild (renamed from sys-cluster/util-vserver/util-vserver-0.30.214_pre2590.ebuild) | 48 | ||||
| -rw-r--r-- | sys-cluster/util-vserver/util-vserver-9999.ebuild (renamed from sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild) | 70 |
7 files changed, 45 insertions, 117 deletions
diff --git a/sys-cluster/util-vserver-svn/Manifest b/sys-cluster/util-vserver-svn/Manifest deleted file mode 100644 index f0efbb9..0000000 --- a/sys-cluster/util-vserver-svn/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d -AUX init.d/vprocunhide 506 RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 SHA1 f1bf6bc18f228c16090bbd8daec0b1e497ef75a8 SHA256 4e7f95b4bd0aca85383d0fc5ce9ffd78869a60e6f0f2dffaa4b1c8ec9d9b2c3d -AUX init.d/vservers.default 320 RMD160 66fefb9908fe73b1d7967bd16b8cc5365d92a33a SHA1 0a5a198b00a5923b52005a34e46799d2815edaa7 SHA256 3b0812b59afaf39e5cefa4ddc1d27b7be7f7b58c69a2f045f4b7ae039dbe290c -EBUILD util-vserver-svn-9999.ebuild 2845 RMD160 af6a7369c3811a171d2a1618802abeedb82c8baa SHA1 3e0e42ce26d6fd5276952166c9ab715a9d723f00 SHA256 42c096a1f767bd9ec20c9d264a1dfcae2803cb802ee0397dd440b25d412aa9ea diff --git a/sys-cluster/util-vserver-svn/files/init.d/vprocunhide b/sys-cluster/util-vserver-svn/files/init.d/vprocunhide deleted file mode 100755 index d7199ca..0000000 --- a/sys-cluster/util-vserver-svn/files/init.d/vprocunhide +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -start() { - : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} - if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then - eerror "Cannot find util-vserver installation" - eerror "(the file '$UTIL_VSERVER_VARS' would be expected)" - return 1 - fi - - source ${UTIL_VSERVER_VARS} - - ebegin "Fixing /proc entries visibility" - ${_VPROCUNHIDE} - eend $? -} - -# vim:ts=4:filetype=gentoo-init-d diff --git a/sys-cluster/util-vserver-svn/files/init.d/vservers.default b/sys-cluster/util-vserver-svn/files/init.d/vservers.default deleted file mode 100755 index 52eb322..0000000 --- a/sys-cluster/util-vserver-svn/files/init.d/vservers.default +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -start() { - MARK=${0##*/vserver.} /usr/lib/util-vserver/vserver-wrapper start -} - -stop() { - MARK=${0##*/vserver.} /usr/lib/util-vserver/vserver-wrapper stop -} - - - -# vim:ts=4:filetype=gentoo-init-d diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest index 6acba7a..b6b5ec3 100644 --- a/sys-cluster/util-vserver/Manifest +++ b/sys-cluster/util-vserver/Manifest @@ -1,2 +1,3 @@ -DIST util-vserver-0.30.214-pre2590.tar.bz2 675369 RMD160 37bd8bbd732b591ec1cbcfc7e19e88d5288fe8d1 SHA1 773889a5f262a786bd21dc1daa155937898d19cc SHA256 45eac2f3d882ef0b93b1647986605900123a8e3968cec4632f75d88973818e6b -EBUILD util-vserver-0.30.214_pre2590.ebuild 3697 RMD160 c0e39d7d94d44184e3174a06713d55a1082b771d SHA1 5f6b8e15ebec1ed1d3f21673af241f8325f77a72 SHA256 4ce17b15b35d6886f379cf1ffe872aee01ff330811dcf2315915265d30a2cd8b +AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d +EBUILD util-vserver-0.30.215_pre20080113.ebuild 2626 RMD160 e82d0dd6b6fed68627731e4178f0d00336fa12f1 SHA1 6ba776a0d1fc283e734a830e169534ab945d961a SHA256 6854296ac4f8379732f87ee3e77e9cd602d74cfd0589fed532c73ba8654f772b +EBUILD util-vserver-9999.ebuild 2598 RMD160 ea9c55132ae7091023b585d2565fc1a032e7f625 SHA1 0db9b7e6817c6a6a69b3fc3ee0f9fb7a39fdbc6d SHA256 ea4849886137d282a4d566348069b14b288126714031c41fc752150dca9886ea diff --git a/sys-cluster/util-vserver-svn/files/bash_completion b/sys-cluster/util-vserver/files/bash_completion index 73a9fef..73a9fef 100644 --- a/sys-cluster/util-vserver-svn/files/bash_completion +++ b/sys-cluster/util-vserver/files/bash_completion diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214_pre2590.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215_pre20080113.ebuild index 738cfaa..c357258 100644 --- a/sys-cluster/util-vserver/util-vserver-0.30.214_pre2590.ebuild +++ b/sys-cluster/util-vserver/util-vserver-0.30.215_pre20080113.ebuild @@ -1,17 +1,13 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.210-r18.ebuild,v 1.2 2006/09/07 08:34:50 hollow Exp $ WANT_AUTOMAKE="1.9" -inherit autotools eutils bash-completion +inherit autotools eutils bash-completion subversion DESCRIPTION="Linux-VServer admin utilities" HOMEPAGE="http://www.nongnu.org/util-vserver/" -SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P/_pre/-pre}.tar.bz2 - http://people.linux-vserver.org/~dhozac/t/uv-testing/${P/_pre/-pre}.tar.bz2" - -S="${WORKDIR}/${P/_pre/-pre}" LICENSE="GPL-2" SLOT="0" @@ -30,6 +26,11 @@ RDEPEND="sys-apps/iproute2 net-firewall/iptables dev-libs/beecrypt" +ESVN_PROJECT="${PN}" +ESVN_OPTIONS="-r2659" +ESVN_REPO_URI="http://svn.linux-vserver.org/svn/util-vserver/trunk" +ESVN_BOOTSTRAP="make -f Makefile.svn" + pkg_setup() { if [[ -z "${VDIRBASE}" ]]; then einfo @@ -44,11 +45,6 @@ pkg_setup() { einfo } -src_unpack() { - unpack ${A} - cd "${S}" -} - src_compile() { econf --with-vrootdir=${VDIRBASE} \ --with-initscripts=gentoo \ @@ -97,34 +93,6 @@ pkg_postinst() { elog " rc-update add vprocunhide default" elog - if has_version "<${CATEGORY}/${PN}-0.30.211" ; then - ewarn "Please make sure, that you remove the old init-script from any" - ewarn "runlevel and remove it from your init.d dir!" - ewarn - ewarn "# rc-update del vservers" - ewarn "# rm -f ${ROOT}etc/init.d/vservers" - ewarn - ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers" - ewarn "have been merged upstream, and may now have a slightly" - ewarn "different syntax, i.e. you have to update scripts that" - ewarn "depend on these wrappers (vesync, vemerge, vupdateworld" - ewarn "and vdispatch-conf)" - ewarn - ewarn "Additionally the init scripts have changed and now use" - ewarn "upstream scripts as backend. An init script to start" - ewarn "virtual servers in the 'default' group/mark has been" - ewarn "installed by this ebuild:" - ewarn - ewarn " rc-update add vservers.default default" - ewarn - ewarn "To start vservers in other groups/marks, you have to" - ewarn "symlink the default init script the same way you do" - ewarn "with net.* scripts:" - ewarn - ewarn " ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>" - ewarn - fi - ewarn "You should definitly fix up the barrier of your vserver" ewarn "base directory by using the following command in a root shell:" ewarn diff --git a/sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild b/sys-cluster/util-vserver/util-vserver-9999.ebuild index 2fed17c..f5c66bf 100644 --- a/sys-cluster/util-vserver-svn/util-vserver-svn-9999.ebuild +++ b/sys-cluster/util-vserver/util-vserver-9999.ebuild @@ -2,30 +2,32 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.210-r18.ebuild,v 1.2 2006/09/07 08:34:50 hollow Exp $ -inherit autotools eutils toolchain-funcs bash-completion subversion +WANT_AUTOMAKE="1.9" + +inherit autotools eutils bash-completion subversion DESCRIPTION="Linux-VServer admin utilities" HOMEPAGE="http://www.nongnu.org/util-vserver/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +KEYWORDS="-*" -IUSE="legacy" +IUSE="" DEPEND=">=dev-libs/dietlibc-0.30-r2 dev-libs/beecrypt net-firewall/iptables net-misc/vconfig - sys-apps/iproute2 - sys-process/procps" + sys-apps/iproute2" RDEPEND="sys-apps/iproute2 net-misc/vconfig net-firewall/iptables - dev-libs/beecrypt - sys-process/procps" + dev-libs/beecrypt" +ESVN_PROJECT="${PN}" +ESVN_OPTIONS="-rHEAD" ESVN_REPO_URI="http://svn.linux-vserver.org/svn/util-vserver/trunk" ESVN_BOOTSTRAP="make -f Makefile.svn" @@ -41,26 +43,18 @@ pkg_setup() { einfo einfo "Using \"${VDIRBASE}\" as vserver base directory" einfo - - myconf="${myconf} --with-vrootdir=${VDIRBASE}" - - # default paths - myconf="${myconf} --localstatedir=/var" - myconf="${myconf} --with-initrddir=/etc/init.d" - - # needed for older vserver kernels not in portage (default: v13,net) - # we provide this just for convenience for people using self-made kernels - use legacy && myconf="${myconf} --enable-apis=compat,v11,fscompat,v13,net" } src_compile() { - econf ${myconf} || die "econf failed" - emake || die "emake failed" + econf --with-vrootdir=${VDIRBASE} \ + --with-initscripts=gentoo \ + --localstatedir=/var || die "econf failed!" + emake || die "emake failed!" } src_install() { - make DESTDIR="${D}" install || die "install failed" - make DESTDIR="${D}" install-distribution || die "install-distribution failed" + make DESTDIR="${D}" install install-distribution \ + || die "make install failed!" # keep dirs keepdir /var/run/vservers @@ -69,17 +63,11 @@ src_install() { keepdir /var/lock/vservers keepdir /var/cache/vservers keepdir "${VDIRBASE}" + keepdir "${VDIRBASE}"/.pkg # remove legacy config file rm -f "${D}"/etc/vservers.conf - # remove the non-gentoo init-scripts: - rm -f "${D}"/etc/init.d/* - - # and install gentoo'ized ones: - doinitd "${FILESDIR}"/init.d/vservers.default - doinitd "${FILESDIR}"/init.d/vprocunhide - # bash-completion dobashcompletion "${FILESDIR}"/bash_completion util-vserver @@ -87,14 +75,24 @@ src_install() { } pkg_postinst() { - einfo - einfo "You have to run the vprocunhide command after every reboot" - einfo "in order to setup /proc permissions correctly for vserver" - einfo "use. An init script has been installed by this package." - einfo "To use it you should add it to a runlevel:" - einfo - einfo " rc-update add vprocunhide default" - ewarn + # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also + # present when merging. + + [ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null + setattr --barrier "${VDIRBASE}" &> /dev/null + + rm /etc/vservers/.defaults/vdirbase + ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase + + elog + elog "You have to run the vprocunhide command after every reboot" + elog "in order to setup /proc permissions correctly for vserver" + elog "use. An init script has been installed by this package." + elog "To use it you should add it to a runlevel:" + elog + elog " rc-update add vprocunhide default" + elog + ewarn "You should definitly fix up the barrier of your vserver" ewarn "base directory by using the following command in a root shell:" ewarn |