From 28810bf2d9afa20c6e89c0d1987d1c41da6bdf8a Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 13 Mar 2011 18:06:00 +0100 Subject: [PATCH 1/4] [scripts] enable cpufrequtils for GNOME, KDE spins --- molecules/gnome.common | 1 + molecules/kde.common | 1 + scripts/remaster_generic_inner_chroot_script_after.sh | 3 +++ 3 files changed, 5 insertions(+) diff --git a/molecules/gnome.common b/molecules/gnome.common index 8de9422..6c77aff 100644 --- a/molecules/gnome.common +++ b/molecules/gnome.common @@ -156,6 +156,7 @@ packages_to_add: sys-fs/dmraid, sys-fs/ntfs3g, sys-power/acpid, + sys-power/cpufrequtils, www-client/chromium, www-plugins/adobe-flash, www-plugins/nspluginwrapper, diff --git a/molecules/kde.common b/molecules/kde.common index 845a4b1..56d0395 100644 --- a/molecules/kde.common +++ b/molecules/kde.common @@ -308,6 +308,7 @@ packages_to_add: sys-fs/dmraid, sys-fs/ntfs3g, sys-power/acpid, + sys-power/cpufrequtils, www-client/chromium, www-plugins/adobe-flash, www-plugins/nspluginwrapper, diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index 66c96cf..cb64386 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -202,6 +202,7 @@ elif [ "$1" = "gforensic" ]; then setup_sabayon_mce gforensic_remove_skel_stuff setup_proprietary_gfx_drivers + setup_cpufrequtils elif [ "$1" = "kforensic" ]; then setup_networkmanager # Fix ~/.dmrc to have it load KDE @@ -213,6 +214,7 @@ elif [ "$1" = "kforensic" ]; then setup_sabayon_mce gforensic_remove_skel_stuff setup_proprietary_gfx_drivers + setup_cpufrequtils elif [ "$1" = "kde" ]; then setup_networkmanager # Fix ~/.dmrc to have it load KDE @@ -221,6 +223,7 @@ elif [ "$1" = "kde" ]; then setup_displaymanager setup_sabayon_mce setup_proprietary_gfx_drivers + setup_cpufrequtils fi # !!! THERE IS A BUG IN THE CLAMAV EBUILD !!! From 77e7e387078df9d535b8a1078e12be91a6310f0f Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 14 Mar 2011 22:59:48 +0100 Subject: [PATCH 2/4] [molecules] gnome-mount is being dropped --- molecules/sabayon-x86-gforensic.spec | 2 +- molecules/sabayon-x86-kforensic.spec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/molecules/sabayon-x86-gforensic.spec b/molecules/sabayon-x86-gforensic.spec index 09de732..3c8d21e 100644 --- a/molecules/sabayon-x86-gforensic.spec +++ b/molecules/sabayon-x86-gforensic.spec @@ -81,7 +81,7 @@ iso_title: Sabayon_Linux_Forensic_x86_G # List of packages that would be removed from chrooted system (comma separated) # List of packages that would be removed from chrooted system (comma separated) -packages_to_remove: gnome-base/gnome-mount, net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/openoffice-l10n-de, app-office/openoffice-l10n-es, app-office/openoffice-l10n-fr, app-office/openoffice-l10n-it, app-office/openoffice-l10n-nl, app-office/openoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-wm/emerald, x11-themes/emerald-themes, x11-apps/fusion-icon, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp, app-admin/packagekit-base, app-admin/packagekit-gtk, app-misc/sabayon-music, net-misc/mobile-broadband-provider-info +packages_to_remove: net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/openoffice-l10n-de, app-office/openoffice-l10n-es, app-office/openoffice-l10n-fr, app-office/openoffice-l10n-it, app-office/openoffice-l10n-nl, app-office/openoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-wm/emerald, x11-themes/emerald-themes, x11-apps/fusion-icon, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp, app-admin/packagekit-base, app-admin/packagekit-gtk, app-misc/sabayon-music, net-misc/mobile-broadband-provider-info # Custom shell call to packages removal (default is: equo remove) # custom_packages_remove_cmd: diff --git a/molecules/sabayon-x86-kforensic.spec b/molecules/sabayon-x86-kforensic.spec index 9e0e121..bd66b30 100644 --- a/molecules/sabayon-x86-kforensic.spec +++ b/molecules/sabayon-x86-kforensic.spec @@ -93,7 +93,6 @@ packages_to_remove: app-dicts/aspell-nl, app-dicts/aspell-pl, app-dicts/aspell-pt-br, - gnome-base/gnome-mount, net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, From ea1dbeb1f9b79b107aa7796161465499739160a7 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 15 Mar 2011 09:18:43 +0100 Subject: [PATCH 3/4] [molecules] we just switched to libreoffice, thanks to Josef Odenthal for reporting --- molecules/3rdparty/mcs.common | 2 +- molecules/gaming.common | 2 +- molecules/gnome.common | 14 +++++++------- molecules/kde.common | 14 +++++++------- molecules/sabayon-x86-gforensic.spec | 2 +- molecules/sabayon-x86-kforensic.spec | 12 ++++++------ 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/molecules/3rdparty/mcs.common b/molecules/3rdparty/mcs.common index 4407006..0c2e79b 100644 --- a/molecules/3rdparty/mcs.common +++ b/molecules/3rdparty/mcs.common @@ -41,7 +41,7 @@ destination_iso_directory: /sabayon/iso # List of packages that would be removed from chrooted system (comma separated) packages_to_remove: - app-office/openoffice, + app-office/libreoffice, app-emulation/wine, sabayon-mce, sabayon-music, diff --git a/molecules/gaming.common b/molecules/gaming.common index 6c90534..3b6d26e 100644 --- a/molecules/gaming.common +++ b/molecules/gaming.common @@ -77,7 +77,7 @@ packages_to_remove: app-dicts/myspell-nl, app-editors/gedit, app-emulation/wine, - app-office/openoffice, + app-office/libreoffice, app-pda/gnome-pilot, app-pda/pilot-link, app-text/libwpd, diff --git a/molecules/gnome.common b/molecules/gnome.common index 6c77aff..3647e80 100644 --- a/molecules/gnome.common +++ b/molecules/gnome.common @@ -76,13 +76,13 @@ packages_to_add: app-misc/sabayon-mce, app-misc/sabayon-skel, app-text/pastebunz, - app-office/openoffice, - app-office/openoffice-l10n-de, - app-office/openoffice-l10n-es, - app-office/openoffice-l10n-fr, - app-office/openoffice-l10n-it, - app-office/openoffice-l10n-nl, - app-office/openoffice-l10n-pt, + app-office/libreoffice, + app-office/libreoffice-l10n-de, + app-office/libreoffice-l10n-es, + app-office/libreoffice-l10n-fr, + app-office/libreoffice-l10n-it, + app-office/libreoffice-l10n-nl, + app-office/libreoffice-l10n-pt, dev-java/sun-jre-bin, gnome-base/gnome-shell, gnome-base/gnome-applets, diff --git a/molecules/kde.common b/molecules/kde.common index 56d0395..47e9eff 100644 --- a/molecules/kde.common +++ b/molecules/kde.common @@ -72,13 +72,13 @@ packages_to_add: app-misc/sabayon-mce, app-misc/sabayon-skel, app-text/pastebunz, - app-office/openoffice, - app-office/openoffice-l10n-de, - app-office/openoffice-l10n-es, - app-office/openoffice-l10n-fr, - app-office/openoffice-l10n-it, - app-office/openoffice-l10n-nl, - app-office/openoffice-l10n-pt, + app-office/libreoffice, + app-office/libreoffice-l10n-de, + app-office/libreoffice-l10n-es, + app-office/libreoffice-l10n-fr, + app-office/libreoffice-l10n-it, + app-office/libreoffice-l10n-nl, + app-office/libreoffice-l10n-pt, dev-java/sun-jre-bin, games-puzzle/world-of-goo-demo, kde-base/kde-l10n-bg, diff --git a/molecules/sabayon-x86-gforensic.spec b/molecules/sabayon-x86-gforensic.spec index 3c8d21e..5ef5867 100644 --- a/molecules/sabayon-x86-gforensic.spec +++ b/molecules/sabayon-x86-gforensic.spec @@ -81,7 +81,7 @@ iso_title: Sabayon_Linux_Forensic_x86_G # List of packages that would be removed from chrooted system (comma separated) # List of packages that would be removed from chrooted system (comma separated) -packages_to_remove: net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/openoffice-l10n-de, app-office/openoffice-l10n-es, app-office/openoffice-l10n-fr, app-office/openoffice-l10n-it, app-office/openoffice-l10n-nl, app-office/openoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-wm/emerald, x11-themes/emerald-themes, x11-apps/fusion-icon, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp, app-admin/packagekit-base, app-admin/packagekit-gtk, app-misc/sabayon-music, net-misc/mobile-broadband-provider-info +packages_to_remove: net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/libreoffice-l10n-de, app-office/libreoffice-l10n-es, app-office/libreoffice-l10n-fr, app-office/libreoffice-l10n-it, app-office/libreoffice-l10n-nl, app-office/libreoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-wm/emerald, x11-themes/emerald-themes, x11-apps/fusion-icon, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp, app-admin/packagekit-base, app-admin/packagekit-gtk, app-misc/sabayon-music, net-misc/mobile-broadband-provider-info # Custom shell call to packages removal (default is: equo remove) # custom_packages_remove_cmd: diff --git a/molecules/sabayon-x86-kforensic.spec b/molecules/sabayon-x86-kforensic.spec index bd66b30..f48a491 100644 --- a/molecules/sabayon-x86-kforensic.spec +++ b/molecules/sabayon-x86-kforensic.spec @@ -97,12 +97,12 @@ packages_to_remove: net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, - app-office/openoffice-l10n-de, - app-office/openoffice-l10n-es, - app-office/openoffice-l10n-fr, - app-office/openoffice-l10n-it, - app-office/openoffice-l10n-nl, - app-office/openoffice-l10n-pt, + app-office/libreoffice-l10n-de, + app-office/libreoffice-l10n-es, + app-office/libreoffice-l10n-fr, + app-office/libreoffice-l10n-it, + app-office/libreoffice-l10n-nl, + app-office/libreoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, www-client/firefox, From 5a80a43578d388f8c20b82260e25026803d4d6be Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 17 Mar 2011 09:47:59 +0100 Subject: [PATCH 4/4] [isolinux] remove dead kernel arguments --- boot/core/isolinux/isolinux.cfg | 2 +- remaster/minimal_isolinux.cfg | 2 +- remaster/serverbase_isolinux.cfg | 2 +- remaster/standard_isolinux.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/core/isolinux/isolinux.cfg b/boot/core/isolinux/isolinux.cfg index 0cd849f..54b730e 100644 --- a/boot/core/isolinux/isolinux.cfg +++ b/boot/core/isolinux/isolinux.cfg @@ -16,7 +16,7 @@ LABEL text-install LABEL genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- LABEL debug menu label Deb^ug mode diff --git a/remaster/minimal_isolinux.cfg b/remaster/minimal_isolinux.cfg index 236d1a9..6649c17 100644 --- a/remaster/minimal_isolinux.cfg +++ b/remaster/minimal_isolinux.cfg @@ -21,7 +21,7 @@ LABEL text-install LABEL genuine menu label Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- LABEL console menu label ^Console mode diff --git a/remaster/serverbase_isolinux.cfg b/remaster/serverbase_isolinux.cfg index 9f54c36..def3554 100644 --- a/remaster/serverbase_isolinux.cfg +++ b/remaster/serverbase_isolinux.cfg @@ -16,7 +16,7 @@ LABEL text-install LABEL genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- LABEL debug menu label Deb^ug mode diff --git a/remaster/standard_isolinux.cfg b/remaster/standard_isolinux.cfg index 245a30c..02362b9 100644 --- a/remaster/standard_isolinux.cfg +++ b/remaster/standard_isolinux.cfg @@ -44,7 +44,7 @@ LABEL text-install LABEL genuine menu label Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- LABEL console menu label ^Console mode kernel /boot/sabayon