Build up dirs/symlinks in $ROOT in pkg_preinst() before portage has a chance to screw things up.

Package-Manager: portage-2.1.2_rc4-r2

3 files changed, 28 insertions, 21 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/Manifest b/sys-apps/baselayout/Manifest
index 4b4b46c823f1..9d2c09741cde 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -87,10 +87,10 @@ EBUILD baselayout-1.12.6.ebuild 19713 RMD160 2a19aa08e7a497843b40d2678ba8695580e
 MD5 bd19081e2814fc4989fb0648ba5fa709 baselayout-1.12.6.ebuild 19713
 RMD160 2a19aa08e7a497843b40d2678ba8695580e6f75f baselayout-1.12.6.ebuild 19713
 SHA256 c39675983cc1a94ddedb5822490cb3504230d8dad3df60d36f71e8d035b5d57a baselayout-1.12.6.ebuild 19713
-EBUILD baselayout-1.12.8-r1.ebuild 17081 RMD160 700c880d4cf129d3f5010d3b0cc45095ce3929a5 SHA1 5e675b44d8f08c5988314dc7519806087aa92b69 SHA256 dfa6464688a8052672c16eb10621717552ed2462549d47f3c0690cca2aa7d06b
-MD5 0c1b154ed054fceb54550f85b3cade92 baselayout-1.12.8-r1.ebuild 17081
-RMD160 700c880d4cf129d3f5010d3b0cc45095ce3929a5 baselayout-1.12.8-r1.ebuild 17081
-SHA256 dfa6464688a8052672c16eb10621717552ed2462549d47f3c0690cca2aa7d06b baselayout-1.12.8-r1.ebuild 17081
+EBUILD baselayout-1.12.8-r1.ebuild 17222 RMD160 bbbf217a167d3d3336cfc52f1419ba69d22a2219 SHA1 2a3d7184ded8654eaf143ebbe1022bad5a280896 SHA256 20d19c44f5b69138a652137d3713a5731ceb9a813270355935cfb18914543429
+MD5 4c2d228369d8ff1f53210afcf873dfb6 baselayout-1.12.8-r1.ebuild 17222
+RMD160 bbbf217a167d3d3336cfc52f1419ba69d22a2219 baselayout-1.12.8-r1.ebuild 17222
+SHA256 20d19c44f5b69138a652137d3713a5731ceb9a813270355935cfb18914543429 baselayout-1.12.8-r1.ebuild 17222
 EBUILD baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 SHA1 a2110deb651437e356ae4f9ce9b7d5b0d6e4f89e SHA256 2de062a8fff51618f17af46395ab9a202d229d86e8e0f8fe713da344ec3d4d9a
 MD5 082aa588289d254af8bbdfbf37f0a05e baselayout-1.12.8.ebuild 17035
 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 baselayout-1.12.8.ebuild 17035
@@ -107,10 +107,10 @@ EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865
 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979
 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979
 SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 baselayout-1.13.0_alpha10.ebuild 9979
-MISC ChangeLog 86409 RMD160 ccbdd4fae57aaf63cc907e26481bd211b65a6c57 SHA1 808fd3d46829d960906756a20e771f8e588c3ac4 SHA256 fe3f5b3f7ae00d864f948c9501f4f7ac1d9edc5debc58b871b29371d2efd84ab
-MD5 3c4394c5fd96d6962c71414791bed87c ChangeLog 86409
-RMD160 ccbdd4fae57aaf63cc907e26481bd211b65a6c57 ChangeLog 86409
-SHA256 fe3f5b3f7ae00d864f948c9501f4f7ac1d9edc5debc58b871b29371d2efd84ab ChangeLog 86409
+MISC ChangeLog 86590 RMD160 5643717c39dc237b88387553511d2727a7453ba1 SHA1 9e36d11283f78f1da4d6d310e35262d28ce920f4 SHA256 ee42e6044615a0ab9d08d96a5a09368a9ac9b1ea000f62078a42b255ca06aae8
+MD5 badf90f7aa4035cf6b4377bf6cf3f3d2 ChangeLog 86590
+RMD160 5643717c39dc237b88387553511d2727a7453ba1 ChangeLog 86590
+SHA256 ee42e6044615a0ab9d08d96a5a09368a9ac9b1ea000f62078a42b255ca06aae8 ChangeLog 86590
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -145,7 +145,7 @@ SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFlhG88bi6rjpTunYRAnrHAJ99VUfMmObAlJgGZNdbrxzxSFvfiQCeMz5+
-NSKv52bkLGUkMUREhTKlTg8=
-=4H9+
+iD8DBQFFlhJw8bi6rjpTunYRAopJAJ9ygdMWJKGbe0/2rJrqlI2AZzwM8QCfaqOy
+dxK+FRQUjoEIV7AmHfupjEg=
+=2CiH
 -----END PGP SIGNATURE-----
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