From eb1919cf619517d30cce0d333bdf5fbaf4cb8f7f Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Date: Wed, 23 Sep 2009 02:41:42 +0000
Subject: [PATCH] Reverted the variables changes.

svn path=/trunk/; revision=708
---
 releases/10.0/specs/amd64/livedvd-stage1.spec    |  4 +---
 releases/10.0/specs/amd64/livedvd-stage2.spec    | 11 ++++-------
 releases/10.0/specs/x86/i686/livedvd-stage1.spec |  4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/releases/10.0/specs/amd64/livedvd-stage1.spec b/releases/10.0/specs/amd64/livedvd-stage1.spec
index 98a0a6f8..9ca11091 100644
--- a/releases/10.0/specs/amd64/livedvd-stage1.spec
+++ b/releases/10.0/specs/amd64/livedvd-stage1.spec
@@ -1,5 +1,3 @@
-releng_root_dir=/var/svnroot/releng/trunk/
-
 subarch: amd64
 version_stamp: 10.0
 target: livecd-stage1
@@ -7,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/10.0/desktop
 snapshot: 20090921
 source_subpath: default/stage3-amd64-desktop-10.0
-portage_confdir: ${portage_root_dir}/releases/10.0/portage/
+portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage/
 
 livecd/use:
 	branding
diff --git a/releases/10.0/specs/amd64/livedvd-stage2.spec b/releases/10.0/specs/amd64/livedvd-stage2.spec
index 5b57d51b..f0daaf40 100644
--- a/releases/10.0/specs/amd64/livedvd-stage2.spec
+++ b/releases/10.0/specs/amd64/livedvd-stage2.spec
@@ -1,6 +1,3 @@
-releng_root_dir=/var/svnroot/releng/trunk
-build_root_dir=/tmp/catalyst/builds
-
 subarch: amd64
 version_stamp: 10.0
 target: livecd-stage2
@@ -11,7 +8,7 @@ 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: ${releng_root_dir}/releases/10.0/scripts/livecd.sh
+#livecd/fsscript: /var/svnroot/releng/trunk/releases/10.0/scripts/livecd.sh
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
 livecd/iso: ${build_root_dir}/default/livedvd-amd64-10.0.iso
@@ -23,12 +20,12 @@ livecd/rcadd:
 	hald|default
 	dbus|default
 
-#livecd/overlay: ${releng_root_dir}/releases/10.0/overlays/common/overlay/livecd
-livecd/root_overlay: ${releng_root_dir}/releases/10.0/livecd/root_overlay
+#livecd/overlay: /var/svnroot/releng/trunk/releases/10.0/overlays/common/overlay/livecd
+livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config:  ${releng_root_dir}/releases/10.0/kconfig/amd64/installcd-2.6.30.config
+boot/kernel/gentoo/config:  /var/svnroot/releng/trunk/releases/10.0/kconfig/amd64/installcd-2.6.30.config
 boot/kernel/gentoo/use:
 	atm
 	fbcondecor
diff --git a/releases/10.0/specs/x86/i686/livedvd-stage1.spec b/releases/10.0/specs/x86/i686/livedvd-stage1.spec
index 2c51e952..4d1d4aa9 100644
--- a/releases/10.0/specs/x86/i686/livedvd-stage1.spec
+++ b/releases/10.0/specs/x86/i686/livedvd-stage1.spec
@@ -1,5 +1,3 @@
-releng_root_dir=/var/svnroot/releng/trunk/                                                                                   
-
 subarch: i686
 version_stamp: 10.0
 target: livecd-stage1
@@ -7,7 +5,7 @@ rel_type: default
 profile: default/linux/x86/10.0/desktop
 snapshot: 20090921
 source_subpath: default/stage3-i686-desktop-10.0
-portage_confdir: ${portage_root_dir}/releases/10.0/portage/
+portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage
 
 livecd/use:
 	branding