From 707b8348a358d88db09d3bb47dbde578bb64b8c3 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 9 Feb 2007 23:03:20 +0000 Subject: [PATCH] Sync AMD64 LiveCD spec files with x86 and verify packages that were commented out last release to ensure they haven't been keyworded since. svn path=/trunk/; revision=245 --- specs/2007.0/ChangeLog | 7 +++- specs/2007.0/amd64/livecd-stage1-gnome.spec | 37 +++++---------------- specs/2007.0/amd64/livecd-stage2-gnome.spec | 24 ++++++++----- 3 files changed, 29 insertions(+), 39 deletions(-) diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index f7af219f..b050e6a2 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.19 2007-02-09 22:49:56 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.20 2007-02-09 23:03:20 wolf31o2 Exp $ + + 09 Feb 2007; Chris Gianelloni + amd64/livecd-stage1-gnome.spec, amd64/livecd-stage2-gnome.spec: + Sync AMD64 LiveCD spec files with x86 and verify packages that were + commented out last release to ensure they haven't been keyworded since. 09 Feb 2007; Chris Gianelloni alpha/livecd-stage2-gnome.spec: diff --git a/specs/2007.0/amd64/livecd-stage1-gnome.spec b/specs/2007.0/amd64/livecd-stage1-gnome.spec index b75f085c..5cf3061f 100644 --- a/specs/2007.0/amd64/livecd-stage1-gnome.spec +++ b/specs/2007.0/amd64/livecd-stage1-gnome.spec @@ -4,7 +4,7 @@ target: livecd-stage1 rel_type: default profile: default-linux/amd64/2007.0/desktop snapshot: 2007.0 -source_subpath: default/stage3-amd64-2007.0 +source_subpath: default/stage3-amd64-desktop-2007.0 livecd/use: atm branding @@ -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-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,22 +76,21 @@ livecd/packages: sys-apps/ethtool sys-apps/fxload sys-apps/gli - 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/lssbus 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 sys-apps/smartmontools # sys-block/gpart - sys-block/gparted # sys-block/partimage # sys-boot/aboot sys-boot/grub @@ -115,7 +100,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 @@ -128,7 +112,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 @@ -136,15 +119,11 @@ 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/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/amd64/livecd-stage2-gnome.spec b/specs/2007.0/amd64/livecd-stage2-gnome.spec index 3b19ab05..7ba20052 100644 --- a/specs/2007.0/amd64/livecd-stage2-gnome.spec +++ b/specs/2007.0/amd64/livecd-stage2-gnome.spec @@ -7,7 +7,7 @@ snapshot: 2007.0 source_subpath: default/livecd-stage1-amd64-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-amd64-installer-2007.0.iso livecd/splash_type: gensplash livecd/splash_theme: livecd-2007.0 @@ -23,27 +23,33 @@ livecd/overlay: /root/livecd/overlays/livecd/2007.0 livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/bootargs: dokeymap -livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 -#--unionfs-dev +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/amd64/livecd-2.6.17.config +boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/amd64/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 - sys-power/acpid - sys-fs/cryptsetup-luks - net-wireless/rt2500 -# net-wireless/ipw3945 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