diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-30 07:15:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-30 07:15:59 +0000 |
| commit | 4ee6209fd9a5f20979013bb0ef4db94920b34ff7 (patch) | |
| tree | 4864c72632c94c3343976ec9b5588d5bce7467a0 /sys-apps | |
| parent | use doenvd rather than writing to env.d ourselves (diff) | |
| download | gentoo-2-4ee6209fd9a5f20979013bb0ef4db94920b34ff7.tar.gz gentoo-2-4ee6209fd9a5f20979013bb0ef4db94920b34ff7.tar.bz2 gentoo-2-4ee6209fd9a5f20979013bb0ef4db94920b34ff7.zip | |
Build up dirs/symlinks in $ROOT in pkg_preinst() before portage has a chance to screw things up.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.12.8-r1.ebuild | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index ab4ba4d3a534..179665373df7 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.380 2006/12/20 22:14:17 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.381 2006/12/30 07:15:59 vapier Exp $ # See the rc-scripts ChangeLog in subversion for release info: # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog + 30 Dec 2006; Mike Frysinger <vapier@gentoo.org> + baselayout-1.12.8-r1.ebuild: + Build up dirs/symlinks in $ROOT in pkg_preinst() before portage has a chance + to screw things up. + *baselayout-1.13.0_alpha10-r2 (20 Dec 2006) 20 Dec 2006; Roy Marples <uberlord@gentoo.org> diff --git a/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild index 70a27f234d1b..bb4746d972b2 100644 --- a/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild,v 1.2 2006/12/30 07:12:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild,v 1.3 2006/12/30 07:15:59 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -378,6 +378,16 @@ remap_dns_vars() { } pkg_preinst() { + # Reincarnate dirs from kdir/unkdir (hack for bug 9849) + # This needs to be in pkg_preinst() rather than pkg_postinst() as + # portage may create some dirs/files that'll screw us up (like /usr/lib/debug) + einfo "Creating directories and .keep files." + einfo "Some of these might fail if they're read-only mounted" + einfo "filesystems, for example /dev or /proc. That's okay!" + source "${D}"/usr/share/baselayout/mkdirs.sh + source "${D}"/usr/share/baselayout/mklinks.sh + echo + if [[ -f ${ROOT}/etc/modules.autoload && \ ! -d ${ROOT}/etc/modules.autoload.d ]]; then mkdir -p ${ROOT}/etc/modules.autoload.d @@ -396,14 +406,6 @@ pkg_preinst() { pkg_postinst() { local x y - # Reincarnate dirs from kdir/unkdir (hack for bug 9849) - einfo "Creating directories and .keep files." - einfo "Some of these might fail if they're read-only mounted" - einfo "filesystems, for example /dev or /proc. That's okay!" - source "${ROOT}"/usr/share/baselayout/mkdirs.sh - source "${ROOT}"/usr/share/baselayout/mklinks.sh - echo - # Create /boot/boot symlink in pkg_postinst because sometimes # /boot is a FAT filesystem. When that is the case, then the # symlink will fail. Consequently, if we create it in |