Fixing gpm support by uncommenting default settings. Fixing case where boot/kernel...

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

diff --git a/ChangeLog b/ChangeLog
index 36d8b036838eb3dba1cc333cc384869728ea215e..dd8f464ddb06d9dbc554fae4fb790df9974f5949 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.101 2004/10/19 04:09:13 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.102 2004/10/21 17:06:21 wolf31o2 Exp $
+
+  21 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  livecd/runscript/sparc-archscript.sh,
+  livecd/runscript/sparc64-archscript.sh,
+  livecd/runscript-support/kmerge.sh,
+  livecd/runscript-support/livecdfs-update.sh, modules/catalyst_support.py:
+  Fixing gpm support by uncommenting default settings. Fixing case where
+  boot/kernel/$kname/packages or boot/kernel/$kname/postconf were empty.
+  Changing sparc kernel files from kernel* to kernel-* so kernel.msg does
+  not get renamed. Fixed a problem where we were accidentally removing the
+  hwdata-knoppix versions of pci.ids and usb.ids and linking
+  /usr/share/misc/*.ids to non-existent files. This should hopefully be it
+  for 2004.3 and catalyst 1.1.0.
 
   19 Oct 2004; John Davis <zhen@gentoo.org> arch/ia64.py:
   patch from vapier@gentoo.org for bug #68080

diff --git a/catalyst b/catalyst
index 341fc6972072e3acecaffc269f329a7f1498b855..4226650a1c7b3a40e04396dd048837fe0fc33ea0 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.51 2004/10/19 04:06:35 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.52 2004/10/21 17:06:21 wolf31o2 Exp $
 
 # Maintained in full by John Davis <zhen@gentoo.org>
 
@@ -95,6 +95,10 @@ def parse_config(myconfig):
        if "pkgcache" in string.split(conf_values["options"]):
                print "Package cache support enabled."
                conf_values["PKGCACHE"]="1"
+
+       if "kerncache" in string.split(conf_values["options"]):
+               print "Kernel cache support enabled."
+               conf_values["KERNCACHE"]="1"
        
        if "distcc" in string.split(conf_values["options"]):
                print "Distcc support enabled."

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index b48f4e067be1ef9609e383b18847837de417b868..076e63999c2b71acf893584a0d688abd78215c25 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.16 2004/10/19 04:06:35 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.17 2004/10/21 17:06:21 wolf31o2 Exp $
 
 die() {
        echo "$1"
@@ -34,6 +34,18 @@ build_kernel() {
                do
                        clst_kernel_postconf="${clst_kernel_postconf} ${x}"
                done
+               GK_ARGS="${GK_ARGS} --postconf=\"${clst_kernel_postconf}\""
+       fi
+
+       if [ -e "/var/tmp/${clst_kname}.packages" ]
+       then
+               for x in $( cat /var/tmp/${clst_kname}.packages )
+               do
+                       # we don't want to use the pkgcache for these since the results
+                       # are kernel-dependent.
+                       clst_kernel_merge="${clst_kernel_merge} ${x}"
+               done
+               GK_ARGS="${GK_ARGS} --callback=\"${clst_kernel_merge}\""
        fi
        
        if [ "${clst_livecd_devmanager}" == "udev" ]
@@ -43,11 +55,10 @@ build_kernel() {
        
        # build with genkernel using the set options
        # callback is put here to avoid escaping issues
-       genkernel ${GK_ARGS} --callback="emerge ${clst_kernel_merge}" \
-       --postconf="emerge ${clst_kernel_postconf}" || exit 1
+       genkernel ${GK_ARGS} || exit 1
        
        # pack up the modules for resuming
-       if [ -n "${clst_PKGCACHE}" ]
+       if [ -n "${clst_KERNCACHE}" ]
        then
                tar cjpf /usr/portage/packages/gk_binaries/${1}-modules-${clst_version_stamp}.tar.bz2 \
                        /lib/modules/"${1}" || die "Could not package kernel modules, exiting"
@@ -95,17 +106,6 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
-# now we merge any kernel-dependent packages
-if [ -e "/var/tmp/${clst_kname}.packages" ]
-then
-       for x in $( cat /var/tmp/${clst_kname}.packages )
-       do
-               # we don't want to use the pkgcache for these since the results
-               # are kernel-dependent.
-               clst_kernel_merge="${clst_kernel_merge} ${x}"
-       done
-fi
-
 # kernel building happens here
 # does the old config exist? if it does not, we build by default
 if [ -e "/usr/portage/packages/gk_binaries/${clst_kname}-${clst_version_stamp}.config" ]
@@ -113,7 +113,7 @@ then
        # test to see if the kernel .configs are the same, if so, then we skip kernel building
        test1=$(md5sum /var/tmp/${clst_kname}.config | cut -d " " -f 1)
        test2=$(md5sum /usr/portage/packages/gk_binaries/${clst_kname}-${clst_version_stamp}.config | cut -d " " -f 1)
-       if [ "${test1}" == "${test2}" -a -n "${clst_PKGCACHE}" ]
+       if [ "${test1}" == "${test2}" -a -n "${clst_KERNCACHE}" ]
        then
                echo
                echo "No kernel configuration change, skipping kernel build..."
@@ -143,4 +143,4 @@ emerge -C ${clst_ksource}
 unset USE
 
 # keep the config around so that we can resume at some point
-[ -n "${clst_PKGCACHE}" ] && cp /var/tmp/${clst_kname}.config /usr/portage/packages/gk_binaries/${clst_kname}-${clst_version_stamp}.config
+[ -n "${clst_KERNCACHE}" ] && cp /var/tmp/${clst_kname}.config /usr/portage/packages/gk_binaries/${clst_kname}-${clst_version_stamp}.config

diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh
index 54f8ad4aaa486ce956c621a936c33596316e9e32..5704c7197a6615178cbda170efbe4e0829d5b87f 100755 (executable)
--- a/livecd/runscript-support/livecdfs-update.sh
+++ b/livecd/runscript-support/livecdfs-update.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/livecdfs-update.sh,v 1.16 2004/10/19 03:39:36 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.17 2004/10/21 17:06:21 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -54,6 +54,11 @@ cp /usr/share/zoneinfo/GMT /etc/localtime
 echo "livecd" > /etc/hostname
 echo "gentoo" > /etc/dnsdomainname
 
+# gpm fixes
+sed -i -e 's/#MOUSE=imps2/MOUSE=imps2/' \
+       -e 's:#MOUSEDEV=/dev/input/mice:MOUSEDEV=/dev/input/mice:' \
+       /etc/conf.d/gpm
+
 # fstab tweaks
 #sed -i -e '/\/dev\/[RBS]*/ s/^/#/' /etc/fstab
 echo "tmpfs            /       tmpfs   defaults        0 0" >> /etc/fstab
@@ -63,10 +68,10 @@ sed -i -e '/dev-state/ s/^/#/' /etc/devfsd.conf
 # tweak the livecd fstab so that users know not to edit it
 # http://bugs.gentoo.org/show_bug.cgi?id=60887
 mv /etc/fstab /etc/fstab.old
-echo "###############################################" >> /etc/fstab
-echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD" >> /etc/fstab     
-echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab" >> /etc/fstab     
-echo "###############################################" >> /etc/fstab
+echo "####################################################" >> /etc/fstab
+echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD     ##" >> /etc/fstab     
+echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab     
+echo "####################################################" >> /etc/fstab
 cat /etc/fstab.old >> /etc/fstab
 rm /etc/fstab.old
 
@@ -75,14 +80,15 @@ echo "alias ls='ls --color'" >> /etc/profile
 echo "alias mv='mv -i'" >> /etc/profile
 echo "alias pico='nano -w'" >> /etc/profile
 echo "alias rm='rm -i'" >> /etc/profile
+echo "alias grep='grep --color'" >> /etc/profile
 
 # make sure we have the latest pci and hotplug ids
 if [ -d /usr/share/hwdata ]
 then
-       [ -f /usr/share/misc/pci.ids ] && rm -f /usr/share/hwdata/pci.ids
-       [ -f /usr/share/misc/usb.ids ] && rm -f /usr/share/hwdata/usb.ids
-       ln -s /usr/share/misc/pci.ids /usr/share/hwdata/pci.ids
-       ln -s /usr/share/misc/usb.ids /usr/share/hwdata/usb.ids
+       [ -f /usr/share/misc/pci.ids ] && rm -f /usr/share/misc/pci.ids
+       [ -f /usr/share/misc/usb.ids ] && rm -f /usr/share/misc/usb.ids
+       ln -s /usr/share/hwdata/pci.ids /usr/share/misc/pci.ids
+       ln -s /usr/share/hwdata/usb.ids /usr/share/misc/usb.ids
 fi
 
 # tweak the motd for gentoo releases 

diff --git a/livecd/runscript/sparc-archscript.sh b/livecd/runscript/sparc-archscript.sh
index 66b527a08225cd4c2d6b7e3cf01d4ed54cf0fac6..80e531f7bdadcd9cba9ae6f9e6542533377ec27e 100644 (file)
--- a/livecd/runscript/sparc-archscript.sh
+++ b/livecd/runscript/sparc-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/sparc-archscript.sh,v 1.5 2004/10/15 02:40:00 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.6 2004/10/21 17:06:21 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -40,7 +40,7 @@ case $1 in
                        tar xjvf ${kbinary} -C ${clst_cdroot_path}/boot
                        
                        # change kernel name from "kernel" to "gentoo", for example
-                       mv ${clst_cdroot_path}/boot/kernel* ${clst_cdroot_path}/boot/${x}
+                       mv ${clst_cdroot_path}/boot/kernel-* ${clst_cdroot_path}/boot/${x}
                        
                        # change initrd name from "initrd" to "gentoo.igz", for example
                        mv ${clst_cdroot_path}/boot/initrd* ${clst_cdroot_path}/boot/${x}.igz

diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh
index 7e0fd3e9c8f4027e587a517d48f5465eb945b77b..6358e30e7c83b26c09d3790402c4a9ff7687d172 100644 (file)
--- a/livecd/runscript/sparc64-archscript.sh
+++ b/livecd/runscript/sparc64-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/sparc64-archscript.sh,v 1.6 2004/10/15 02:40:00 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.7 2004/10/21 17:06:21 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -40,7 +40,7 @@ case $1 in
                        tar xjvf ${kbinary} -C ${clst_cdroot_path}/boot
                        
                        # change kernel name from "kernel" to "gentoo", for example
-                       mv ${clst_cdroot_path}/boot/kernel* ${clst_cdroot_path}/boot/${x}
+                       mv ${clst_cdroot_path}/boot/kernel-* ${clst_cdroot_path}/boot/${x}
                        
                        # change initrd name from "initrd" to "gentoo.igz", for example
                        mv ${clst_cdroot_path}/boot/initrd* ${clst_cdroot_path}/boot/${x}.igz

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index a48cbb7bb62eb406c3486c446e3d9b093e9612ea..86a47b5f4cda3f9e43d0a634c518f2b5226221e4 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -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/modules/catalyst_support.py,v 1.29 2004/10/15 02:27:58 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.30 2004/10/21 17:06:21 wolf31o2 Exp $
 
 import sys,string,os,types,re
 
@@ -15,6 +15,7 @@ valid_build_targets=["stage1_target","stage2_target","stage3_target","grp_target
 required_config_file_values=["storedir","sharedir","distdir","portdir"]
 valid_config_file_values=required_config_file_values[:]
 valid_config_file_values.append("PKGCACHE")
+valid_config_file_values.append("KERNCACHE")
 valid_config_file_values.append("CCACHE")
 valid_config_file_values.append("DISTCC")
 valid_config_file_values.append("ENVSCRIPT")