openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for 2.0pre5: update grub, clean /tmp/kde-root, replace dragonplayer with kaffeine

Browse Source
This commit is contained in:
Silvan Calarco 2011-06-03 13:57:28 +02:00
parent 19c9010f07
commit cda17300ba
7 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ $(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \
procps sed grep net-tools tar bzip2 unzip zip pciutils \ procps sed grep net-tools tar bzip2 unzip zip pciutils \
pam shadow-common pwdutils acpid mingetty screen \ pam shadow-common pwdutils acpid mingetty screen \
net-tools prelink mc dhcpclient timezone nfs-utils \ net-tools prelink mc dhcpclient timezone nfs-utils \
wireless_tools wpa_supplicant openmamba-release grub2 refit-tools openssh-clients \ wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \ dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
reiserfsprogs reiser4progs ppp b43-tools mdadm eciadsl usb-modeswitch \ reiserfsprogs reiser4progs ppp b43-tools mdadm eciadsl usb-modeswitch \
ndiswrapper slmodem usbutils ftp telnet eject bluez \ ndiswrapper slmodem usbutils ftp telnet eject bluez \

1
makedist.inc.sh
View File

@ -107,6 +107,7 @@ find $MOUNTDIR/usr/share/locale \
# cleanup: prevent generating a cleanfs script crash due to a unionfs bug # cleanup: prevent generating a cleanfs script crash due to a unionfs bug
rm -rf $MOUNTDIR/tmp/.ICE-unix rm -rf $MOUNTDIR/tmp/.ICE-unix
rm -rf $MOUNTDIR/tmp/kde-root
#$CHROOTCMD chkconfig --add acpid || #$CHROOTCMD chkconfig --add acpid ||
# { echo "$mkcd_me: fatal error, aborting installation" >&2 # { echo "$mkcd_me: fatal error, aborting installation" >&2

4
platforms/livecd-root/Makefile
View File

@ -5,11 +5,12 @@ $(MAKEDIST_TARGET)-livecd-kde3: kdebase kmix \
$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot4 okular desktop-base-kde4 kmix4 \ ksnapshot4 okular desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \ kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
dragonplayer4 libqt4-sqlite kate kaffeine libqt4-sqlite kate
#kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
$(MAKEDIST_TARGET)-livecd-root: \ $(MAKEDIST_TARGET)-livecd-root: \
$(MAKEDIST_TARGET)-livecd-kde4 \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \
$(MAKEDIST_TARGET)-commontools msysklogd xorg-server \ $(MAKEDIST_TARGET)-commontools msysklogd xorg-server \
xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \ xorg-fonts-100dpi xorg-fonts-Type1 xorg-fonts-TTF \
@ -22,7 +23,6 @@ $(MAKEDIST_TARGET)-livecd-root: \
compizconfig-settings-manager compiz-fusion-plugins-main \ compizconfig-settings-manager compiz-fusion-plugins-main \
compiz-fusion-plugins-extra samba-server \ compiz-fusion-plugins-extra samba-server \
ndisgtk smart-gui cpufreqd mambatray \ ndisgtk smart-gui cpufreqd mambatray \
$(MAKEDIST_TARGET)-livecd-kde4
# gnome-device-manager # gnome-device-manager
# libopensync-plugin-syncml libopensync-plugin-google-calendar \ # libopensync-plugin-syncml libopensync-plugin-google-calendar \
# libopensync-plugin-gnokii libopensync-plugin-synce \ # libopensync-plugin-gnokii libopensync-plugin-synce \

3
platforms/livecd-root/post.inc.sh
View File

@ -61,6 +61,9 @@ mkdir -p $MOUNTDIR/root/Desktop/
cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/ cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/ cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
# configure firefox as favorite in kde menu
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite %{_datadir}/applications/mozilla-firefox3.desktop
# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh

2
platforms/livedvd-root/Makefile
View File

@ -5,7 +5,7 @@ $(MAKEDIST_TARGET)-livedvd-kde3: kdebase kmix \
$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \ kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \
dragonplayer4 libqt4-sqlite kate kaffeine libqt4-sqlite kate
# knemo # knemo
#kitchensync4 #kitchensync4
$(MAKEDIST_TARGET)-livedvd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress $(MAKEDIST_TARGET)-livedvd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress

3
platforms/livedvd-root/post.inc.sh
View File

@ -62,6 +62,9 @@ mkdir -p $MOUNTDIR/root/Desktop/
cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/ cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/ cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
# configure firefox as favorite in kde menu
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite %{_datadir}/applications/mozilla-firefox3.desktop
# prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot) # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
[ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r` [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh

2
platforms/livegames-root/Makefile
View File

@ -6,7 +6,7 @@ $(MAKEDIST_TARGET)-livegames-kde3: kdebase kmix \
$(MAKEDIST_TARGET)-livegames-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livegames-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot4 okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
kopete4 kdebluetooth4 smb4k kate \ kopete4 kdebluetooth4 smb4k kate \
kruler4 gwenview4 kamera kcolorchooser4 amarok lisa4 kwalletmanager4 libqt4-sqlite kruler4 gwenview4 kamera kcolorchooser4 lisa4 kwalletmanager4 libqt4-sqlite
$(MAKEDIST_TARGET)-livegames-root: \ $(MAKEDIST_TARGET)-livegames-root: \
postplug-xorg postplug-sound \ postplug-xorg postplug-sound \