From 0238afc6a20ef5ed13facb8628cdad4b92098596 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 9 Feb 2007 20:55:20 +0000 Subject: [PATCH] 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 a ton of new packages, added the branding USE flag, 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=241 --- specs/2007.0/ChangeLog | 11 +- .../2007.0/x86/i686/livecd-stage1-gnome.spec | 4 +- .../2007.0/x86/i686/livecd-stage1-large.spec | 119 ++++++++++++++++-- .../2007.0/x86/i686/livecd-stage2-large.spec | 37 +++--- 4 files changed, 137 insertions(+), 34 deletions(-) diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index a355c72c..2b3056bf 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,14 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.15 2007-02-09 20:20:11 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.16 2007-02-09 20:55:20 wolf31o2 Exp $ + + 09 Feb 2007; Chris Gianelloni + x86/i686/livecd-stage1-gnome.spec, x86/i686/livecd-stage1-large.spec, + x86/i686/livecd-stage2-large.spec: + 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 a ton of new packages, added the branding USE flag, 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 x86/i686/livecd-stage1-gnome.spec, x86/i686/livecd-stage2-gnome.spec: diff --git a/specs/2007.0/x86/i686/livecd-stage1-gnome.spec b/specs/2007.0/x86/i686/livecd-stage1-gnome.spec index f08d6094..f678455b 100644 --- a/specs/2007.0/x86/i686/livecd-stage1-gnome.spec +++ b/specs/2007.0/x86/i686/livecd-stage1-gnome.spec @@ -78,13 +78,13 @@ livecd/packages: sys-apps/gli sys-apps/hdparm sys-apps/hwsetup +# sys-apps/ibm-powerpc-utils +# sys-apps/ibm-powerpc-utils-papr sys-apps/iproute2 sys-apps/memtester sys-apps/netplug sys-apps/parted # sys-apps/powerpc-utils -# sys-apps/ibm-powerpc-utils -# sys-apps/ibm-powerpc-utils-papr sys-apps/sdparm sys-apps/sg3_utils sys-apps/slocate diff --git a/specs/2007.0/x86/i686/livecd-stage1-large.spec b/specs/2007.0/x86/i686/livecd-stage1-large.spec index 70698d01..274fc5ec 100644 --- a/specs/2007.0/x86/i686/livecd-stage1-large.spec +++ b/specs/2007.0/x86/i686/livecd-stage1-large.spec @@ -4,62 +4,122 @@ target: livecd-stage1 rel_type: default 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/gkrellm app-admin/ide-smart app-admin/logrotate app-admin/passook app-admin/pwgen + app-admin/quickswitch app-admin/sudo + app-admin/superadduser app-admin/syslog-ng + app-admin/testdisk + app-arch/alien app-arch/mt-st app-arch/unrar app-arch/unzip app-benchmarks/cpuburn - app-cdr/cdrtools + app-cdr/bin2iso + app-cdr/cdrdao + app-cdr/cdrkit + app-cdr/dvd+rw-tools app-cdr/gnomebaker app-cdr/k3b + app-cdr/nrg2iso app-crypt/gnupg app-editors/bluefish app-editors/emacs + app-editors/gvim app-editors/vim app-editors/xemacs + app-forensics/chkrootkit + app-laptop/i8kutils app-misc/livecd-tools + app-misc/mc + app-misc/pax-utils app-misc/screen + app-misc/splitvt app-misc/vlock + app-office/dia + app-office/gnucash + app-office/gnumeric app-office/koffice - app-office/openoffice -# app-office/openoffice-bin + app-office/openoffice-bin app-office/scribus + app-pda/gtkpod + app-pda/ipodslave + app-portage/herdstat + app-portage/genlop app-portage/gentoolkit + app-portage/gentoolkit-dev + app-portage/layman app-portage/mirrorselect + app-portage/portage-utils app-portage/ufed + app-shells/bash-completion + app-shells/gentoo-bashcomp + app-shells/tcsh + app-shells/zsh + app-shells/zsh-completion app-text/tetex dev-util/anjuta dev-util/ccache + dev-util/cvs + dev-util/indent + dev-util/kdbg + dev-util/kdesvn + dev-util/kdevelop + dev-util/ltrace + dev-util/strace + dev-util/subversion + dev-util/valgrind gnome-base/gnome + gnome-extra/evolution-exchange + gnome-extra/gsynaptics + gnome-extra/sensors-applet kde-base/kde-meta + kde-base/kooka mail-client/evolution - mail-client/mozilla-thunderbird + mail-client/mozilla-thunderbird-bin mail-client/sylpheed mail-client/sylpheed-claws media-gfx/blender + media-gfx/digikam media-gfx/fbgrab media-gfx/gimp + media-gfx/gimp-print media-gfx/gtkam media-gfx/inkscape + media-gfx/xsane + media-sound/amarok media-sound/audacious + media-sound/audacity media-sound/easytag + media-sound/gnomeradio + media-sound/grip + media-sound/hydrogen media-sound/rhythmbox + media-video/dvdrip + media-video/gqcam + media-video/gxine + media-video/lsdvd media-video/mplayer + media-video/ogle-gui + media-video/vlc + media-video/xine-ui + media-video/kmplayer net-analyzer/ettercap net-analyzer/netcat net-analyzer/nmap + net-analyzer/snort net-analyzer/tcpdump net-analyzer/tcptraceroute net-analyzer/traceroute @@ -70,6 +130,10 @@ livecd/packages: net-dialup/penggy net-dialup/pptpclient net-dialup/rp-pppoe + net-firewall/iptables + net-firewall/firestarter + net-firewall/kmyfirewall + net-ftp/ncftp net-fs/nfs-utils net-fs/samba net-im/gaim @@ -79,21 +143,31 @@ livecd/packages: net-misc/dhcpcd net-misc/iputils net-misc/rdate + net-misc/tightvnc net-misc/vconfig net-misc/vpnc net-misc/whois net-nntp/pan net-p2p/bittorrent + net-p2p/limewire + net-print/cups net-proxy/dante net-proxy/tsocks + net-wireless/aircrack-ng net-wireless/airsnort + net-wireless/gnome-bluetooth net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware + net-wireless/kdebluetooth net-wireless/prism54-firmware + net-wireless/wepattack net-wireless/wireless-tools net-wireless/wpa_supplicant net-wireless/zd1201-firmware + net-wireless/zd1211-firmware + rox-base/rox sys-apps/apmd + sys-apps/dmidecode sys-apps/eject sys-apps/ethtool sys-apps/fxload @@ -101,19 +175,29 @@ livecd/packages: sys-apps/gradm sys-apps/hdparm sys-apps/hwsetup +# sys-apps/ibm-powerpc-utils +# sys-apps/ibm-powerpc-utils-papr sys-apps/iproute2 + sys-apps/ivman sys-apps/memtester sys-apps/netplug sys-apps/parted + sys-apps/pcsc-lite + sys-apps/pmount # sys-apps/powerpc-utils -# sys-apps/ibm-powerpc-utils -# sys-apps/ibm-powerpc-utils-papr + sys-apps/qtparted + sys-apps/rsbac-admin sys-apps/sdparm + sys-apps/sg3_utils sys-apps/slocate sys-apps/smartmontools + sys-apps/suspend2-userui sys-block/gpart sys-block/gparted + sys-block/mpt-status sys-block/partimage + sys-block/qla-fc-firmware +# sys-boot/aboot sys-boot/grub sys-boot/lilo sys-boot/syslinux @@ -121,10 +205,11 @@ livecd/packages: # sys-devel/binutils-hppa64 sys-devel/distcc # sys-devel/gcc-hppa64 -# sys-fs/dmraid + sys-devel/gdb sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms + sys-fs/ext2resize sys-fs/hfsplusutils sys-fs/hfsutils # sys-fs/iprutils @@ -132,25 +217,35 @@ livecd/packages: sys-fs/lsscsi sys-fs/lvm2 # sys-fs/lvm-user -# sys-fs/mac-fdisk + sys-fs/mac-fdisk sys-fs/mdadm -# sys-fs/multipath-tools sys-fs/ntfsprogs + sys-fs/quota sys-fs/raidtools sys-fs/reiserfsprogs + sys-fs/xfsdump sys-fs/xfsprogs sys-kernel/genkernel sys-libs/gpm sys-power/acpid -# sys-power/apmd + sys-power/apcupsd + sys-process/lsof sys-process/vixie-cron + www-client/epiphany-extensions + www-client/galeon www-client/links - www-client/mozilla-firefox + www-client/mozilla-firefox-bin + www-client/opera + www-client/seamonkey x11-base/xorg-x11 x11-drivers/synaptics + x11-misc/xdialog x11-misc/xscreensaver + x11-plugins/gkrellm-plugins x11-themes/gdm-themes-livecd x11-themes/gentoo-artwork-livecd + x11-wm/afterstep x11-wm/enlightenment x11-wm/fluxbox + x11-wm/windowmaker xfce-base/xfce4 diff --git a/specs/2007.0/x86/i686/livecd-stage2-large.spec b/specs/2007.0/x86/i686/livecd-stage2-large.spec index 0b39ab3c..e9477db9 100644 --- a/specs/2007.0/x86/i686/livecd-stage2-large.spec +++ b/specs/2007.0/x86/i686/livecd-stage2-large.spec @@ -4,11 +4,10 @@ target: livecd-stage2 rel_type: default profile: default-linux/x86/2007.0/desktop snapshot: 2007.0 -portage_overlay: /root/livecd/overlays/portage 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/livedvd-i686-installer-2007.0.iso livecd/splash_type: gensplash livecd/splash_theme: livecd-2007.0 @@ -20,7 +19,7 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 x86 LiveDVD -livecd/overlay: /root/livecd/overlays/livecd/2007.0 +livecd/overlay: /root/livecd/overlays/livedvd/2007.0 livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/bootargs: dokeymap @@ -29,29 +28,29 @@ livecd/gk_mainargs: --makeopts=-j16 --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-1.1* + app-laptop/laptop-mode-tools + 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 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/kismet + 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