From 7555cecbdcfd018e7ab581a9462c33731069780e Mon Sep 17 00:00:00 2001
From: Lars Weiler <pylon@gentoo.org>
Date: Mon, 14 Mar 2005 22:58:42 +0000
Subject: [PATCH] slight updates

svn path=/trunk/; revision=92
---
 specs/2005.0/ppc/livecd-stage1.spec | 10 ++++------
 specs/2005.0/ppc/livecd-stage2.spec | 26 ++++++++++++++++----------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/specs/2005.0/ppc/livecd-stage1.spec b/specs/2005.0/ppc/livecd-stage1.spec
index d786a345..e554968a 100644
--- a/specs/2005.0/ppc/livecd-stage1.spec
+++ b/specs/2005.0/ppc/livecd-stage1.spec
@@ -1,4 +1,5 @@
 target: livecd-stage1
+profile: default-linux/ppc/2005.0
 
 livecd/use: 
 	-* 
@@ -16,7 +17,6 @@ livecd/packages:
 	baselayout
 	bind-tools
 	coldplug
-	cryptsetup
 	curl
 	cvs
 	device-mapper
@@ -26,10 +26,11 @@ livecd/packages:
 	ethtool
 	ftp
 	gentoolkit
+	gentoo-sources
 	gpm
 	hdparm
 	hfsplusutils
-	hfsutils	
+	hfsutils
 	host
 	hotplug
 	iptables
@@ -41,14 +42,12 @@ livecd/packages:
 	less
 	links
 	livecd-tools
-	logrotate
 	lsof
 	lvm2
 	lynx
 	lzo 
 	mac-fdisk
 	memtester
-	metalog
 	mingetty
 	mirrorselect
 	module-init-tools
@@ -66,10 +65,8 @@ livecd/packages:
 	pwgen
 	raidtools
 	reiserfsprogs
-	reiserfsprogs
 	rp-pppoe
 	screen
-	snmp
 	syslog-ng
 	ucl
 	udev
@@ -82,3 +79,4 @@ livecd/packages:
 	wireless-tools
 	xfsprogs
 	yaboot
+	genkernel
diff --git a/specs/2005.0/ppc/livecd-stage2.spec b/specs/2005.0/ppc/livecd-stage2.spec
index 21ae0582..0ee6530a 100644
--- a/specs/2005.0/ppc/livecd-stage2.spec
+++ b/specs/2005.0/ppc/livecd-stage2.spec
@@ -3,22 +3,29 @@ target: livecd-stage2
 livecd/cdfstype: squashfs
 livecd/archscript: livecd/runscript/ppc-archscript.sh
 livecd/runscript: livecd/runscript/default-runscript.sh
-livecd/cdtar: livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2
+livecd/cdtar: livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
+
+boot/kernel: G3G4
+
+boot/kernel/G3G4/sources: sys-kernel/gentoo-sources
+boot/kernel/G3G4/use: extlib pcmcia usb -X
+boot/kernel/G3G4/config: /usr/src/configs/G3G4-SMP
+boot/kernel/G3G4/extraversion: G3G4-SMP-livecd
+boot/kernel/G3G4/packages:
+	cryptsetup
 
-boot/kernel: G4-SMP
-boot/kernel/G4/use: extlib usb -X
-boot/kernel/G4/extraversion: G4-SMP
 boot/kernel/G5/sources: sys-kernel/gentoo-sources
 boot/kernel/G5/use: extlib usb -X
 boot/kernel/G5/config: /usr/src/configs/G5-SMP
-boot/kernel/G5/extraversion: G5-SMP
+boot/kernel/G5/extraversion: G5-SMP-livecd
+
 boot/kernel/Pegasos/sources: sys-kernel/pegasos-sources
 boot/kernel/Pegasos/config: /usr/src/configs/Pegasos-SMP
 boot/kernel/Pegasos/use: extlib usb -X
-boot/kernel/Pegasos/extraversion: Pegasos-SMP
+boot/kernel/Pegasos/extraversion: Pegasos-SMP-livecd
 
-livecd/iso:
-	gentoo.iso
+livecd/iso: install-ppc-minimal-2005.0.iso
+livecd/volid: Gentoo Linux 2005.0 ppc
 
 livecd/devmanager: udev
 
@@ -36,7 +43,6 @@ livecd/unmerge:
 	m4
 	bison
 	ccache
-	distcc
 	make
 	perl
 	patch
@@ -55,7 +61,6 @@ livecd/unmerge:
 	python
 	miscfiles
 	rsync
-	sysklogd
 	bc
 	lcms
 	libmng
@@ -209,6 +214,7 @@ livecd/rm:
 	/etc/man.conf
 	/etc/*.old
 	/root/.viminfo
+	/root/.bash_history
 	/usr/sbin/bootsplash*
 	/usr/sbin/fb*
 	/usr/sbin/fsck.cramfs