Restore /dev population for bootstrap that was cut in various earlier commits.

(Portage version: 2.1.2_rc4-r7)

2 files changed, 46 insertions, 3 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 5426469f1693..4ab9c65ad572 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.386 2007/01/08 23:06:53 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.387 2007/01/08 23:43:47 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  08 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  baselayout-1.12.8-r2.ebuild:
+  Restore /dev population for bootstrap that was cut in various earlier commits.
+
   08 Jan 2007; Roy Marples <uberlord@gentoo.org>
   baselayout-1.12.8-r2.ebuild, baselayout-1.13.0_alpha10-r2.ebuild:
   Upgrade/downgrade is now sane between 1.12.8-r2 and 1.13.0_alpha10-r2
diff --git a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild
index 5d26b6e1621a..f9a24eb65105 100644
--- a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r2.ebuild,v 1.2 2007/01/08 23:06:53 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild,v 1.3 2007/01/08 23:43:47 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="bootstrap build static unicode"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
@@ -75,6 +75,33 @@ src_compile() {
 		LIBDIR="${libdir}" || die
 }
 
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+	case $(tc-arch) in
+		# amd64 must use generic-i386 because amd64/x86_64 does not have
+		# a generic option at this time, and the default 'generic' ends
+		# up erroring out, because MAKEDEV internally doesn't know what
+		# to use
+		arm*)    suffix=-arm ;;
+		alpha)   suffix=-alpha ;;
+		amd64)   suffix=-i386 ;;
+		hppa)    suffix=-hppa ;;
+		ia64)    suffix=-ia64 ;;
+		m68k)    suffix=-m68k ;;
+		mips*)   suffix=-mips ;;
+		ppc*)    suffix=-powerpc ;;
+		s390*)   suffix=-s390 ;;
+		sh*)     suffix=-sh ;;
+		sparc*)  suffix=-sparc ;;
+		x86)     suffix=-i386 ;;
+	esac
+
+	einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
+	MAKEDEV generic${suffix}
+	MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+}
+
 # This is a temporary workaround until bug 9849 is completely solved
 # in portage.  We need to create the directories so they're available
 # during src_install, but when src_install is finished, call unkdir
@@ -419,6 +446,18 @@ pkg_postinst() {
 	# (05 May 2004 agriffis)
 	ln -sn . "${ROOT}"/boot/boot 2>/dev/null
 
+	# For the bootstrap scenario with an empty /dev, let's fill the
+	# sucker with generic crude ... some day we should think about
+	# slimming this way down as we've moved on to udev/devfs
+	if use build || use bootstrap ; then
+		if [[ ! -e ${ROOT}/dev/.devfsd && ! -e ${ROOT}/dev/.udev ]] ; then
+			echo
+			einfo "Making device node tarball (this could take a couple minutes)"
+			cd "${ROOT}"/dev || die
+			PATH=${ROOT}/sbin:${PATH} create_dev_nodes
+		fi
+	fi
+
 	# Set up default runlevel symlinks
 	# This used to be done in src_install but required knowledge of ${ROOT},
 	# which meant that it was effectively broken for binary installs.