Added some vars to the spec files to make it easier to change locations and fixed whitespace.

svn path=/trunk/; revision=707

releases/10.0/specs/amd64/livedvd-stage1.spec

@@ -1,3 +1,5 @@
+releng_root_dir=/var/svnroot/releng/trunk/
+
 subarch: amd64
 version_stamp: 10.0
 target: livecd-stage1
@@ -5,7 +7,7 @@ rel_type: default
 profile: default/linux/amd64/10.0/desktop
 snapshot: 20090921
 source_subpath: default/stage3-amd64-desktop-10.0
-portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage/
+portage_confdir: ${portage_root_dir}/releases/10.0/portage/
 
 livecd/use:
 	branding

releases/10.0/specs/amd64/livedvd-stage2.spec

@@ -1,3 +1,6 @@
+releng_root_dir=/var/svnroot/releng/trunk
+build_root_dir=/tmp/catalyst/builds
+
 subarch: amd64
 version_stamp: 10.0
 target: livecd-stage2
@@ -8,10 +11,10 @@ source_subpath: default/livecd-stage1-amd64-10.0
 
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
-#livecd/fsscript: /var/svnroot/releng/trunk/releases/10.0/scripts/livecd.sh
+#livecd/fsscript: ${releng_root_dir}/releases/10.0/scripts/livecd.sh
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
-livecd/iso: /tmp/catalyst/builds/default/livedvd-amd64-10.0.iso
+livecd/iso: ${build_root_dir}/default/livedvd-amd64-10.0.iso
 livecd/type: gentoo-release-livecd
 livecd/volid: Gentoo Linux 10.0 amd64 LiveDVD
 livecd/xsession: default
@@ -20,12 +23,12 @@ livecd/rcadd:
 	hald|default
 	dbus|default
 
-#livecd/overlay: /var/svnroot/releng/trunk/releases/10.0/overlays/common/overlay/livecd
+#livecd/overlay: ${releng_root_dir}/releases/10.0/overlays/common/overlay/livecd
-livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
+livecd/root_overlay: ${releng_root_dir}/releases/10.0/livecd/root_overlay
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config:  /var/svnroot/releng/trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config
+boot/kernel/gentoo/config:  ${releng_root_dir}/releases/10.0/kconfig/amd64/installcd-2.6.30.config
 boot/kernel/gentoo/use:
 	atm
 	fbcondecor
@@ -34,7 +37,6 @@ boot/kernel/gentoo/use:
 	portaudio
 	truetype
 	usb
-boot/kernel/gentoo/use: atm fbcondecor mng png portaudio truetype usb
 boot/kernel/gentoo/packages:
 	app-accessibility/espeakup
 # keywords.
@@ -56,8 +58,6 @@ boot/kernel/gentoo/packages:
 	net-wireless/zd1201-firmware
 	net-wireless/zd1211-firmware                                                           
 	sys-block/iscsitarget
-        net-wireless/zd1211-firmware
-        sys-block/iscsitarget
 	sys-block/open-iscsi
 	net-misc/openswan
 # failed

releases/10.0/specs/x86/i686/livedvd-stage1.spec

@@ -1,3 +1,5 @@
+releng_root_dir=/var/svnroot/releng/trunk/                                                                                   
+
 subarch: i686
 version_stamp: 10.0
 target: livecd-stage1
@@ -5,7 +7,7 @@ rel_type: default
 profile: default/linux/x86/10.0/desktop
 snapshot: 20090921
 source_subpath: default/stage3-i686-desktop-10.0
-portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage
+portage_confdir: ${portage_root_dir}/releases/10.0/portage/
 
 livecd/use:
 	branding