commit: 78d1b3055c943557530c660243ad9dbfc0a892c5 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Mar 31 03:23:08 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Mar 31 03:54:44 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=78d1b305
catalyst: Drop gamecd target Evidently this was a target last used 15 years ago to produce a Gentoo LiveCD ISO with *a* game on it. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/targets/livecd_stage2.py | 2 +- doc/catalyst-spec.5.txt | 20 +++++------------ examples/gamecd.conf.example | 6 ----- examples/livecd-stage2_template.spec | 17 ++++---------- examples/stage4_template.spec | 8 +++---- targets/livecd-stage2/controller.sh | 16 +------------- targets/support/livecdfs-update.sh | 43 ++++-------------------------------- 7 files changed, 20 insertions(+), 92 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 18810667..454dbab3 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -25,7 +25,7 @@ class livecd_stage2(StageBase): "livecd/rcdel","livecd/fsscript","livecd/xinitrc",\ "livecd/root_overlay","livecd/users","portage_overlay",\ "livecd/fstype","livecd/fsops","livecd/linuxrc","livecd/bootargs",\ - "gamecd/conf","livecd/xdm","livecd/xsession","livecd/volid","livecd/verify"]) + "livecd/xdm","livecd/xsession","livecd/volid","livecd/verify"]) StageBase.__init__(self,spec,addlargs) if "livecd/type" not in self.settings: diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index ecea9ba7..03fdeecc 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -111,7 +111,6 @@ explained below. `gentoo-release-minimal`;; This creates an official minimal InstallCD. `gentoo-release-universal`;; This creates an official universal InstallCD. `gentoo-release-livecd`;; This creates an official LiveCD environment. - `gentoo-gamecd`;; This creates an official Gentoo GameCD. `generic-livecd`;; This should be used for all non-official media. This setting is supported by the livecd targets. @@ -431,13 +430,12 @@ available if `docache` is enabled, as they are outside the loop. *<target>/xinitrc*:: This is used by catalyst to copy the specified file to `/etc/X11/xinit/xinitrc` and is used by the *<target>/type* -`gentoo-gamecd` and `generic-livecd`. While the file will still be -copied for any *<target>/type*, catalyst will only create the -necessary `/etc/startx` for those types, so X will not be -automatically started. This is useful also for setting up X on a CD -where you do not wish X to start automatically. We do not use this on -the release media. This setting is supported by the `stage4` and -`livecd` targets. +`generic-livecd`. While the file will still be copied for any +*<target>/type*, catalyst will only create the necessary `/etc/startx` +for those types, so X will not be automatically started. This is +useful also for setting up X on a CD where you do not wish X to start +automatically. We do not use this on the release media. This setting +is supported by the `stage4` and `livecd` targets. *livecd/xdm*:: This is used by catalyst to determine which display manager you wish @@ -470,12 +468,6 @@ and is very useful in cleaning up stray files in `/etc` left over after *stage4/unmerge* (example: `/lib/*.a /usr/lib/*.a`). This setting is supported by the `stage4` and `livecd` targets. -*gamecd/conf*:: -This option is only used when creating a GameCD. This specifies the -file that contains the definitions for `GAME_NAME` and -`GAME_EXECUTABLE`, which are used by the GameCD scripts to set some -specific options for the game. This is not used on the release media. - FILES ----- Example specfiles can be found in '/usr/share/doc/catalyst-{catalystversion}/examples'. diff --git a/examples/gamecd.conf.example b/examples/gamecd.conf.example deleted file mode 100644 index 955eac4e..00000000 --- a/examples/gamecd.conf.example +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# these variables are to be used for creating the menu entry and also to tell -# the CD what to execute once X starts -GAME_NAME="Unreal Tournament 2004 Demo" -GAME_EXECUTABLE="/usr/games/bin/ut2004-demo" diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index 0c45bd67..7398c972 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -156,7 +156,6 @@ livecd/linuxrc: # gentoo-release-minimal - This creates an official minimal InstallCD. # gentoo-release-universal - This creates an official universal InstallCD. # gentoo-release-livecd - This creates an official LiveCD environment. -# gentoo-gamecd - This creates an official Gentoo GameCD. # generic-livecd - This should be used for all non-official media. # example: # livecd/type: gentoo-release-minimal @@ -223,10 +222,10 @@ livecd/overlay: livecd/root_overlay: # This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc -# and is used by the livecd/type gentoo-gamecd and generic-livecd. While the -# file will still be copied for any livecd/type, catalyst will only create the -# necessary /etc/startx for those types, so X will not be automatically started. -# This is useful also for setting up X on a CD where you do not wish X to start +# and is used by the livecd/type and generic-livecd. While the file will still +# be copied for any livecd/type, catalyst will only create the necessary +# /etc/startx for those types, so X will not be automatically started. This is +# useful also for setting up X on a CD where you do not wish X to start # automatically. We do not use this on the release media, so it is left blank. # example: # livecd/xinitrc: @@ -260,14 +259,6 @@ livecd/users: # livecd/volid: Gentoo Linux 2006.1 X86 livecd/volid: -# This option is only used when creating a GameCD. This specifies the file that -# contains the definitions for GAME_NAME and GAME_EXECUTABLE, which are used by -# the GameCD scripts to set some specific options for the game. This is not -# used on the release media, and is therefore blank. -# example: -# gamecd/conf: -gamecd/conf: - # This option is used to specify the number of kernels to build and also the # labels that will be used by the CD bootloader to refer to each kernel image. # example: diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index f3531f90..75e8669f 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -174,10 +174,10 @@ stage4/rcdel: stage4/root_overlay: # This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc -# and is used by the stage4/type gentoo-gamecd and generic-livecd. While the -# file will still be copied for any stage4/type, catalyst will only create the -# necessary /etc/startx for those types, so X will not be automatically started. -# This is useful also for setting up X on a CD where you do not wish X to start +# and is used by the stage4/type generic-livecd. While the file will still be +# copied for any stage4/type, catalyst will only create the necessary +# /etc/startx for those types, so X will not be automatically started. This is +# useful also for setting up X on a CD where you do not wish X to start # automatically. We do not use this on the release media, so it is left blank. # example: # stage4/xinitrc: diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh index 5834c837..166d1b0f 100755 --- a/targets/livecd-stage2/controller.sh +++ b/targets/livecd-stage2/controller.sh @@ -46,7 +46,6 @@ case $1 in ${clst_sharedir}/livecd/files/universal.motd.txt \ ${clst_sharedir}/livecd/files/minimal.motd.txt \ ${clst_sharedir}/livecd/files/livecd.motd.txt \ - ${clst_sharedir}/livecd/files/gamecd.motd.txt \ ${clst_chroot_path}/etc ;; *) @@ -64,18 +63,6 @@ case $1 in ${clst_chroot_path}/root/.bash_profile cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start - - # execute copy gamecd.conf if we're a gamecd - if [ "${clst_livecd_type}" = "gentoo-gamecd" ] - then - if [ -n "${clst_gamecd_conf}" ] - then - cp -f ${clst_gamecd_conf} ${clst_chroot_path}/tmp/gamecd.conf - else - echo "gamecd/conf is required for a gamecd!" - exit 1 - fi - fi ;; livecd-update) @@ -101,8 +88,7 @@ case $1 in ;; clean) - if [ "${clst_livecd_type}" = "gentoo-gamecd" ] \ - || [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \ + if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \ || [ "${clst_livecd_type}" = "gentoo-release-universal" ] then # Clean out man, info and doc files diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 2c551b42..2a0a1f72 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -16,14 +16,8 @@ rm -rf /etc/localtime cp /usr/share/zoneinfo/UTC /etc/localtime # Setup the hostname -if [ "${clst_livecd_type}" == "gentoo-gamecd" ] -then - echo 'HOSTNAME="gamecd"' > /etc/conf.d/hostname - echo "127.0.0.1 gamecd.gentoo gamecd localhost" > /etc/hosts -else - echo 'HOSTNAME="livecd"' > /etc/conf.d/hostname - echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts -fi +echo 'HOSTNAME="livecd"' > /etc/conf.d/hostname +echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts # Since we're an official Gentoo release, we do things the official Gentoo way. # As such, we override livecd/users. @@ -32,10 +26,6 @@ case ${clst_livecd_type} in user_comment="Gentoo default user" clst_livecd_users="gentoo" ;; - gentoo-gamecd) - user_comment="Gentoo GameCD default user" - clst_livecd_users="gamecd" - ;; esac # Add any users @@ -187,13 +177,9 @@ case ${clst_livecd_type} in ${clst_sed} -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \ -e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd ;; - gentoo-gamecd) - cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd - ${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd - ;; esac -rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt /etc/gamecd.motd.txt +rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt # Setup splash (if called for) if [ -n "${clst_livecd_splash_theme}" ] @@ -214,34 +200,13 @@ fi # Clear out locales case ${clst_livecd_type} in - gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd) + gentoo-release-minimal|gentoo-release-universal) rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}* ;; esac # Post configuration case ${clst_livecd_type} in - gentoo-gamecd ) - # We grab our configuration - if [ -e /tmp/gamecd.conf ] - then - source /tmp/gamecd.conf || exit 1 - rm /tmp/gamecd.conf - - # Here we replace out game information into several files - ${clst_sed} -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd - - # Here we setup our xinitrc - echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc - fi - - # This is my hack to reduce tmpfs usage - mkdir -p /usr/livecd/db/pkg/x11-base - mv -f /var/db/pkg/x11-base/xorg* /usr/livecd/db/pkg/x11-base - rm -rf /var/db - - touch /etc/startx - ;; gentoo-release-live*) # Setup Gnome theme if [ "${clst_livecd_xsession}" == "gnome" ]