From 2537d68c7d769af862da9a33f55545a4544b78d4 Mon Sep 17 00:00:00 2001 From: Robert Seaton Date: Tue, 5 Jul 2011 10:32:54 -0500 Subject: Update spec files, currently results in successful builds. --- livecd-stage1.spec | 2 +- livecd-stage2.spec | 14 +++++++------- stage1.spec | 2 +- stage2.spec | 2 +- stage3.spec | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/livecd-stage1.spec b/livecd-stage1.spec index 651ef63..2b3a83a 100755 --- a/livecd-stage1.spec +++ b/livecd-stage1.spec @@ -5,7 +5,7 @@ rel_type: default profile: default/linux/x86/10.0 snapshot: latest source_subpath: default/stage3-i486-0.1 -portage_confdir: /home/robb/glentoo/livecd-overlay/etc/portage +portage_confdir: /home/robb/spec/livecd-overlay/etc/portage livecd/use: -* deprecated diff --git a/livecd-stage2.spec b/livecd-stage2.spec index 4072a97..9c0c654 100755 --- a/livecd-stage2.spec +++ b/livecd-stage2.spec @@ -10,21 +10,21 @@ livecd/bootargs: dokeymap livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 livecd/fstype: squashfs livecd/gk_mainargs: --dmraid --mdadm --makeopts=-j8 -livecd/iso: /tmp/glentoo-x86-minimal.iso +livecd/iso: /tmp/plan9-from-gentoo-x86-minimal.iso livecd/type: gentoo-release-minimal -livecd/volid: Glentoo 0.1 +livecd/volid: Plan 9 From Gentoo 0.1 livecd/rcadd: udev|sysinit portage_overlay: /usr/local/portage +livecd/users: gentoo boot/kernel: gentoo -portage_confdir: /home/robb/glentoo/livecd-overlay/etc/portage - -livecd/xinitrc: /home/robb/glentoo/livecd-overlay/home/root/.xinitrc +portage_confdir: /home/robb/spec/livecd-overlay/etc/portage +livecd/root_overlay: /home/robb/spec/livecd-overlay boot/kernel/gentoo/sources: glendix-sources -boot/kernel/gentoo/config: /home/robb/glentoo/installcd-2.6.31.config +boot/kernel/gentoo/config: /home/robb/spec/installcd-2.6.31.config boot/kernel/gentoo/use: # -* alsa @@ -239,7 +239,7 @@ livecd/rm: /boot/System* /boot/initr* /boot/kernel* - /etc/*- +# /etc/*- /etc/*.old /etc/default/audioctl /etc/dispatch-conf.conf diff --git a/stage1.spec b/stage1.spec index 4538afb..907a673 100755 --- a/stage1.spec +++ b/stage1.spec @@ -4,5 +4,5 @@ target: stage1 rel_type: default profile: default/linux/x86/10.0 snapshot: latest -source_subpath: stage3-i486-20110614 +source_subpath: stage3-i486-20110607 #portage_confdir: /home/robb/glentoo/etc/portage \ No newline at end of file diff --git a/stage2.spec b/stage2.spec index d481047..0f6fc0d 100755 --- a/stage2.spec +++ b/stage2.spec @@ -5,4 +5,4 @@ rel_type: default profile: default/linux/x86/10.0 snapshot: latest source_subpath: default/stage1-i486-0.1 -portage_confdir: /home/robb/glentoo/livecd-overlay/etc/portage \ No newline at end of file +portage_confdir: /home/robb/spec/livecd-overlay/etc/portage \ No newline at end of file diff --git a/stage3.spec b/stage3.spec index 9623510..969dd94 100755 --- a/stage3.spec +++ b/stage3.spec @@ -3,7 +3,7 @@ target: stage3 version_stamp: 0.1 rel_type: default profile: default/linux/x86/10.0 -snapshot: 20110610 +snapshot: latest source_subpath: default/stage2-i486-0.1 -portage_confdir: /home/robb/glentoo/livecd-overlay/etc/portage +portage_confdir: /home/robb/spec/livecd-overlay/etc/portage portage_overlay: /usr/local/portage \ No newline at end of file -- cgit v1.2.3-65-gdbad