From 21fe27e6fba23361562ebbb5bba23c5f4ffc172d Mon Sep 17 00:00:00 2001 From: Brian Jackson Date: Wed, 26 Oct 2005 14:46:18 +0000 Subject: [PATCH] a few changes I've had sitting around here that fix some known bugs Package-Manager: portage-2.0.53_rc6 --- sys-apps/baselayout-lite/ChangeLog | 6 +++++- sys-apps/baselayout-lite/Manifest | 6 +++--- .../baselayout-lite/baselayout-lite-1.0_pre1.ebuild | 11 ++++++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sys-apps/baselayout-lite/ChangeLog b/sys-apps/baselayout-lite/ChangeLog index fb7b2fdf0d3d..2ffe5f090a29 100644 --- a/sys-apps/baselayout-lite/ChangeLog +++ b/sys-apps/baselayout-lite/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/baselayout-lite # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-lite/ChangeLog,v 1.9 2005/06/12 13:32:56 iggy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-lite/ChangeLog,v 1.10 2005/10/26 14:46:18 iggy Exp $ + + 26 Oct 2005; Brian Jackson + baselayout-lite-1.0_pre1.ebuild: + a few changes I've had sitting around here that fix some known bugs 12 Jun 2005; Brian Jackson -baselayout-lite-1.0_pre2.ebuild: diff --git a/sys-apps/baselayout-lite/Manifest b/sys-apps/baselayout-lite/Manifest index cd3606815407..d66155b0b7df 100644 --- a/sys-apps/baselayout-lite/Manifest +++ b/sys-apps/baselayout-lite/Manifest @@ -1,4 +1,4 @@ -MD5 726f761f7f1f4c9f7758f2af2e0f28b9 baselayout-lite-1.0_pre1.ebuild 2093 -MD5 3d4e645c732dcb2c81869a32479343ca ChangeLog 1569 -MD5 80eb89a0e028f94140bee79817433941 metadata.xml 367 +MD5 1eb79174efdc8b5e41cb1051ed329634 ChangeLog 1723 +MD5 aca2b93069c50bcb97c9429e58227d3e baselayout-lite-1.0_pre1.ebuild 2416 MD5 865feeaee968ccbfa160d6b31ea179e1 files/digest-baselayout-lite-1.0_pre1 75 +MD5 80eb89a0e028f94140bee79817433941 metadata.xml 367 diff --git a/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild b/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild index 3eea6b884699..5d9e29118795 100644 --- a/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild +++ b/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.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-lite/baselayout-lite-1.0_pre1.ebuild,v 1.7 2005/05/30 03:40:13 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-lite/baselayout-lite-1.0_pre1.ebuild,v 1.8 2005/10/26 14:46:18 iggy Exp $ IUSE="build bootstrap" @@ -19,6 +19,12 @@ PROVIDE="virtual/baselayout" src_install() { keepdir /bin /etc /etc/init.d /home /lib /sbin /usr /var /root /mnt + keepdir /var/log /proc + + # if ROOT=/ and we make /proc, we will get errors when portage tries + # to create /proc/.keep, so we remove it if we need to + [ "${ROOT}" = "/" ] && rm -rf ${D}/proc + [ "${ROOT}" = "" ] && rm -rf ${D}/proc # (Jul 23 2004 -solar) # This fails a when merging if /proc is already mounted. We @@ -28,6 +34,9 @@ src_install() { insinto /etc doins ${S}/{fstab,group,nsswitch.conf,passwd,profile.env,protocols,shells} + + # Fixup the inittab file first + sed -i -e 's:/usr/bin/tail:/bin/tail:' ${S}/init/inittab doins ${S}/init/inittab use elibc_uclibc && rm -f ${D}/etc/nsswitch.conf -- 2.26.2