Reverted the variables changes.

svn path=/trunk/; revision=708
This commit is contained in:
Jorge Manuel B. S. Vicetto 2009-09-23 02:41:42 +00:00
parent 08f56255ac
commit eb1919cf61
3 changed files with 6 additions and 13 deletions

View file

@ -1,5 +1,3 @@
releng_root_dir=/var/svnroot/releng/trunk/
subarch: amd64 subarch: amd64
version_stamp: 10.0 version_stamp: 10.0
target: livecd-stage1 target: livecd-stage1
@ -7,7 +5,7 @@ rel_type: default
profile: default/linux/amd64/10.0/desktop profile: default/linux/amd64/10.0/desktop
snapshot: 20090921 snapshot: 20090921
source_subpath: default/stage3-amd64-desktop-10.0 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: livecd/use:
branding branding

View file

@ -1,6 +1,3 @@
releng_root_dir=/var/svnroot/releng/trunk
build_root_dir=/tmp/catalyst/builds
subarch: amd64 subarch: amd64
version_stamp: 10.0 version_stamp: 10.0
target: livecd-stage2 target: livecd-stage2
@ -11,7 +8,7 @@ source_subpath: default/livecd-stage1-amd64-10.0
livecd/bootargs: dokeymap livecd/bootargs: dokeymap
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 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/fstype: squashfs
livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8 livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
livecd/iso: ${build_root_dir}/default/livedvd-amd64-10.0.iso livecd/iso: ${build_root_dir}/default/livedvd-amd64-10.0.iso
@ -23,12 +20,12 @@ livecd/rcadd:
hald|default hald|default
dbus|default dbus|default
#livecd/overlay: ${releng_root_dir}/releases/10.0/overlays/common/overlay/livecd #livecd/overlay: /var/svnroot/releng/trunk/releases/10.0/overlays/common/overlay/livecd
livecd/root_overlay: ${releng_root_dir}/releases/10.0/livecd/root_overlay livecd/root_overlay: /var/svnroot/releng/trunk/releases/10.0/livecd/root_overlay
boot/kernel: gentoo boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources 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: boot/kernel/gentoo/use:
atm atm
fbcondecor fbcondecor

View file

@ -1,5 +1,3 @@
releng_root_dir=/var/svnroot/releng/trunk/
subarch: i686 subarch: i686
version_stamp: 10.0 version_stamp: 10.0
target: livecd-stage1 target: livecd-stage1
@ -7,7 +5,7 @@ rel_type: default
profile: default/linux/x86/10.0/desktop profile: default/linux/x86/10.0/desktop
snapshot: 20090921 snapshot: 20090921
source_subpath: default/stage3-i686-desktop-10.0 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: livecd/use:
branding branding