diff options
4 files changed, 24 insertions, 37 deletions
diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog index 93e4bc24468d..de970142653f 100644 --- a/sys-apps/baselayout-vserver/ChangeLog +++ b/sys-apps/baselayout-vserver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/baselayout-vserver # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.6 2005/06/08 09:06:21 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.7 2005/06/12 08:24:22 hollow Exp $ + + 12 Jun 2005; Benedikt Boehm <hollow@gentoo.org> + baselayout-vserver-1.11.12-r4.ebuild: + minor fixes + cleanup *baselayout-vserver-1.11.12-r4 (08 Jun 2005) diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest index f804b8ca3688..e98351623fbd 100644 --- a/sys-apps/baselayout-vserver/Manifest +++ b/sys-apps/baselayout-vserver/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239 -MD5 0af3274a20a9a13f2fbafd9625130799 ChangeLog 1247 -MD5 e6635a58b73dc5395b8f88fec1b9f80f baselayout-vserver-1.11.12-r4.ebuild 12252 +MD5 a2fcbcb5d328760436adf1cc20f2c253 ChangeLog 1362 +MD5 4c1a706479356be357d37b6f6de31eb4 baselayout-vserver-1.11.12-r4.ebuild 12151 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 MD5 76a9437d29bd77c416f76fbcf0cf2af2 files/vserver-changes 1642 MD5 51a97031d54d767b45fb247d60727e9d files/fakelog.initd 449 -MD5 b0e4c08a36c9591bc8b87376afcd6d2d files/digest-baselayout-vserver-1.11.12-r4 78 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCpwTMmPFBzbX68WERArx3AJ9lMZwf8wMiNXQpq9Ia3Q06Q9dxIQCfVnRd -CdYBnllHjOWe1wsZS0Cod1c= -=zlqJ ------END PGP SIGNATURE----- +MD5 53ec83d5ccc83d7f3dc430db626cb464 files/digest-baselayout-vserver-1.11.12-r4 78 diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.12-r4.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.12-r4.ebuild index 21899db8dc1c..7c64d499fd57 100644 --- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.12-r4.ebuild +++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.12-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.12-r4.ebuild,v 1.2 2005/06/08 14:45:43 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.12-r4.ebuild,v 1.3 2005/06/12 08:24:22 hollow Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -31,21 +31,6 @@ RDEPEND=">=sys-apps/sysvinit-2.84 DEPEND="virtual/os-headers" PROVIDE="virtual/baselayout" -src_unpack() { - unpack ${A} - cd "${S}" - - # setup unicode defaults for silly unicode users - if use unicode ; then - sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf - fi - - # Fix Sparc specific stuff - if [[ $(tc-arch) == "sparc" ]] ; then - sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die - fi -} - src_compile() { use static && append-ldflags -static @@ -204,13 +189,20 @@ src_install() { fperms 0600 /etc/shadow mv ${D}/etc/{passwd,shadow,group,hosts,issue.devfix} ${D}/usr/share/baselayout - cp -P ${S}/init.d/* ${D}/etc/init.d - if use fakelog; then - cp ${FILESDIR}/fakelog.initd ${D}/etc/init.d - fi - chmod a+x ${D}/etc/init.d/* + insopts -m0755 + insinto /etc/init.d + doins ${S}/init.d/* + use fakelog && newins ${FILESDIR}/fakelog.initd fakelog + + # link dummy init scripts + cd ${D}/etc/init.d + for i in checkfs checkroot clock consolefont localmount modules net.lo net.eth0 netmount; do + ln -sf dummy $i + done + insinto /etc/conf.d doins ${S}/etc/conf.d/* + insinto /etc/env.d doins ${S}/etc/env.d/* @@ -228,7 +220,8 @@ src_install() { # As of baselayout-1.10-1-r1, sysvinit is its own package again, and # provides the inittab itself - rm -f "${D}"/etc/inittab + # <hollow@gentoo.org> We need our own inittab for vservers here + #rm -f "${D}"/etc/inittab # Stash the rc-lists for use during pkg_postinst cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.12-r4 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.12-r4 index 501c68083c89..d52b16c64982 100644 --- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.12-r4 +++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.12-r4 @@ -1 +1 @@ -MD5 98072769efc3daec3edcf60d89b62c42 rc-scripts-1.6.12-vserver.tar.bz2 105693 +MD5 b3baae8b085c3849d8fb5af81c80d022 rc-scripts-1.6.12-vserver.tar.bz2 104662 |