Removed empty gamecdfs-update.sh, updated livecdfs-update.sh to work properly with...

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

diff --git a/ChangeLog b/ChangeLog
index 432444e093687a715066722d36f8688c30ffcb41..8a229f29d47a26797954ca0396b2a697bece0065 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.213 2005/04/08 00:07:06 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.214 2005/04/08 22:39:45 wolf31o2 Exp $
+
+  08 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  examples/gamecd.conf.example, -targets/support/gamecdfs-update.sh,
+  targets/support/livecdfs-update.sh:
+  Removed empty gamecdfs-update.sh, updated livecdfs-update.sh to work
+  properly with hotplug firmwares, and also updated gamecd.conf.example, since
+  the ut2004demo shell script has been renamed to ut2004-demo.
 
   08 Apr 2005; Eric Edgar <rocket@gentoo.org> targets/support/pre-kmerge.sh:
   let genkernel always reinstall itself

diff --git a/examples/gamecd.conf.example b/examples/gamecd.conf.example
index e7c8ef9855373c6e30bf2fbbdf811925caecb812..3c0453933c63724e8610885bab675343e83e911e 100644 (file)
--- a/examples/gamecd.conf.example
+++ b/examples/gamecd.conf.example
@@ -1,9 +1,9 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/examples/gamecd.conf.example,v 1.1 2004/12/16 17:51:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/examples/gamecd.conf.example,v 1.2 2005/04/08 22:39:45 wolf31o2 Exp $
 
 # these variables are to be used for creating the menu entry and also to tell
 # the CD what to execute
 GAME_NAME="Unreal Tournament 2004 Demo"
-GAME_EXECUTABLE="/usr/games/bin/ut2004demo"
+GAME_EXECUTABLE="/usr/games/bin/ut2004-demo"

diff --git a/targets/support/gamecdfs-update.sh b/targets/support/gamecdfs-update.sh
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index ac2b558ec36a124cd56042265d56f326dba95d92..7aacdc15b449f286c0072f467d0b4acdc4abe468 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/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/targets/support/livecdfs-update.sh,v 1.5 2005/04/07 23:02:20 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.6 2005/04/08 22:39:45 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -230,6 +230,7 @@ then
        tar cvjpf /lib/firmware.tar.bz2 .
        rm -f /lib/firmware/*
        mkdir -p /usr/lib/hotplug
+       rm -rf /usr/lib/hotplug/firmware
        ln -sf /lib/firmware /usr/lib/hotplug/firmware
 fi