From a9beca90c322a0e174b5d83da61e1ea6a78cd767 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Thu, 1 May 2008 16:20:16 +0200 Subject: [PATCH] Delete old files, add new ones. --- ...ult.ks => fedora-livecd-desktop-default.ks | 2 +- ...en_US.ks => fedora-livecd-desktop-en_US.ks | 5 +- ...nl_NL.ks => fedora-livecd-desktop-nl_NL.ks | 5 +- ...ive-desktop.ks => fedora-livecd-desktop.ks | 0 fedora-livecd-electronic-lab-nl_NL.ks | 14 ++ fedora-livecd-electronic-lab.ks | 237 ++++++++++++++++++ ...kde-nl_NL.ks => fedora-livecd-kde-nl_NL.ks | 2 +- fedora-live-kde.ks => fedora-livecd-kde.ks | 95 ++++--- ...ce-nl_NL.ks => fedora-livecd-xfce-nl_NL.ks | 0 fedora-live-xfce.ks => fedora-livecd-xfce.ks | 0 fedora-livedvd-developer-nl_NL.ks | 14 ++ fedora-livedvd-developer.ks | 116 +++++++++ fedora-livedvd-games-nl_NL.ks | 14 ++ fedora-livedvd-games.ks | 164 ++++++++++++ fedora-livedvd-kde.ks | 109 ++++++++ 15 files changed, 723 insertions(+), 54 deletions(-) rename fedora-live-desktop-default.ks => fedora-livecd-desktop-default.ks (97%) rename fedora-live-desktop-en_US.ks => fedora-livecd-desktop-en_US.ks (56%) rename fedora-live-desktop-nl_NL.ks => fedora-livecd-desktop-nl_NL.ks (53%) rename fedora-live-desktop.ks => fedora-livecd-desktop.ks (100%) create mode 100644 fedora-livecd-electronic-lab-nl_NL.ks create mode 100644 fedora-livecd-electronic-lab.ks rename fedora-live-kde-nl_NL.ks => fedora-livecd-kde-nl_NL.ks (83%) rename fedora-live-kde.ks => fedora-livecd-kde.ks (54%) rename fedora-live-xfce-nl_NL.ks => fedora-livecd-xfce-nl_NL.ks (100%) rename fedora-live-xfce.ks => fedora-livecd-xfce.ks (100%) create mode 100644 fedora-livedvd-developer-nl_NL.ks create mode 100644 fedora-livedvd-developer.ks create mode 100644 fedora-livedvd-games-nl_NL.ks create mode 100644 fedora-livedvd-games.ks create mode 100644 fedora-livedvd-kde.ks diff --git a/fedora-live-desktop-default.ks b/fedora-livecd-desktop-default.ks similarity index 97% rename from fedora-live-desktop-default.ks rename to fedora-livecd-desktop-default.ks index b71318f..37f745a 100644 --- a/fedora-live-desktop-default.ks +++ b/fedora-livecd-desktop-default.ks @@ -1,6 +1,6 @@ # fedora-live-desktop-en.ks -%include fedora-live-desktop.ks +%include fedora-livecd-desktop.ks lang en_US.UTF-8 keyboard us diff --git a/fedora-live-desktop-en_US.ks b/fedora-livecd-desktop-en_US.ks similarity index 56% rename from fedora-live-desktop-en_US.ks rename to fedora-livecd-desktop-en_US.ks index bd35367..8c70d4d 100644 --- a/fedora-live-desktop-en_US.ks +++ b/fedora-livecd-desktop-en_US.ks @@ -1,6 +1,9 @@ # fedora-live-desktop-en_US.ks +# +# Maintainer(s): +# - UNKNOWN -%include fedora-live-desktop.ks +%include fedora-livecd-desktop.ks lang en_US.UTF-8 keyboard us diff --git a/fedora-live-desktop-nl_NL.ks b/fedora-livecd-desktop-nl_NL.ks similarity index 53% rename from fedora-live-desktop-nl_NL.ks rename to fedora-livecd-desktop-nl_NL.ks index 6a6b1e5..a75b724 100644 --- a/fedora-live-desktop-nl_NL.ks +++ b/fedora-livecd-desktop-nl_NL.ks @@ -1,6 +1,9 @@ # fedora-live-desktop-nl_NL.ks +# +# Maintainer(s): +# - Jeroen van Meeuwen -%include fedora-live-desktop.ks +%include fedora-livecd-desktop.ks lang nl_NL.UTF-8 keyboard us diff --git a/fedora-live-desktop.ks b/fedora-livecd-desktop.ks similarity index 100% rename from fedora-live-desktop.ks rename to fedora-livecd-desktop.ks diff --git a/fedora-livecd-electronic-lab-nl_NL.ks b/fedora-livecd-electronic-lab-nl_NL.ks new file mode 100644 index 0000000..8435631 --- /dev/null +++ b/fedora-livecd-electronic-lab-nl_NL.ks @@ -0,0 +1,14 @@ +# fedora-live-electronic-lab-nl_NL.ks +# +# Maintainer(s): +# - Jeroen van Meeuwen + +%include fedora-live-electronic-lab.ks + +lang nl_NL +keyboard us +timezone Europe/Amsterdam + +%packages +@dutch-support +%end \ No newline at end of file diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks new file mode 100644 index 0000000..3488c67 --- /dev/null +++ b/fedora-livecd-electronic-lab.ks @@ -0,0 +1,237 @@ +# Description : Live image for Fedora Electronic Lab +# last updated: 10 October 2007 + +%include fedora-live-base.ks + +%packages +# KDE basic packages +kdebase +kde-filesystem +kdelibs +kdenetwork +kdegraphics +kdeutils +knetworkmanager +kde-settings +kmenu-gnome +kdesvn +yakuake +# include default fedora wallpaper +desktop-backgrounds-basic +wget + +# some projects based on ghdl and gtkwave needs +zlib-devel + +#project management +vym +koffice-kspread +koffice-kword +koffice-kplato +koffice-filters + +# some other extra packages +ntfsprogs +ntfs-3g +synaptics +setroubleshoot +smolt +smolt-firstboot +syslinux +gnupg +hal-cups-utils + +# we don't want these +-dos2unix +-firefox +-authconfig-gtk +-PolicyKit-gnome +-gnome-doc-utils-stylesheets + +# ignore comps.xml and make sure these packages are included +kpowersave +rhgb + + +#vlsi +alliance-doc +irsim +gds2pov +magic-doc +toped +xcircuit +qucs +netgen + +#Hardware Description Languages +gtkwave +iverilog +drawtiming +ghdl +freehdl + +#spice +ngspice +gnucap +#gspiceui +#gwave + +#PCB and schematics +geda-gschem +geda-examples +geda-gsymcheck +geda-gattrib +geda-utils +geda-docs +geda-gnetlist +gerbv +gresistor +kicad +pcb + +#Micro Programming +piklab +ktechlab +pikloops +sdcc + +# Serial Port Terminals +gtkterm +picocom +minicom + +#embedded +arm-gp2x-linux* +avr-* +avrdude +dfu-programmer +avarice +uisp + +#computing +octave + +%end + +%post + +###### Fedora Electronic Lab #################################################### + +# Fedora Electronic Lab: Kwin buttons +cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc < /usr/share/kde-settings/kde-profile/default/share/config/klipperrc < /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc < /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc < /etc/sysconfig/desktop <> /etc/rc.d/init.d/fedora-live << EOF + +if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then + # use image also for kdm + mkdir -p /usr/share/apps/kdm/faces + cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon +fi + +# make fedora user use KDE +echo "startkde" > /home/fedora/.xsession +chmod a+x /home/fedora/.xsession +chown fedora:fedora /home/fedora/.xsession + +# set up autologin for user fedora +sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc +sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc + +# set up user fedora as default user and preselected user +sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc +sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc + +# disable screensaver +sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc + +# workaround to put liveinst on desktop and in menu +sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop +EOF + +# and set up gnome-keyring to startup/shutdown in kde +mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown +cat > /etc/skel/.kde/env/start-custom.sh << EOF +#!/bin/sh +eval \`gnome-keyring-daemon\` +export GNOME_KEYRING_PID +export GNOME_KEYRING_SOCKET +EOF +chmod 755 /etc/skel/.kde/env/start-custom.sh + +cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF +#/bin/sh +if [-n "$GNOME_KEYRING_PID"];then +kill $GNOME_KEYRING_PID +fi +EOF +chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh + +###### Fedora Electronic Lab #################################################### + +# FEL doesn't need these and boots slowly +/sbin/chkconfig --del anacron +/sbin/chkconfig --del sendmail +/sbin/chkconfig --del nfs +/sbin/chkconfig --del nfslock +/sbin/chkconfig --del rpcidmapd +/sbin/chkconfig --del rpcbind + +%end + diff --git a/fedora-live-kde-nl_NL.ks b/fedora-livecd-kde-nl_NL.ks similarity index 83% rename from fedora-live-kde-nl_NL.ks rename to fedora-livecd-kde-nl_NL.ks index f862b49..cd6221c 100644 --- a/fedora-live-kde-nl_NL.ks +++ b/fedora-livecd-kde-nl_NL.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Jeroen van Meeuwen -%include fedora-live-kde.ks +%include fedora-livecd-kde.ks lang nl_NL keyboard us diff --git a/fedora-live-kde.ks b/fedora-livecd-kde.ks similarity index 54% rename from fedora-live-kde.ks rename to fedora-livecd-kde.ks index b38df5d..eae5d7b 100644 --- a/fedora-live-kde.ks +++ b/fedora-livecd-kde.ks @@ -1,69 +1,63 @@ -%include fedora-live-base.ks +%include livecd-fedora-base-desktop.ks %packages @kde-desktop -kdegames -k3b + +# include nm-applet directly +NetworkManager-gnome + +# unwanted packages from @kde-desktop +# don't include these for now to fit on a cd +# digikam (~11 megs), ktorrent (~3 megs), amarok (~14 megs), +# kdegames (~23 megs) +-amarok +-digikam +-kdeedu +-scribus +#-ktorrent +#-kdegames +#-kftpgrabber* + +# KDE 3 koffice-kword koffice-kspread koffice-kpresenter koffice-filters -twinkle +k3b filelight -krusader +# twinkle (~10 megs) +#twinkle +# some extras +fuse -# if it is enough space include koffice-krita (~40 megs) -koffice-krita - -# some other extra packages -gnupg -synaptics -hal-cups-utils -nss-mdns - -# ignore comps.xml and make sure these packages are included -kpowersave -rhgb -man-pages -smolt-firstboot -knetworkmanager - -#some changes that we don't want... --specspo --scribus --kdeaddons --kdemultimedia-extras --kdeartwork-extras --kmymoney2 --basket --speedcrunch --autofs +# additional fonts +@fonts +fonts-ISO8859-2 +#cjkunifonts-ukai +madan-fonts +fonts-KOI8-R +fonts-KOI8-R-100dpi +tibetan-machine-uni-fonts +# FIXME/TODO: recheck the removals here # try to remove some packages from livecd-fedora-base-desktop.ks --scim* -gdm -authconfig-gtk --m17n* --PolicyKit-gnome --gnome-doc-utils-stylesheets --anthy --kasumi --pygtkglext --python-devel --libchewing -# workaround for the moment (requirements of hplip) -python-imaging -python-reportlab +# save some space (from @base) +-make +-nss_db +-autofs %end %post + # create /etc/sysconfig/desktop (needed for installation) cat > /etc/sysconfig/desktop < /home/fedora/.kde/share/config/kickoffrc << MENU_EOF +[Favorites] +FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop +MENU_EOF +chown -R fedora:fedora /home/fedora/.kde/ %end diff --git a/fedora-live-xfce-nl_NL.ks b/fedora-livecd-xfce-nl_NL.ks similarity index 100% rename from fedora-live-xfce-nl_NL.ks rename to fedora-livecd-xfce-nl_NL.ks diff --git a/fedora-live-xfce.ks b/fedora-livecd-xfce.ks similarity index 100% rename from fedora-live-xfce.ks rename to fedora-livecd-xfce.ks diff --git a/fedora-livedvd-developer-nl_NL.ks b/fedora-livedvd-developer-nl_NL.ks new file mode 100644 index 0000000..71caa48 --- /dev/null +++ b/fedora-livedvd-developer-nl_NL.ks @@ -0,0 +1,14 @@ +# fedora-live-developer-nl_NL.ks +# +# Maintainer(s): +# - Jeroen van Meeuwen + +%include fedora-livedvd-developer.ks + +lang nl_NL +keyboard us +timezone Europe/Amsterdam + +%packages +@dutch-support +%end \ No newline at end of file diff --git a/fedora-livedvd-developer.ks b/fedora-livedvd-developer.ks new file mode 100644 index 0000000..60ff68a --- /dev/null +++ b/fedora-livedvd-developer.ks @@ -0,0 +1,116 @@ +%include fedora-live-base.ks + +part / --size 6000 + +%packages --ignoremissing +# Libraries +@development-libs +@gnome-software-development +@java-development + +# SCM tools +bazaar +bzr +cogito +cvs2cl +cvsutils +git +mercurial +monotone +quilt + +# IDEs +@eclipse +anjuta +anjuta-docs +codeblocks +pida + +# General developer tools +@authoring-and-publishing +@development-tools +@editors +@system-tools +@virtualization +ElectricFence +alleyoop +crash +dejagnu +dogtail +elfutils-devel +emacs +emacs-el +expect +frysk-gnome +gconf-editor +gettext-devel +gnuplot +hexedit +inkscape +intltool +lynx +maven2 +mutt +scons +sharutils +socat +sox +sysprof +tcp_wrappers-devel +tcsh +texi2html +xchat + +# RPM/Fedora-specific tools +@buildsys-build +createrepo +koji +livecd-tools +mock +rpmdevtools +rpmlint + +eclipse-demos + +# Should we? +#@sql-server +#@mysql +#@ruby +#@web-development +#@x-software-development +# I think this is going to be too big on x86_64 +#*-devel +%end + +%post +# Enable debuginfo repository (useful for frysk, gdb, etc.) +awk ' +BEGIN { + debuginfo = 0 +} + /^\[.*\]/ { + if (/debuginfo/) { + debuginfo = 1 + } else { + debuginfo = 0 + } + print + next +} + /enabled=0/ && debuginfo { + print "enabled=1" + next +} +{ + print + next +}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp +mv /etc/yum.repos.d/fedora.repo{.tmp,} + +cat >> /etc/rc.d/init.d/fedora-live << EOF +# Put link to demonstration videos on the desktop +pushd /home/fedora/Desktop +ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos" +popd +EOF +%end diff --git a/fedora-livedvd-games-nl_NL.ks b/fedora-livedvd-games-nl_NL.ks new file mode 100644 index 0000000..b415c64 --- /dev/null +++ b/fedora-livedvd-games-nl_NL.ks @@ -0,0 +1,14 @@ +# fedora-live-games-nl_NL.ks +# +# Maintainer(s): +# - Jeroen van Meeuwen + +%include fedora-livedvd-games.ks + +lang nl_NL +keyboard us +timezone Europe/Amsterdam + +%packages +@dutch-support +%end diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks new file mode 100644 index 0000000..49ceb73 --- /dev/null +++ b/fedora-livedvd-games.ks @@ -0,0 +1,164 @@ +%include fedora-live-base.ks +part / --size 8000 + +# customize repo configuration for local builds +# repo --name=development --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch + + +%packages --ignoremissing + +# games + +# traditional (big) + +abuse +alienarena +armacycles-ad +asc +asc-music +astromenace +beneath-a-steel-sky-cd +blobAndConquer +boswars +bzflag +#croquet (pending) +crossfire-client +egoboo +FlightGear +flight-of-the-amazon-queen-cd +freeciv +freecol +freedoom +freedroidrpg +frozen-bubble +gl-117 +lincity-ng +manaworld +maniadrive +maniadrive-music +nethack-vultures +neverball +nexuiz +openarena +pinball +scorched3d +supertux +supertuxkart +torcs +tremulous +#vdrift +vegastrike +warzone2100 +wesnoth +widelands +worminator +wormux +xpilot-ng + +# traditional (small) + +ballz +blobwars +bombardier +bsd-games +clanbomber +gnubg +gnugo +hedgewars +liquidwar +londonlaw +machineball +nazghul-haxima +nethack +openlierox +quake3 +quake3-demo +quarry +Ri-li +rogue +rott-shareware +scorchwentbonkers +seahorse-adventures +stormbaancoureur +ularn +urbanterror +vavoom +worldofpadman + +# arcade classics(ish) (big) + +auriferous +duel3 +lmarbles +raidem +raidem-music +trackballs +trackballs-music +uqm +uqm-content-3domusic +uqm-content-voice + +# arcade classics(ish) (small) + +ballbuster +dd2 +KoboDeluxe +lacewing +Maelstrom +methane +njam +seahorse-adventures +shippy +tecnoballz +#(xgalaga renamed) +xgalaxy +zasx + +# falling blocks games (small) + +crack-attack +crystal-stacker +fbg +gemdropx +gweled + +# puzzles (big) +enigma +fillets-ng +pingus + +# puzzles (small) + +escape +magicor +mirrormagic +pychess +rocksndiamonds + +# card games + +poker2d + +# educational/simulation + +bygfoot +celestia +childsplay +gcompris +stellarium +tuxpaint +tuxpaint-stamps +tuxtype2 + +# kde based games +ksirk +poker2d-kde +taxipilot + +# utilities + +dosbox +games-menus +wget + +%end diff --git a/fedora-livedvd-kde.ks b/fedora-livedvd-kde.ks new file mode 100644 index 0000000..956cc4d --- /dev/null +++ b/fedora-livedvd-kde.ks @@ -0,0 +1,109 @@ +%include livecd-fedora-kde.ks + +%packages + +# add full language support +@afrikaans-support +@albanian-support +@arabic-support +@armenian-support +@assamese-support +@basque-support +@belarusian-support +@bengali-support +@bhutanese-support +@bosnian-support +@brazilian-support +@breton-support +@british-support +@bulgarian-support +@catalan-support +@chinese-support +@croatian-support +@czech-support +@danish-support +@dutch-support +@estonian-support +@ethiopic-support +@faeroese-support +@filipino-support +@finnish-support +@french-support +@gaelic-support +@galician-support +@georgian-support +@german-support +@greek-support +@gujarati-support +@hebrew-support +@hindi-support +@hungarian-support +@icelandic-support +@indonesian-support +@inuktitut-support +@irish-support +@italian-support +@japanese-support +@kannada-support +@khmer-support +@korean-support +@lao-support +@latvian-support +@lithuanian-support +@malay-support +@malayalam-support +@maori-support +@marathi-support +@northern-sotho-support +@norwegian-support +@oriya-support +@persian-support +@polish-support +@portuguese-support +@punjabi-support +@romanian-support +@russian-support +@samoan-support +@serbian-support +@sinhala-support +@slovak-support +@slovenian-support +@somali-support +@southern-ndebele-support +@southern-sotho-support +@spanish-support +@swati-support +@swedish-support +@tagalog-support +@tamil-support +@telugu-support +@thai-support +@tibetan-support +@tonga-support +@tsonga-support +@tswana-support +@turkish-support +@ukrainian-support +@urdu-support +@venda-support +@vietnamese-support +@welsh-support +@xhosa-support +@zulu-support + +# and some extra packages +koffice-* + +%end + +%post + +# Use gdm here for language selection + +# create /etc/sysconfig/desktop (needed for installation) +cat > /etc/sysconfig/desktop <