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

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 5426469f169318befe0c73a594eac7440483254c..4ab9c65ad572104acd2e19d12b3d69fbe0ba6d6c 100644 (file)
--- 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/Manifest b/sys-apps/baselayout/Manifest
index 64097c58e598653fe9c5fe627dd39bff7f545e2a..66b257ac00489f78cb8b24f5a12d428b743fb2db 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 SHA1 f61b8f985a27dc9f2dd834001602b008030e79ce SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a
 MD5 dff93a6f0914f6969d21482d2f36e75e files/baselayout-1.11.14-man.patch 768
 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 files/baselayout-1.11.14-man.patch 768
@@ -92,10 +95,10 @@ EBUILD baselayout-1.12.8-r1.ebuild 17220 RMD160 c9396e0da6d59e99438f3ef1c5df33d2
 MD5 65cff3b923fddb76573fdf804d315e80 baselayout-1.12.8-r1.ebuild 17220
 RMD160 c9396e0da6d59e99438f3ef1c5df33d23881be9f baselayout-1.12.8-r1.ebuild 17220
 SHA256 d63c5069bf6a0f89104c1203582da6d9978d31ffa02845fa0e403d02ef3ef77d baselayout-1.12.8-r1.ebuild 17220
-EBUILD baselayout-1.12.8-r2.ebuild 17470 RMD160 fa1e64fd299e16f6a0281a468d72cdba4cdc54a1 SHA1 0d014b5951d0ef8772b4d23e384ad7facca7ad96 SHA256 f4a0ace6d2860add38b659053c2989f6eabaa7d974a9ad1f396692feb1205bff
-MD5 ec7535105e3b1c8e7971025c28dbf780 baselayout-1.12.8-r2.ebuild 17470
-RMD160 fa1e64fd299e16f6a0281a468d72cdba4cdc54a1 baselayout-1.12.8-r2.ebuild 17470
-SHA256 f4a0ace6d2860add38b659053c2989f6eabaa7d974a9ad1f396692feb1205bff baselayout-1.12.8-r2.ebuild 17470
+EBUILD baselayout-1.12.8-r2.ebuild 18734 RMD160 c447e590e80aedc168e9750ec32a8c32d82d60c1 SHA1 9023d38c491b435cf8d3540dbeae557f69e88456 SHA256 084043ca3edeff86583ebe01f7cf65de9d707d5c4ffc6cfdc02db80171e33da9
+MD5 9fa7e1eba8bd5dedc6912353cd9a82c3 baselayout-1.12.8-r2.ebuild 18734
+RMD160 c447e590e80aedc168e9750ec32a8c32d82d60c1 baselayout-1.12.8-r2.ebuild 18734
+SHA256 084043ca3edeff86583ebe01f7cf65de9d707d5c4ffc6cfdc02db80171e33da9 baselayout-1.12.8-r2.ebuild 18734
 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
@@ -112,10 +115,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 87326 RMD160 26fd838dc1d8928e24e14d410f591e03a52f5269 SHA1 751224a3ee031a603460ca03f7390af7fb38d82f SHA256 a9a958ffe86fd4a48dbdcb6e6aeb0db17ec26977f94fcf1318a74a182c5d905b
-MD5 145cd4e393689c7954429ebad891e6bd ChangeLog 87326
-RMD160 26fd838dc1d8928e24e14d410f591e03a52f5269 ChangeLog 87326
-SHA256 a9a958ffe86fd4a48dbdcb6e6aeb0db17ec26977f94fcf1318a74a182c5d905b ChangeLog 87326
+MISC ChangeLog 87487 RMD160 1a8b615d08f4d31f5ff2a1d8174aac9182d9e7fb SHA1 095a1b561e163e190c83a8618207e62748d75ce2 SHA256 48c820451c13204f7aa35751b1689cc7f98eee38c1438553ee965f75d13b421d
+MD5 43890fbe8d28465671b8d5baac6346df ChangeLog 87487
+RMD160 1a8b615d08f4d31f5ff2a1d8174aac9182d9e7fb ChangeLog 87487
+SHA256 48c820451c13204f7aa35751b1689cc7f98eee38c1438553ee965f75d13b421d ChangeLog 87487
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -150,3 +153,10 @@ SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/di
 MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10-r2 280
 RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10-r2 280
 SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10-r2 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFotdL8bi6rjpTunYRAgmoAJ4m0+3XUTn8iMfjoJkwGTI+1VbJWgCfZTEL
+Gtc8fMfg3SDPBMWgv2TrPHo=
+=RV3Q
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r2.ebuild
index 5d26b6e1621ada378744d35e65c5c928c770dbf9..f9a24eb651051756bbb2c888909cf1781912d92b 100644 (file)
--- 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.