Forcing devfs if livecd/dev-manager isn't udev. This should fix building 2.4 kernels.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@533 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 731f313cb5f62042de9a7d37800d48f1e7df7aad..8008b67419bd4e92b8a6ac32916e6093a6aaf007 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.159 2005/01/28 19:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.160 2005/01/28 20:23:05 wolf31o2 Exp $
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript/alpha-archscript.sh, livecd/runscript/x86-archscript.sh,
+  livecd/runscript-support/kmerge.sh:
+  Forcing devfs if livecd/dev-manager isn't udev. This should fix building 2.4
+  kernels.
 
   28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh:

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index ca6b26ea5d62f582251c576d0d78ffecd0bc120c..12b45be09cf600cbe2c7b249bedf9469c3c88041 100755 (executable)
--- a/livecd/runscript-support/kmerge.sh
+++ b/livecd/runscript-support/kmerge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.20 2005/01/11 22:49:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.21 2005/01/28 20:23:05 wolf31o2 Exp $
 
 die() {
        echo "$1"
@@ -52,6 +52,8 @@ build_kernel() {
        if [ "${clst_livecd_devmanager}" == "udev" ]
        then
                GK_ARGS="${GK_ARGS} --udev"
+       else
+               GK_ARGS="${GK_ARGS} --devfs"
        fi
        
        # build with genkernel using the set options

diff --git a/livecd/runscript/alpha-archscript.sh b/livecd/runscript/alpha-archscript.sh
index 8b526caaae07fd9322ec94ac2ab25ca70099de9e..39c36374d443d93a86b9b9c091d2a38a6782283c 100755 (executable)
--- a/livecd/runscript/alpha-archscript.sh
+++ b/livecd/runscript/alpha-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/alpha-archscript.sh,v 1.6 2004/12/12 16:39:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/alpha-archscript.sh,v 1.7 2005/01/28 20:23:05 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -43,6 +43,14 @@ case $1 in
                        mv ${clst_cdroot_path}/boot/initrd* ${clst_cdroot_path}/boot/${x}.igz
                done
 
+               # figure out what device manager we are using and handle it accordingly
+               if [ "${clst_livecd_devmanager}" == "udev" ]
+               then
+                       cmdline_opts="${cmdline_opts} udev nodevfs"
+               else
+                       cmdline_opts="${cmdline_opts} noudev devfs"
+               fi
+
                acfg=${clst_cdroot_path}/etc/aboot.conf
                bctr=0
                for x in ${clst_boot_kernel}

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index db38481a996f20cee8dac1c42ae94e93da1c847f..b92f6c2c345b004fa55d832e1342159562103050 100644 (file)
--- a/livecd/runscript/x86-archscript.sh
+++ b/livecd/runscript/x86-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.20 2005/01/28 19:23:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.21 2005/01/28 20:23:05 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -63,6 +63,8 @@ case $1 in
                if [ "${clst_livecd_devmanager}" == "udev" ]
                then
                        cmdline_opts="${cmdline_opts} udev nodevfs"
+               else
+                       cmdline_opts="${cmdline_opts} noudev devfs"
                fi      
 
                echo "Available kernels:" > ${kmsg}