baselayout fixes for /dev

5 files changed, 20 insertions, 9 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 0961fbc276da..aaa23116e7d7 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.114 2004/01/25 23:07:50 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.115 2004/02/01 22:01:11 brad_mssw Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  01 Feb 2004; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild,
+  baselayout-1.8.6.12-r4.ebuild, baselayout-1.8.6.12-r5.ebuild:
+  In catalyst, with USE=build and ROOT != / the ROOT/dev directory doesn't exist, so
+  you MUST create it otherwise extracting the dev tarball to that directory will
+  fail without stopping the ebuild
+
   25 Jan 2004; Chris PeBenito <pebenito@gentoo.org>
   baselayout-1.8.6.12-r2.ebuild, baselayout-1.8.6.12-r3.ebuild,
   baselayout-1.8.6.12-r4.ebuild:
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
index 012474a49066..497c20aaf65b 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.10 2004/01/26 17:51:12 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.11 2004/02/01 22:01:11 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -559,8 +559,9 @@ pkg_postinst() {
 		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
 		then
 			einfo "Populating /dev with device nodes..."
+			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
 			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev"
+				-C "${ROOT}/dev" || die
 		fi
 	fi
 
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild
index afd2f4373f46..1e909deb2457 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild,v 1.3 2004/01/26 17:51:12 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r3.ebuild,v 1.4 2004/02/01 22:01:11 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -559,8 +559,9 @@ pkg_postinst() {
 		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
 		then
 			einfo "Populating /dev with device nodes..."
+			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
 			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev"
+				-C "${ROOT}/dev" || die
 		fi
 	fi
 
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild
index 561585ffe00d..8122bd13ea0e 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild,v 1.5 2004/01/26 17:51:12 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r4.ebuild,v 1.6 2004/02/01 22:01:11 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -568,8 +568,9 @@ pkg_postinst() {
 		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
 		then
 			einfo "Populating /dev with device nodes..."
+			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
 			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev"
+				-C "${ROOT}/dev" || die
 		fi
 	fi
 
diff --git a/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild b/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild
index 15a6e7c24e21..2b29a86ab9a7 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild,v 1.1 2004/01/21 19:07:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r5.ebuild,v 1.2 2004/02/01 22:01:11 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -560,8 +560,9 @@ pkg_postinst() {
 		if [ -n "$(use build)" -o -n "$(use bootstrap)" ]
 		then
 			einfo "Populating /dev with device nodes..."
+			[ ! -e "${ROOT}/dev" ] && mkdir -p "${ROOT}/dev"
 			tar -jxpf "${ROOT}/lib/udev-state/devices.tar.bz2" \
-				-C "${ROOT}/dev"
+				-C "${ROOT}/dev" || die
 		fi
 	fi