From 9e256316f0409397fc0554fe92f5650d7df11c77 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 28 Oct 2004 15:05:36 +0000 Subject: [PATCH] Removing auto-keymap from kmerge.sh and moving it to x86-archscript.sh since it is only working properly on amd64 and x86 anyway. Also fixing a typo in genkernel's module_load for x86 during pre-kmerge.sh, which should fix USB loading. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@475 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 10 +++++++++- livecd/runscript-support/kmerge.sh | 3 +-- livecd/runscript-support/pre-kmerge.sh | 5 ++++- livecd/runscript/x86-archscript.sh | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bea31b01..c4e18c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.104 2004/10/22 04:23:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.105 2004/10/28 15:05:36 wolf31o2 Exp $ + + 28 Oct 2004; Chris Gianelloni + livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh, + livecd/runscript-support/pre-kmerge.sh: + Removing auto-keymap from kmerge.sh and moving it to x86-archscript.sh since + it is only working properly on amd64 and x86 anyway. Also fixing a typo in + genkernel's module_load for x86 during pre-kmerge.sh, which should fix USB + loading. 22 Oct 2004; Chris Gianelloni files/catalyst.conf, livecd/runscript-support/kmerge.sh, diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh index 608f8484..faaf86f3 100755 --- 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.18 2004/10/22 04:23:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.19 2004/10/28 15:05:36 wolf31o2 Exp $ die() { echo "$1" @@ -13,7 +13,6 @@ build_kernel() { GK_ARGS="${clst_livecd_gk_mainargs} \ ${clst_livecd_gk_kernargs} \ --kerneldir=/usr/src/linux \ - --do-keymap-auto \ --kernel-config=/var/tmp/${clst_kname}.config \ --minkernpackage=/usr/portage/packages/gk_binaries/${clst_kname}-${clst_version_stamp}.tar.bz2 all" diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh index c0dc40c9..f5b7e024 100755 --- a/livecd/runscript-support/pre-kmerge.sh +++ b/livecd/runscript-support/pre-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/pre-kmerge.sh,v 1.5 2004/10/15 02:41:03 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.6 2004/10/28 15:05:36 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -13,3 +13,6 @@ fi install -d /usr/portage/packages/gk_binaries rm -f /usr/src/linux + +sed -i 's/uchi-hcd/uhci-hcd/' /usr/share/genkernel/x86/modules_load + diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh index 88c45c4a..c4cc1e67 100644 --- 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.14 2004/10/19 03:39:36 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.15 2004/10/28 15:05:36 wolf31o2 Exp $ case $1 in kernel) @@ -79,9 +79,9 @@ case $1 in if [ "${clst_livecd_splash_type}" == "gensplash" -a -n "${clst_livecd_splash_theme}" ] then - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent,theme:${clst_livecd_splash_theme}" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent,theme:${clst_livecd_splash_theme}" >> ${icfg} else - echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 splash=silent" >> ${icfg} + echo " append initrd=${x}.igz root=/dev/ram0 init=/linuxrc acpi=ht ${cmdline_opts} ${custom_kopts} cdroot vga=791 dokeymap splash=silent" >> ${icfg} fi echo >> ${icfg} -- 2.26.2