baselayout amd64 fixes

5 files changed, 35 insertions, 10 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 4914c8eca834..fa270204b301 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.106 2003/12/10 21:02:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.107 2003/12/14 20:22:02 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
 
+  14 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  baselayout-1.8.6.10-r1.ebuild, baselayout-1.8.6.12-r2.ebuild,
+  baselayout-1.8.6.8-r1.ebuild:
+  stage binaries do not have proper /dev fs if you do not pass the proper
+  MAKEDEV command. MAKEDEV does not yet support x86_64/amd64 therefore we must
+  use the 'generic-i386' options. If we let it default to 'generic' MAKEDEV
+  errors out b/c it internally doesn't support it. Open up /sbin/MAKEDEV with an
+  editor if in doubt.
+
   10 Dec 2003; Martin Schlemmer <azarah@gentoo.org>
   baselayout-1.8.6.12-r2.ebuild:
   Update selinux check.
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 3b2bfe2feb4c..cf8e409cc532 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,12 +1,12 @@
-MD5 a376a9183f575cae744a22be561de340 baselayout-1.8.6.8-r1.ebuild 19092
+MD5 3fcbb5379ffd0358e2d9ab0240975d90 ChangeLog 20515
 MD5 08d4f1d2390a81d1e05097a2d2d2af9d baselayout-1.8.5.9.ebuild 15442
-MD5 c457d23a83e5fe95e018b99f2ee2741d baselayout-1.8.6.10-r1.ebuild 19801
-MD5 097f365d1dc0100743b08dd9bdf24296 ChangeLog 20034
-MD5 18385b13db891d652e93305d45dab644 baselayout-1.8.6.12-r2.ebuild 20064
+MD5 62f66f046bf92d519b97ddd5a56ba683 baselayout-1.8.6.10-r1.ebuild 19920
+MD5 cbcf56e2c657088eaad0c42dcf427a50 baselayout-1.8.6.8-r1.ebuild 19211
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138
+MD5 b543be37b46351d69116d99bd947056a baselayout-1.8.6.12-r2.ebuild 20390
 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397
-MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 791058728d722586ebd7f7d93efac22f files/digest-baselayout-1.8.5.9 134
+MD5 bb6604678d6809a4f172fe1cdc83e5b7 files/digest-baselayout-1.8.6.10-r1 137
 MD5 a6c521e030d8c87b9617f701fa1ec0f8 files/digest-baselayout-1.8.6.8-r1 136
+MD5 7b092a4e266a2781970fa2d6b40c06a7 files/digest-baselayout-1.8.6.12-r2 138
diff --git a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
index 21ed00027533..81b05ad5e8f1 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.10-r1.ebuild,v 1.11 2003/11/11 22:33:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10-r1.ebuild,v 1.12 2003/12/14 20:22:02 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -510,6 +510,10 @@ pkg_postinst() {
 		einfo "Making device nodes (this could take a minute or so...)"
 
 		case ${ARCH} in
+			amd64)
+				einfo "Using generic-i386 to make amd64 device nodes..."
+				${ROOT}/sbin/MAKEDEV generic-i386
+				;;
 			x86)
 				einfo "Using generic-i386 to make device nodes..."
 				${ROOT}/sbin/MAKEDEV generic-i386
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 2828b8b472a9..f47c357f00e6 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-2003 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.3 2003/12/10 21:02:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.12-r2.ebuild,v 1.4 2003/12/14 20:22:02 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -162,6 +162,14 @@ create_dev_nodes() {
 	export PATH="${D}/sbin:${PATH}"
 
 	case ${ARCH} in
+		amd64)
+			# 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
+			einfo "Using generic-i386 to make amd64 device nodes..."
+			${D}/sbin/MAKEDEV generic-i386
+			;;
 		x86)
 			einfo "Using generic-i386 to make device nodes..."
 			${D}/sbin/MAKEDEV generic-i386
diff --git a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
index 70ee41b13c27..94a1e653f7fc 100644
--- a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.8-r1.ebuild,v 1.16 2003/10/14 21:24:59 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.17 2003/12/14 20:22:02 brad_mssw Exp $
 
 # This ebuild needs to be merged "live".  You can't simply make a package
 # of it and merge it later.
@@ -496,6 +496,10 @@ pkg_postinst() {
 		einfo "Making device nodes (this could take a minute or so...)"
 
 		case ${ARCH} in
+			amd64)
+				einfo "Using generic-i386 to make amd64 device nodes..."
+				${ROOT}/sbin/MAKEDEV generic-i386
+				;;
 			x86)
 				einfo "Using generic-i386 to make device nodes..."
 				${ROOT}/sbin/MAKEDEV generic-i386