From 97b644dc39a1d9f078dba2eeeb8eae7e47f66335 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 9 Feb 2007 20:20:11 +0000 Subject: [PATCH] Removed all lines where a commented package was commented due to space constraints from livecd-stage1, changed Mozilla products and Openoffice to use the binary versions for both licensing and compile-time reasons, added net-firewall/iptables for bug #165109, added sys-apps/sg3_utils, changed to use the correct profile, changed livecd-stage2 to use the elilo-enabled cdtar, changed to use a 2.6.19 kernel config, and alphabetized the external kernel modules packages. svn path=/trunk/; revision=240 --- specs/2007.0/ChangeLog | 12 +++++- .../2007.0/x86/i686/livecd-stage1-gnome.spec | 40 +++++-------------- .../2007.0/x86/i686/livecd-stage2-gnome.spec | 35 +++++++--------- 3 files changed, 35 insertions(+), 52 deletions(-) diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index 146d65c7..a355c72c 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,15 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.14 2007-02-09 18:00:19 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.15 2007-02-09 20:20:11 wolf31o2 Exp $ + + 09 Feb 2007; Chris Gianelloni + x86/i686/livecd-stage1-gnome.spec, x86/i686/livecd-stage2-gnome.spec: + Removed all lines where a commented package was commented due to space + constraints from livecd-stage1, changed Mozilla products and Openoffice to + use the binary versions for both licensing and compile-time reasons, added + net-firewall/iptables for bug #165109, added sys-apps/sg3_utils, changed to + use the correct profile, changed livecd-stage2 to use the elilo-enabled + cdtar, changed to use a 2.6.19 kernel config, and alphabetized the external + kernel modules packages. 09 Feb 2007; Chris Gianelloni +alpha/stage2-desktop.spec, +alpha/stage3-desktop.spec, diff --git a/specs/2007.0/x86/i686/livecd-stage1-gnome.spec b/specs/2007.0/x86/i686/livecd-stage1-gnome.spec index 274eb22f..f08d6094 100644 --- a/specs/2007.0/x86/i686/livecd-stage1-gnome.spec +++ b/specs/2007.0/x86/i686/livecd-stage1-gnome.spec @@ -2,15 +2,15 @@ subarch: i686 version_stamp: installer-2007.0 target: livecd-stage1 rel_type: default -profile: default-linux/x86/2007.0 +profile: default-linux/x86/2007.0/desktop snapshot: 2007.0 -source_subpath: default/stage3-i686-2007.0 +source_subpath: default/stage3-i686-desktop-2007.0 livecd/use: atm branding livecd socks5 - + livecd/packages: app-admin/ide-smart app-admin/logrotate @@ -22,48 +22,36 @@ livecd/packages: app-arch/unrar app-arch/unzip app-benchmarks/cpuburn - app-cdr/cdrtools -# app-cdr/k3b + app-cdr/cdrkit app-crypt/gnupg app-editors/emacs app-editors/vim -# app-editors/xemacs app-misc/livecd-tools app-misc/screen app-misc/vlock -# app-office/koffice - app-office/openoffice -# app-office/openoffice-bin + app-office/openoffice-bin app-portage/gentoolkit app-portage/mirrorselect app-portage/ufed -# app-text/tetex dev-util/ccache gnome-base/gnome -# kde-base/kde-meta mail-client/evolution - mail-client/mozilla-thunderbird -# mail-client/sylpheed -# media-gfx/gimp + mail-client/mozilla-thunderbird-bin media-gfx/fbgrab media-sound/audacious - media-sound/rhythmbox - media-video/mplayer - net-analyzer/ettercap net-analyzer/netcat net-analyzer/nmap net-analyzer/tcpdump net-analyzer/tcptraceroute net-analyzer/traceroute - net-analyzer/wireshark net-dialup/bpalogin net-dialup/mingetty net-dialup/minicom net-dialup/penggy net-dialup/pptpclient net-dialup/rp-pppoe + net-firewall/iptables net-fs/nfs-utils -# net-fs/samba net-im/gaim net-irc/irssi net-irc/xchat @@ -74,11 +62,9 @@ livecd/packages: net-misc/vconfig net-misc/vpnc net-misc/whois - net-nntp/pan net-p2p/bittorrent net-proxy/dante net-proxy/tsocks - net-wireless/airsnort net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware net-wireless/prism54-firmware @@ -90,7 +76,6 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/gli - sys-apps/gradm sys-apps/hdparm sys-apps/hwsetup sys-apps/iproute2 @@ -101,10 +86,10 @@ livecd/packages: # sys-apps/ibm-powerpc-utils # sys-apps/ibm-powerpc-utils-papr sys-apps/sdparm + sys-apps/sg3_utils sys-apps/slocate sys-apps/smartmontools sys-block/gpart - sys-block/gparted sys-block/partimage # sys-boot/aboot sys-boot/grub @@ -114,7 +99,6 @@ livecd/packages: # sys-devel/binutils-hppa64 sys-devel/distcc # sys-devel/gcc-hppa64 -# sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms @@ -127,7 +111,6 @@ livecd/packages: # sys-fs/lvm-user # sys-fs/mac-fdisk sys-fs/mdadm -# sys-fs/multipath-tools sys-fs/ntfsprogs sys-fs/raidtools sys-fs/reiserfsprogs @@ -135,15 +118,12 @@ livecd/packages: sys-kernel/genkernel sys-libs/gpm sys-power/acpid -# sys-power/apmd sys-process/vixie-cron www-client/links - www-client/mozilla-firefox + www-client/mozilla-firefox-bin x11-base/xorg-x11 x11-drivers/synaptics + x11-misc/xdialog x11-misc/xscreensaver x11-themes/gdm-themes-livecd x11-themes/gentoo-artwork-livecd -# x11-wm/enlightenment -# x11-wm/fluxbox -# xfce-base/xfce4 diff --git a/specs/2007.0/x86/i686/livecd-stage2-gnome.spec b/specs/2007.0/x86/i686/livecd-stage2-gnome.spec index ac3d3a1d..638fa3c6 100644 --- a/specs/2007.0/x86/i686/livecd-stage2-gnome.spec +++ b/specs/2007.0/x86/i686/livecd-stage2-gnome.spec @@ -7,7 +7,7 @@ snapshot: 2007.0 source_subpath: default/livecd-stage1-i686-installer-2007.0 livecd/fstype: squashfs -livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 +livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/iso: /var/tmp/catalyst/builds/default/livecd-i686-installer-2007.0.iso livecd/splash_type: gensplash livecd/splash_theme: livecd-2007.0 @@ -28,34 +28,27 @@ livecd/gk_mainargs: --lvm2 --dmraid --evms2 --unionfs-dev boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/x86/livecd-2.6.17.config +boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/x86/livecd-2.6.19.config boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/packages: media-gfx/splashutils media-gfx/splash-themes-livecd - sys-apps/pcmciautils - net-dialup/slmodem - net-dialup/globespan-adsl - net-wireless/hostap-utils - net-dialup/fritzcapi - net-dialup/fcdsl - sys-power/acpid - sys-fs/cryptsetup-luks -# net-wireless/at76c503a -# net-wireless/rtl8180 -# net-wireless/adm8211 - net-wireless/rt2500 - net-wireless/acx -# net-wireless/ipw3945 -# These three are removed for licensing reasons. -# media-video/nvidia-kernel -# media-video/nvidia-glx -# x11-drivers/ati-drivers media-libs/alsa-lib - media-libs/alsa-oss media-sound/alsa-utils + net-dialup/fcdsl + net-dialup/fritzcapi + net-dialup/globespan-adsl + net-dialup/slmodem + net-wireless/acx + net-wireless/hostap-utils + net-wireless/ipw3945 + net-wireless/madwifi-ng-tools + net-wireless/rt2500 + net-wireless/rtl8187 + sys-apps/pcmciautils + sys-fs/cryptsetup-luks livecd/unmerge: sys-kernel/gentoo-sources