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

platforms: remove cpufreqd, smart-gui and other fixes

Browse Source
This commit is contained in:
Silvan Calarco 2017-12-24 11:54:06 +01:00
parent b34209bd55
commit 80e0133188
10 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/livecd-light-root/Makefile
View File

@ -23,7 +23,7 @@ $(MAKEDIST_TARGET)-livecd-light-root: \
midori livecd-tools \ midori livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
vixie-cron logrotate \ vixie-cron logrotate \
smart-gui cpufreqd mambatray \ mambatray \
$(MAKEDIST_TARGET)-livecd-light $(MAKEDIST_TARGET)-livecd-light
# Localization targets # Localization targets

8
platforms/livecd-root/Makefile
View File

@ -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 # smb4k juk kate dragon ksnapshot okular kppp krfb ark kcalc kdf kgpg kopete
$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
@ -13,9 +13,9 @@ $(MAKEDIST_TARGET)-livecd-root: \
chromium vixie-cron logrotate \ chromium vixie-cron logrotate \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server \ samba-server sddm \
cpufreqd mambatray smart \ mambatray smart \
$(MAKEDIST_TARGET)-livecd-kde4 $(MAKEDIST_TARGET)-livecd-kde
# smart-gui # smart-gui
# Localization targets # Localization targets

2
platforms/livecd-root/Makefile.defs
View File

@ -1,2 +1,2 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-nm
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

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

@ -1,10 +1,10 @@
# FIXME: ensure alternatives are correclty set # FIXME: ensure alternatives are correclty set
chroot $MOUNTDIR update-alternatives-set-dri chroot $MOUNTDIR update-alternatives-set-dri
# configure favorites in kde menu ## configure favorites in kde menu
for f in /usr/share/applications/chromium.desktop; do #for f in /usr/share/applications/chromium.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1 # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
done #done
# install icon on liveuser desktop # install icon on liveuser desktop
chroot $MOUNTDIR cp /usr/share/applications/openmamba-installer.desktop /home/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 {} \; find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \;
done done
#echo "Sleeping 6000"
#sleep 6000
prelink prelink

4
platforms/livecd/post.inc.sh
View File

@ -32,7 +32,7 @@ buildinfo="`cat $MOUNTDIR/etc/openmamba-release` ${PLATFORM}"
# configure isolinux boot loader # configure isolinux boot loader
cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF cat > $MOUNTDIR2/boot/isolinux/isolinux.cfg << _EOF
PROMPT 0 PROMPT 0
TIMEOUT 20 TIMEOUT 5
DEFAULT vesamenu.c32 DEFAULT vesamenu.c32
MENU TITLE ${buildinfo} (${KERNEL_MAJVER} kernel) MENU TITLE ${buildinfo} (${KERNEL_MAJVER} kernel)
MENU BACKGROUND openmamba.png MENU BACKGROUND openmamba.png
@ -177,7 +177,7 @@ done < $MOUNTDIR2/boot/isolinux/isolinux.cfg
#mkdir $MOUNTDIR2/.disk #mkdir $MOUNTDIR2/.disk
#cat $MOUNTDIR/etc/openmamba-release > $MOUNTDIR2/.disk/info #cat $MOUNTDIR/etc/openmamba-release > $MOUNTDIR2/.disk/info
# Finally produce the media # Finally produce the medium
MOUNTDIR=$MOUNTDIR2 produce_media $MEDIA_NAME MOUNTDIR=$MOUNTDIR2 produce_media $MEDIA_NAME
for i in $SUBPLATFORM; do for i in $SUBPLATFORM; do

2
platforms/livecd/settings.inc
View File

@ -7,7 +7,7 @@ if [ "$ARCH" = "i586" ]; then
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
KERNEL_EXTRAVER=mamba-x86_64 KERNEL_EXTRAVER=mamba-x86_64
KERNEL_PLATFORM="" KERNEL_PLATFORM=""
#KERNEL_ADDITIONAL="vboxvideo" #KERNEL_ADDITIONAL="vboxvideo"
fi fi
[ "$SUBPLATFORM" ] || { [ "$SUBPLATFORM" ] || {
SUBPLATFORM="livecd-root" SUBPLATFORM="livecd-root"

8
platforms/livedvd-root/Makefile
View File

@ -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 \ 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-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-livedvd-root: \ $(MAKEDIST_TARGET)-livedvd-root: \
@ -13,8 +13,8 @@ $(MAKEDIST_TARGET)-livedvd-root: \
chromium kpartsplugin vixie-cron logrotate \ chromium kpartsplugin vixie-cron logrotate \
macbook-tools livecd-tools gdb \ macbook-tools livecd-tools gdb \
Mesa-tools driconf parted testdisk samba-server \ Mesa-tools driconf parted testdisk samba-server \
smart-gui cpufreqd mambatray \ mambatray sddm \
$(MAKEDIST_TARGET)-livedvd-kde4 testdisk photorec $(MAKEDIST_TARGET)-livedvd-kde testdisk photorec
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livedvd-root-en: \ $(MAKEDIST_TARGET)-livedvd-root-en: \
kde-l10n-en_GB kde-l10n-en_GB

5
platforms/livedvd-root/settings.inc
View File

@ -1,6 +1,6 @@
PRODUCT_NAME=livedvd PRODUCT_NAME=livedvd
MEDIA=squash_xz MEDIA=squash_xz
MOUNTDIR_TMPFS_SIZE=12G MOUNTDIR_TMPFS_SIZE=14G
MULTILANGUAGE="en it es fr de" MULTILANGUAGE="en it es fr de"
if [ "$ARCH" = "i586" ]; then if [ "$ARCH" = "i586" ]; then
@ -19,4 +19,5 @@ TARGET_HOSTNAME=openmamba-livedvd
ROOTDEV= ROOTDEV=
ROOTFS= 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

4
platforms/livegames-root/Makefile
View File

@ -19,11 +19,11 @@ $(MAKEDIST_TARGET)-livegames-root: \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
kdebluetooth Mesa-tools driconf \ kdebluetooth Mesa-tools driconf \
desktop-base-openmamba \ desktop-base-openmamba \
extremetuxracer ksudoku4 okular cpufreqd mambatray \ extremetuxracer ksudoku4 okular mambatray \
pingus gnuchess powermanga FlightGear frozen-bubble \ pingus gnuchess powermanga FlightGear frozen-bubble \
monkey-bubble pathological neverball \ monkey-bubble pathological neverball \
tuxkart gtans moagg knights \ tuxkart gtans moagg knights \
torcs xmame openarena smart-gui \ torcs xmame openarena \
enemy-territory-client enemy-territory-etpro \ enemy-territory-client enemy-territory-etpro \
enemy-territory-server enemy-territory-server-etpro \ enemy-territory-server enemy-territory-server-etpro \
scorched3d gngeo supertux freeciv xmoto \ scorched3d gngeo supertux freeciv xmoto \

2
platforms/testcd-root/Makefile
View File

@ -13,7 +13,7 @@ $(MAKEDIST_TARGET)-testcd-root: \
chromium \ chromium \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server cpufreqd mambatray smart \ samba-server mambatray \
$(MAKEDIST_TARGET)-testcd-kde4 openssh-server $(MAKEDIST_TARGET)-testcd-kde4 openssh-server
# smart-gui # smart-gui