There is no Electronic Lab LiveCD anymore, make the changes

Sort the Makefile to list the actual spin first, then it's localizations
This commit is contained in:
Jeroen van Meeuwen (Fedora Unity) 2008-10-28 13:38:39 +01:00
parent 19665545c3
commit 684f924a72
5 changed files with 12 additions and 250 deletions

View File

@ -4,28 +4,30 @@ kickstartdir = $(pkgdatadir)/
kickstart_DATA = \
fedora-aos.ks \
fedora-live-base.ks \
fedora-livecd-desktop-de_DE.ks \
fedora-livecd-desktop-default.ks \
fedora-livecd-desktop-en_US.ks \
fedora-livecd-desktop.ks \
fedora-livecd-desktop-default.ks \
fedora-livecd-desktop-de_DE.ks \
fedora-livecd-desktop-en_US.ks \
fedora-livecd-desktop-nl_NL.ks \
fedora-livecd-desktop-pt_BR.ks \
fedora-livecd-desktop-pt_PT.ks \
fedora-livecd-education-math.ks \
fedora-livecd-electronic-lab.ks \
fedora-livecd-electronic-lab-nl_NL.ks \
fedora-livecd-electronic-lab-pt_PT.ks \
fedora-livecd-kde-de_DE.ks \
fedora-livecd-kde.ks \
fedora-livecd-kde-de_CH.ks \
fedora-livecd-kde-de_DE.ks \
fedora-livecd-kde-nl_NL.ks \
fedora-livecd-kde-pt_PT.ks \
fedora-livecd-xfce.ks \
fedora-livecd-xfce-de_CH.ks \
fedora-livecd-xfce-nl_NL.ks \
fedora-livecd-xfce-pt_PT.ks \
fedora-livedvd-developer.ks \
fedora-livedvd-developer-nl_NL.ks \
fedora-livedvd-developer-pt_PT.ks \
fedora-livedvd-electronic-lab.ks \
fedora-livedvd-electronic-lab-de_CH.ks \
fedora-livedvd-electronic-lab-nl_NL.ks \
fedora-livedvd-electronic-lab-pt_PT.ks \
fedora-livedvd-games.ks \
fedora-livedvd-games-nl_NL.ks \
fedora-livedvd-games-pt_PT.ks

View File

@ -1,240 +0,0 @@
# fedora-livecd-electronic-lab.ks
#
# Maintainer(s):
# - Chitlesh Goorah <chitlesh a fedoraproject.org>
# - Tibaut North <tnorth a fedoraproject.org>
%include fedora-live-base.ks
%packages
# KDE basic packages
kdebase
kde-filesystem
kdelibs
kdenetwork
kdegraphics
kdeutils
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
octave-forge
%end
%post
###### Fedora Electronic Lab ####################################################
# Fedora Electronic Lab: Kwin buttons
cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
[Style]
ButtonsOnLeft=MB
ButtonsOnRight=FIAX
CustomButtonPositions=true
EOF
# kill klipper
cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
[General]
AutoStart=false
EOF
# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
[Digital]
LCD_Style=false
Show_Date=false
Show_Seconds=true
[General]
Type=Digital
EOF
cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
[Layout]
DisplayNames=
EnableXkbOptions=false
IncludeGroups=
LayoutList=us,de,fr,jp
Model=pc104
Options=
ResetOldOptions=false
ShowFlag=true
ShowSingle=true
StickySwitching=false
StickySwitchingDepth=2
SwitchMode=Global
Use=true
EOF
# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
# This is a feature for Fedora and not for KDE
cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
###### KDE #####################################################################
# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
# add initscript qnd # Fedora Electronic Lab: KDE keyboard layouts
cat >> /etc/rc.d/init.d/livesys << 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/liveuser/.xsession
chmod a+x /home/liveuser/.xsession
chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user fedora
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /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=liveuser/' /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 anacron off
/sbin/chkconfig sendmail off
/sbin/chkconfig nfs off
/sbin/chkconfig nfslock off
/sbin/chkconfig rpcidmapd off
/sbin/chkconfig rpcbind off
%end

View File

@ -3,7 +3,7 @@
# Maintainer(s):
# - Fabian Affolter <fab a fedoraproject.org>
%include fedora-livecd-electronic-lab.ks
%include fedora-livedvd-electronic-lab.ks
lang de_DE
keyboard sg-latin1

View File

@ -3,7 +3,7 @@
# Maintainer(s):
# - Jeroen van Meeuwen <kanarip a fedoraunity.org>
%include fedora-livecd-electronic-lab.ks
%include fedora-livedvd-electronic-lab.ks
lang nl_NL
keyboard us

View File

@ -3,7 +3,7 @@
# Maintainer(s):
# - Pedro Silva <pedrofsilva a netcabo.pt>
%include fedora-livecd-electronic-lab.ks
%include fedora-livedvd-electronic-lab.ks
lang pt_PT.UTF-8
keyboard pt-latin1