diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index 31bff6f..8123b8f 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -23,7 +23,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \ midori livecd-tools \ Mesa-tools driconf parted testdisk \ vixie-cron logrotate \ - smart-gui cpufreqd mambatray \ + mambatray \ $(MAKEDIST_TARGET)-livecd-light # Localization targets diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index 7f1756e..e254799 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -1,4 +1,4 @@ -$(MAKEDIST_TARGET)-livecd-kde4: desktop-base-kde4 kmix bluedevil kwalletmanager +$(MAKEDIST_TARGET)-livecd-kde: desktop-base-kde kmix bluedevil5 kwalletmanager # smb4k juk kate dragon ksnapshot okular kppp krfb ark kcalc kdf kgpg kopete $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress @@ -13,9 +13,9 @@ $(MAKEDIST_TARGET)-livecd-root: \ chromium vixie-cron logrotate \ macbook-tools livecd-tools \ Mesa-tools driconf parted testdisk \ - samba-server \ - cpufreqd mambatray smart \ - $(MAKEDIST_TARGET)-livecd-kde4 + samba-server sddm \ + mambatray smart \ + $(MAKEDIST_TARGET)-livecd-kde # smart-gui # Localization targets diff --git a/platforms/livecd-root/Makefile.defs b/platforms/livecd-root/Makefile.defs index 36c84ec..e9f5f63 100644 --- a/platforms/livecd-root/Makefile.defs +++ b/platforms/livecd-root/Makefile.defs @@ -1,2 +1,2 @@ -networkmanagergui = plasma-applet-networkmanagement +networkmanagergui = plasma-nm xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 97762e5..2cea48c 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -1,10 +1,10 @@ # FIXME: ensure alternatives are correclty set chroot $MOUNTDIR update-alternatives-set-dri -# configure favorites in kde menu -for f in /usr/share/applications/chromium.desktop; do - chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1 -done +## configure favorites in kde menu +#for f in /usr/share/applications/chromium.desktop; do +# chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1 +#done # install icon on liveuser desktop chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/liveuser/Desktop/ @@ -41,4 +41,7 @@ for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; done +#echo "Sleeping 6000" +#sleep 6000 + prelink diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh index 11b99e9..a5c69da 100644 --- a/platforms/livecd/post.inc.sh +++ b/platforms/livecd/post.inc.sh @@ -32,7 +32,7 @@ buildinfo="`cat $MOUNTDIR/etc/openmamba-release` ${PLATFORM}" # configure isolinux boot loader cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF PROMPT 0 -TIMEOUT 20 +TIMEOUT 5 DEFAULT vesamenu.c32 MENU TITLE ${buildinfo} (${KERNEL_MAJVER} kernel) MENU BACKGROUND openmamba.png @@ -177,7 +177,7 @@ done < $MOUNTDIR2/boot/isolinux/isolinux.cfg #mkdir $MOUNTDIR2/.disk #cat $MOUNTDIR/etc/openmamba-release > $MOUNTDIR2/.disk/info -# Finally produce the media +# Finally produce the medium MOUNTDIR=$MOUNTDIR2 produce_media $MEDIA_NAME for i in $SUBPLATFORM; do diff --git a/platforms/livecd/settings.inc b/platforms/livecd/settings.inc index 6ce8b53..5963b82 100644 --- a/platforms/livecd/settings.inc +++ b/platforms/livecd/settings.inc @@ -7,7 +7,7 @@ if [ "$ARCH" = "i586" ]; then elif [ "$ARCH" = "x86_64" ]; then KERNEL_EXTRAVER=mamba-x86_64 KERNEL_PLATFORM="" - #KERNEL_ADDITIONAL="vboxvideo" + #KERNEL_ADDITIONAL="vboxvideo" fi [ "$SUBPLATFORM" ] || { SUBPLATFORM="livecd-root" diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index 7c586b4..bd13849 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -1,6 +1,6 @@ -$(MAKEDIST_TARGET)-livedvd-kde4: desktop-base-kde4 kppp krfb ark kcalc kdf kgpg \ +$(MAKEDIST_TARGET)-livedvd-kde: desktop-base-kde krfb ark kcalc kdf kgpg \ ksnapshot okular kontact kmail akregator kmix \ - kopete bluedevil smb4k amarok kwalletmanager dragon kate + kopete bluedevil5 smb4k amarok kwalletmanager dragon kate $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livedvd-root: \ @@ -13,8 +13,8 @@ $(MAKEDIST_TARGET)-livedvd-root: \ chromium kpartsplugin vixie-cron logrotate \ macbook-tools livecd-tools gdb \ Mesa-tools driconf parted testdisk samba-server \ - smart-gui cpufreqd mambatray \ - $(MAKEDIST_TARGET)-livedvd-kde4 testdisk photorec + mambatray sddm \ + $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec # Localization targets $(MAKEDIST_TARGET)-livedvd-root-en: \ kde-l10n-en_GB diff --git a/platforms/livedvd-root/settings.inc b/platforms/livedvd-root/settings.inc index 9124694..c9d4a90 100644 --- a/platforms/livedvd-root/settings.inc +++ b/platforms/livedvd-root/settings.inc @@ -1,6 +1,6 @@ PRODUCT_NAME=livedvd MEDIA=squash_xz -MOUNTDIR_TMPFS_SIZE=12G +MOUNTDIR_TMPFS_SIZE=14G MULTILANGUAGE="en it es fr de" if [ "$ARCH" = "i586" ]; then @@ -19,4 +19,5 @@ TARGET_HOSTNAME=openmamba-livedvd ROOTDEV= ROOTFS= -APPLICATION_TARGET="BASE_PKGS OFFICE_PKGS MULTIMEDIA_PLAYERS_PKGS MULTIMEDIA_EDITING_PKGS INTERNET_PKGS GRAPHICS_PKGS GAMES_PKGS VIRTUALIZATION_PKGS" +APPLICATION_TARGET="BASE_PKGS OFFICE_PKGS MULTIMEDIA_PLAYERS_PKGS INTERNET_PKGS GRAPHICS_PKGS" +# GAMES_PKGS VIRTUALIZATION_PKGS MULTIMEDIA_EDITING_PKGS diff --git a/platforms/livegames-root/Makefile b/platforms/livegames-root/Makefile index 42c7b74..6e228aa 100644 --- a/platforms/livegames-root/Makefile +++ b/platforms/livegames-root/Makefile @@ -19,11 +19,11 @@ $(MAKEDIST_TARGET)-livegames-root: \ macbook-tools livecd-tools \ kdebluetooth Mesa-tools driconf \ desktop-base-openmamba \ - extremetuxracer ksudoku4 okular cpufreqd mambatray \ + extremetuxracer ksudoku4 okular mambatray \ pingus gnuchess powermanga FlightGear frozen-bubble \ monkey-bubble pathological neverball \ tuxkart gtans moagg knights \ - torcs xmame openarena smart-gui \ + torcs xmame openarena \ enemy-territory-client enemy-territory-etpro \ enemy-territory-server enemy-territory-server-etpro \ scorched3d gngeo supertux freeciv xmoto \ diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile index 2bab606..df38786 100644 --- a/platforms/testcd-root/Makefile +++ b/platforms/testcd-root/Makefile @@ -13,7 +13,7 @@ $(MAKEDIST_TARGET)-testcd-root: \ chromium \ macbook-tools livecd-tools \ Mesa-tools driconf parted testdisk \ - samba-server cpufreqd mambatray smart \ + samba-server mambatray \ $(MAKEDIST_TARGET)-testcd-kde4 openssh-server # smart-gui