From d80d7e26071a1e008a1e52f0cdf76ec138919f20 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 20 Apr 2007 14:57:59 +0000 Subject: [PATCH] Fixing the overlays for the IA64 LiveCD. svn path=/trunk/; revision=329 --- specs/2007.0/ChangeLog | 6 ++- specs/2007.0/amd64/livedvd-stage1-large.spec | 7 +-- specs/2007.0/ia64/livecd-stage1-gnome.spec | 57 ++++++++++---------- specs/2007.0/ia64/livecd-stage2-gnome.spec | 4 +- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index e8d4d9be..d5880123 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.72 2007-04-20 14:31:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.73 2007-04-20 14:57:59 wolf31o2 Exp $ + + 20 Apr 2007; Chris Gianelloni + ia64/livecd-stage2-gnome.spec: + Fixing the overlays for the IA64 LiveCD. 20 Apr 2007; Chris Gianelloni ppc/ppc32/g4/packages.spec: diff --git a/specs/2007.0/amd64/livedvd-stage1-large.spec b/specs/2007.0/amd64/livedvd-stage1-large.spec index ce5fe2ed..8c32c588 100644 --- a/specs/2007.0/amd64/livedvd-stage1-large.spec +++ b/specs/2007.0/amd64/livedvd-stage1-large.spec @@ -5,6 +5,7 @@ rel_type: default profile: default-linux/amd64/2007.0/desktop snapshot: 2007.0 source_subpath: default/stage3-amd64-2007.0 +distcc_hosts: localhost/7 192.168.0.239/3 livecd/use: branding livecd @@ -70,7 +71,7 @@ livecd/packages: app-shells/zsh app-shells/zsh-completion app-text/tetex - dev-util/anjuta +# dev-util/anjuta dev-util/ccache dev-util/cvs dev-util/indent @@ -149,7 +150,7 @@ livecd/packages: net-misc/whois net-nntp/pan net-p2p/bittorrent - net-p2p/limewire +# net-p2p/limewire net-print/cups net-proxy/dante net-proxy/tsocks @@ -202,7 +203,7 @@ livecd/packages: # sys-boot/aboot # sys-boot/elilo sys-boot/grub - sys-boot/lilo +# sys-boot/lilo sys-boot/syslinux # sys-boot/yaboot # sys-devel/binutils-hppa64 diff --git a/specs/2007.0/ia64/livecd-stage1-gnome.spec b/specs/2007.0/ia64/livecd-stage1-gnome.spec index cb17b46d..53248142 100644 --- a/specs/2007.0/ia64/livecd-stage1-gnome.spec +++ b/specs/2007.0/ia64/livecd-stage1-gnome.spec @@ -11,14 +11,14 @@ livecd/use: socks5 livecd/packages: - app-admin/ide-smart +# app-admin/ide-smart app-admin/logrotate - app-admin/passook +# app-admin/passook app-admin/pwgen app-admin/sudo app-admin/syslog-ng app-arch/mt-st - app-benchmarks/cpuburn +# app-benchmarks/cpuburn app-cdr/cdrkit app-crypt/gnupg app-editors/emacs @@ -26,27 +26,26 @@ livecd/packages: app-misc/livecd-tools app-misc/screen app-misc/vlock - app-office/openoffice +# app-office/openoffice app-portage/gentoolkit app-portage/mirrorselect app-portage/ufed dev-util/ccache gnome-base/gnome - mail-client/evolution mail-client/mozilla-thunderbird - media-gfx/fbgrab - media-sound/audacious +# media-gfx/fbgrab +# media-sound/audacious net-analyzer/netcat net-analyzer/nmap net-analyzer/tcpdump - net-analyzer/tcptraceroute +# net-analyzer/tcptraceroute net-analyzer/traceroute - net-dialup/bpalogin +# net-dialup/bpalogin net-dialup/mingetty net-dialup/minicom # net-dialup/penggy - net-dialup/pptpclient - net-dialup/rp-pppoe +# net-dialup/pptpclient +# net-dialup/rp-pppoe net-firewall/iptables net-fs/nfs-utils net-im/gaim @@ -56,17 +55,17 @@ livecd/packages: net-misc/dhcpcd net-misc/iputils net-misc/rdate - net-misc/vconfig +# net-misc/vconfig # net-misc/vpnc net-misc/whois - net-p2p/bittorrent +# net-p2p/bittorrent net-proxy/dante - net-proxy/tsocks +# net-proxy/tsocks # net-wireless/ipw2100-firmware # net-wireless/ipw2200-firmware - net-wireless/prism54-firmware - net-wireless/wireless-tools - net-wireless/wpa_supplicant +# net-wireless/prism54-firmware +# net-wireless/wireless-tools +# net-wireless/wpa_supplicant # net-wireless/zd1201-firmware # sys-apps/apmd sys-apps/eject @@ -79,22 +78,22 @@ livecd/packages: # sys-apps/ibm-powerpc-utils-papr sys-apps/iproute2 # sys-apps/lssbus - sys-apps/memtester - sys-apps/netplug +# sys-apps/memtester +# sys-apps/netplug sys-apps/parted # sys-apps/powerpc-utils - sys-apps/sdparm - sys-apps/sg3_utils +# sys-apps/sdparm +# sys-apps/sg3_utils sys-apps/slocate - sys-apps/smartmontools +# sys-apps/smartmontools # sys-block/gpart # sys-block/partimage # sys-block/qla-fc-firmware # sys-boot/aboot sys-boot/elilo - sys-boot/grub - sys-boot/lilo - sys-boot/syslinux +# sys-boot/grub +# sys-boot/lilo +# sys-boot/syslinux # sys-boot/yaboot # sys-devel/binutils-hppa64 sys-devel/distcc @@ -106,12 +105,12 @@ livecd/packages: # sys-fs/hfsutils # sys-fs/iprutils sys-fs/jfsutils - sys-fs/lsscsi - sys-fs/lvm2 +# sys-fs/lsscsi +# sys-fs/lvm2 # sys-fs/lvm-user # sys-fs/mac-fdisk sys-fs/mdadm - sys-fs/ntfsprogs +# sys-fs/ntfsprogs sys-fs/reiserfsprogs sys-fs/xfsprogs sys-kernel/genkernel @@ -121,7 +120,7 @@ livecd/packages: www-client/links www-client/mozilla-firefox x11-base/xorg-x11 - x11-drivers/synaptics +# x11-drivers/synaptics x11-misc/xscreensaver x11-themes/gdm-themes-livecd x11-themes/gentoo-artwork-livecd diff --git a/specs/2007.0/ia64/livecd-stage2-gnome.spec b/specs/2007.0/ia64/livecd-stage2-gnome.spec index 47e62920..3c5107de 100644 --- a/specs/2007.0/ia64/livecd-stage2-gnome.spec +++ b/specs/2007.0/ia64/livecd-stage2-gnome.spec @@ -19,8 +19,8 @@ livecd/type: gentoo-release-livecd livecd/users: gentoo livecd/volid: Gentoo Linux 2007.0 IA64 LiveCD -livecd/overlay: /root/livecd/overlays/livecd/2007.0_nostages -livecd/root_overlay: /root/livecd/overlays/root-livecd +livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd +livecd/root_overlay: /root/livecd/overlays/2007.0/common/root_overlay livecd/bootargs: dokeymap livecd/gk_mainargs: --makeopts=-j16 --dmraid --evms2 --unionfs-dev