From 5138977598e9845f53efc8b10e853036e3268fa6 Mon Sep 17 00:00:00 2001 From: chitlesh Date: Mon, 6 Jul 2009 16:12:43 +0200 Subject: [PATCH 01/15] gnome based FEL tested against 06/07/2009's rawhide --- fedora-livedvd-electronic-lab.ks | 89 ++++---------------------------- 1 file changed, 11 insertions(+), 78 deletions(-) diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks index 769af89..d64782f 100644 --- a/fedora-livedvd-electronic-lab.ks +++ b/fedora-livedvd-electronic-lab.ks @@ -4,7 +4,7 @@ # - Chitlesh Goorah # - Thibault North -%include fedora-livecd-kde.ks +%include fedora-livecd-desktop.ks # DVD payload part / --size=8192 @@ -15,33 +15,15 @@ part / --size=8192 # Embedded design -eclipse-cdt +make eclipse-cdt-sdk +#eclipse-eclox eclipse-egit eclipse-epic -eclipse-rcp eclipse-subclipse -doxygen +#eclipse-texlipse splint -# KDE basic packages -kdesvn -kdesdk -yakuake -kdebluetooth - - -# removing useless application from KDE ks --kdegames --koffice-kword --koffice-kspread --koffice-kpresenter --koffice-filters --kdeedu-kstars - -# some projects based on ghdl and gtkwave needs -zlib-devel - # Office dia @@ -52,20 +34,10 @@ openoffice.org-writer2latex openoffice.org-calc openoffice.org-impress openoffice.org-extendedPDF -openoffice.org-ooolatex -kile -tetex-IEEEtran planner graphviz -# some other extra packages -firefox -make -wget -tkcvs - - # debugging tools gdb valgrind @@ -75,60 +47,21 @@ qemu # EDA/CAD department -db4-cxx -db4-tcl perl-Test-Pod perl-Test-Pod-Coverage -# Extra support for compiling SystemC (not fedora compatible) -compat-gcc-34-c++ +# Removing unnecessary packages from the desktop spin +-abiword +-@games +-gimp +-gimp-libs +-gimp-data-extras +-kdebluetooth %end %post -###### Fedora Electronic Lab #################################################### - -# Fedora Electronic Lab: - -cat >> /etc/rc.d/init.d/livesys << EOF - -# kill stupid klipper -cat > /home/liveuser/.kde/share/config/klipperrc < /home/liveuser/.kde/share/config/kxkbrc << KXKBRC_EOF -[Layout] -DisplayNames=us,ch,de,fr -IndicatorOnly=false -LayoutList=us,ch,de,fr -Model=pc104 -Options= -ResetOldOptions=true -ShowFlag=true -ShowSingle=true -SwitchMode=Global -Use=true -KXKBRC_EOF - -chown liveuser:liveuser /home/liveuser/.kde/share/config/kxkbrc - -# Chitlesh doesn't like the KDE icon on the kicker, but fedora's -# icon taken from fedora-logos and applied by kde-settings - -# FEL doesn't need these and boots slowly -/sbin/chkconfig sendmail off 2>/dev/null -/sbin/chkconfig nfs off 2>/dev/null -/sbin/chkconfig nfslock off 2>/dev/null -/sbin/chkconfig rpcidmapd off 2>/dev/null -/sbin/chkconfig rpcbind off 2>/dev/null - -EOF - %end From bbf96e37e0f215baaa9befad21d23dd0805edfef Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 Jul 2009 12:23:56 -0400 Subject: [PATCH 02/15] Not need to exclude tomboy anymore Gnote is now the default in comps anyway. --- fedora-livecd-desktop.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index ed57ff0..c88c5d2 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -47,7 +47,6 @@ festvox-slt-arctic-hts # these pull in excessive dependencies -ekiga --tomboy -f-spot %end From fd836a3354193e05f7b53b5ee3492f83e40d1d6d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 Jul 2009 12:33:05 -0400 Subject: [PATCH 03/15] Exclude man-pages too For some reason man-pages slips through and ends up in F12 spins now. --- fedora-livecd-desktop.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index c88c5d2..0e34d36 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -26,7 +26,7 @@ festvox-slt-arctic-hts # dictionaries are big -aspell-* -hunspell-* --man-pages-* +-man-pages* -words # save some space From cb614b8f4cd45ba79f69b430b48a6f8ff8c864f8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 Jul 2009 14:08:43 -0400 Subject: [PATCH 04/15] Try harder to loose wget --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 0e34d36..fe125d9 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -44,6 +44,7 @@ festvox-slt-arctic-hts -evince-djvu # not needed for gnome -acpid +-wget # these pull in excessive dependencies -ekiga From 6a020e014f1c2b1ed4cd1b19f09538e9986b1ca7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 6 Jul 2009 21:09:51 -0400 Subject: [PATCH 05/15] Add the tomboy exclude back for now When I was building a livecd earlier today, for some reason tomboy got pulled in, even though yum groupinfo told me that it is optional now... --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index fe125d9..f1b6085 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -48,6 +48,7 @@ festvox-slt-arctic-hts # these pull in excessive dependencies -ekiga +-tomboy -f-spot %end From 571bfc23207102146228c58e675f151812fe610e Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 17 Jun 2009 11:38:35 -0400 Subject: [PATCH 06/15] udev dropped vol_id, replace with blkid udev no longer ships a vol_id binary saying that blkid should be used instead. *sigh* --- fedora-live-base.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index d476c1e..2f93845 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -161,7 +161,7 @@ mountPersistentHome() { fi # if it's encrypted, we need to unlock it - if [ "\$(/lib/udev/vol_id -t \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then + if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then echo echo "Setting up encrypted /home device" plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" From 1345dd78dd999fc07e16e165ec8e56194081b4d0 Mon Sep 17 00:00:00 2001 From: kevin Date: Tue, 7 Jul 2009 19:49:57 -0600 Subject: [PATCH 07/15] Add midori, xfburn and rtorrent --- fedora-livecd-xfce.ks | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 63855a0..42c9c8c 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -18,6 +18,9 @@ NetworkManager-openvpn NetworkManager-gnome NetworkManager-pptp +# Add the midori browser as a lighter alternative +midori + cheese # we don't include @office so that we don't get OOo. but some nice bits @@ -46,8 +49,8 @@ totem totem-mozplugin pidgin claws-mail -# brasero has more dependencies gnomebaker +xfburn liferea quodlibet gftp @@ -57,6 +60,7 @@ tracker-search-tool xfce4-power-manager seahorse +rtorrent transmission cups-pdf bluez-gnome From b48e693ac89406c1f1056212b3523e249c7caa6f Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 12 Jul 2009 22:07:11 -0500 Subject: [PATCH 08/15] New game, colossus, added to the games spin --- fedora-livedvd-games.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks index cded925..81f446a 100644 --- a/fedora-livedvd-games.ks +++ b/fedora-livedvd-games.ks @@ -75,6 +75,7 @@ blobwars bombardier cdogs-sdl clanbomber +colossus foobillard glaxium gnubg From dfef3dbab8b782ea4eb88b0bccad1a34dab8ab16 Mon Sep 17 00:00:00 2001 From: Sebastian Vahl Date: Tue, 14 Jul 2009 10:28:02 +0200 Subject: [PATCH 09/15] remove filelight to avoid kdelibs3 on the images; some small cleanups --- fedora-livecd-kde.ks | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index ff7c743..0174cbb 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -37,7 +37,6 @@ koffice-kpresenter # ~3 megs koffice-filters kdeartwork # only include some parts of kdeartwork k3b -filelight # ~400kb #twinkle # (~10 megs) fuse liveusb-creator @@ -46,10 +45,6 @@ liveusb-creator ### fixes and space issues -# make kpackagekit the default on the kde live images -kpackagekit --gnome-packagekit - # use system-config-printer-kde instead of system-config-printer -system-config-printer system-config-printer-kde From ac4633551f8f40d439e5cad2bfc8d87ebd2bf386 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Jul 2009 17:04:29 -0500 Subject: [PATCH 10/15] Replaced bluez-gnome with gnome-bluetooth as that is the direction that F12 is going and bluez-gnome was causing xfce spin to fail to build against current rawhide. --- fedora-livecd-xfce.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 42c9c8c..f513cca 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -63,7 +63,7 @@ seahorse rtorrent transmission cups-pdf -bluez-gnome +gnome-bluetooth alsa-plugins-pulseaudio pavucontrol From e31f0476f31a1ca72e121f26b0217df9cd920dd6 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Jul 2009 17:06:27 -0500 Subject: [PATCH 11/15] Added myself to the maintainers list for xfce spin. --- fedora-livecd-xfce.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index f513cca..95dbf41 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -7,6 +7,7 @@ # - Rahul Sundaram # - Christoph Wickert # - Kevin Fenzi +# - Adam Miller %include fedora-live-base.ks From 5356ab52cdd4f09091e8e10371c74ca567c56082 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 18 Jul 2009 03:17:23 -0400 Subject: [PATCH 12/15] Drop gimp-data-extras to gain some space --- fedora-livecd-desktop.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index f1b6085..e229b9d 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -33,6 +33,7 @@ festvox-slt-arctic-hts -gnome-user-docs -gimp-help -gimp-help-browser +-gimp-data-extras -evolution-help -gnome-games -gnome-games-help From cb4a7538de3795058d310751cce0e89f85f2b31e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 20 Jul 2009 10:22:11 -0400 Subject: [PATCH 13/15] Drop some system-config utilities As per fedora-desktop-list discussion. --- fedora-livecd-desktop.ks | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index e229b9d..815ee28 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -51,6 +51,15 @@ festvox-slt-arctic-hts -ekiga -tomboy -f-spot + +# drop some system-config things +-system-config-boot +-system-config-language +-system-config-lvm +-system-config-network +-system-config-rootpassword +-system-config-selinux +-system-config-services %end %post From 980906b85aa9dbeb6eb0a4f213d812c7a8414ddf Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 21 Jul 2009 02:29:29 +0200 Subject: [PATCH 14/15] remove gnomebaker wich is a dupe with xfburn, add some new panel plugins --- fedora-livecd-xfce.ks | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 95dbf41..db6d5a3 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -50,7 +50,6 @@ totem totem-mozplugin pidgin claws-mail -gnomebaker xfburn liferea quodlibet @@ -78,33 +77,47 @@ yum-utils # xfce packages @xfce-desktop +Terminal gtk-xfce-engine orage thunar-volman +thunar-media-tags-plugin gigolo xarchiver xfce4-battery-plugin +# we already have thunar-volman +#xfce4-cddrive-plugin +xfce4-cellmodem-plugin xfce4-clipman-plugin xfce4-cpugraph-plugin xfce4-datetime-plugin xfce4-dict-plugin xfce4-diskperf-plugin +xfce4-eyes-plugin +xfce4-fsguard-plugin xfce4-genmon-plugin +xfce4-mailwatch-plugin xfce4-mount-plugin xfce4-netload-plugin xfce4-notes-plugin xfce4-places-plugin xfce4-quicklauncher-plugin +xfce4-smartbookmark-plugin xfce4-screenshooter-plugin xfce4-sensors-plugin xfce4-systemload-plugin xfce4-taskmanager -xfce4-volstatus-icon +xfce4-time-out-plugin +xfce4-timer-plugin xfce4-verve-plugin +xfce4-volstatus-icon +# we already have nm-applet +#xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin # this one a compatibility layer for GNOME applets and depends on it #xfce4-xfapplet-plugin +xfce4-xkb-plugin xfwm4-themes # dictionaries are big From 2548daaed4775ed0b89d8c502ea6c436f01ffe8e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Jul 2009 01:09:35 -0400 Subject: [PATCH 15/15] Correct a package name --- fedora-livecd-desktop.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 815ee28..58d1b88 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -58,8 +58,8 @@ festvox-slt-arctic-hts -system-config-lvm -system-config-network -system-config-rootpassword --system-config-selinux -system-config-services +-policycoreutils-gui %end %post