From a706be455936f346a60fc63658d35d048c3e4eaf Mon Sep 17 00:00:00 2001 From: Jason Huebel Date: Wed, 27 Oct 2004 20:29:26 +0000 Subject: [PATCH] updated for (hopefully) final 2004.3 specifications svn path=/trunk/; revision=36 --- specs/2004.3/amd64/livecd-stage1.spec | 14 ++++++++------ specs/2004.3/amd64/livecd-stage2.spec | 25 +++++++++++++++---------- specs/2004.3/amd64/packagecd.spec | 4 ++-- specs/2004.3/amd64/stage1.spec | 6 +++--- specs/2004.3/amd64/stage2.spec | 8 ++++---- specs/2004.3/amd64/stage3.spec | 8 ++++---- 6 files changed, 36 insertions(+), 29 deletions(-) diff --git a/specs/2004.3/amd64/livecd-stage1.spec b/specs/2004.3/amd64/livecd-stage1.spec index 0ce75c0d..c018694f 100644 --- a/specs/2004.3/amd64/livecd-stage1.spec +++ b/specs/2004.3/amd64/livecd-stage1.spec @@ -1,12 +1,10 @@ -# $Id: livecd-stage1.spec,v 1.5 2004-10-25 22:45:10 jhuebel Exp $ - subarch: amd64 version_stamp: 2004.3 target: livecd-stage1 rel_type: default profile: default-linux/amd64/2004.3 -snapshot: 20041011 -source_subpath: default/stage3-amd64-20041011 +snapshot: 20041025 +source_subpath: default/stage3-amd64-20041025 livecd/use: -* ipv6 @@ -24,10 +22,13 @@ livecd/packages: mingetty module-init-tools dhcpcd + udev gentoo-dev-sources kudzu-knoppix hotplug fxload + irssi + gpm syslog-ng parted links @@ -35,10 +36,11 @@ livecd/packages: nfs-utils jfsutils usbutils + pciutils xfsprogs e2fsprogs reiserfsprogs -# cryptsetup + cryptsetup pwgen popt dialog @@ -47,11 +49,11 @@ livecd/packages: mirrorselect # penggy iputils - acpid hwdata-knoppix hwsetup device-mapper lvm2 + evms vim pptpclient mdadm diff --git a/specs/2004.3/amd64/livecd-stage2.spec b/specs/2004.3/amd64/livecd-stage2.spec index 803c25cd..12eb7ad0 100644 --- a/specs/2004.3/amd64/livecd-stage2.spec +++ b/specs/2004.3/amd64/livecd-stage2.spec @@ -1,36 +1,44 @@ -# $Id: livecd-stage2.spec,v 1.7 2004-10-25 22:45:10 jhuebel Exp $ - subarch: amd64 version_stamp: 2004.3 target: livecd-stage2 rel_type: default profile: default-linux/amd64/2004.3 -snapshot: 20041011 +snapshot: 20041025 source_subpath: default/livecd-stage1-amd64-2004.3 -livecd/cdfstype: zisofs +livecd/cdfstype: squashfs livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2 -livecd/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-20041013.iso +livecd/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-20041026.iso +#livecd/splash_type: gensplash +#livecd/splash_theme: livecd-2004.3 livecd/type: gentoo-release-minimal livecd/modblacklist: 8139cp +#livecd/overlay: /root/livecd/overlay-minimal + +livecd/devmanager: udev + livecd/rcadd: syslog-ng:default + gpm:default boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-dev-sources - boot/kernel/gentoo/config: kconfig/kernel-2.6.8-amd64-smp +boot/kernel/gentoo/use: pcmcia usb -X -boot/kernel/gentoo/use: pcmcia usb +#boot/kernel/gentoo/postconf: +# splashutils +# splash-themes-livecd boot/kernel/gentoo/packages: pcmcia-cs speedtouch + globespan-adsl hostap-driver hostap-utils ipw2100 @@ -69,7 +77,6 @@ livecd/unmerge: bc lcms libmng - libpng genkernel diffutils file @@ -85,7 +92,6 @@ livecd/unmerge: grub help2man libtool - which livecd/empty: /var/tmp @@ -266,6 +272,5 @@ livecd/rm: /etc/bootsplash/livecd-2004.2/images/silent-12* /etc/bootsplash/livecd-2004.2/images/silent-16* /etc/bootsplash/livecd-2004.2/images/silent-8* - /etc/bootsplash/livecd-2004.2/images/bootplash* /etc/make.conf.example /etc/make.globals diff --git a/specs/2004.3/amd64/packagecd.spec b/specs/2004.3/amd64/packagecd.spec index 282ee4a5..1bb63c8f 100644 --- a/specs/2004.3/amd64/packagecd.spec +++ b/specs/2004.3/amd64/packagecd.spec @@ -3,8 +3,8 @@ version_stamp: 2004.3 target: grp rel_type: default profile: default-linux/amd64/2004.3 -snapshot: 20041022 -source_subpath: default/stage3-amd64-20041011 +snapshot: 20041025 +source_subpath: default/stage3-amd64-20041025 grp: src cd2 grp/use: diff --git a/specs/2004.3/amd64/stage1.spec b/specs/2004.3/amd64/stage1.spec index be9b62b1..0f90d9fd 100644 --- a/specs/2004.3/amd64/stage1.spec +++ b/specs/2004.3/amd64/stage1.spec @@ -1,10 +1,10 @@ -# $Id: stage1.spec,v 1.7 2004-10-25 22:45:10 jhuebel Exp $ +# $Id: stage1.spec,v 1.8 2004-10-27 20:29:26 jhuebel Exp $ subarch: amd64 -version_stamp: 20041025 +version_stamp: 2004.3 target: stage1 rel_type: default rel_verson: 2004.3 profile: default-linux/amd64/2004.3 -snapshot: 20041025 +snapshot: 20041022 source_subpath: default/stage2-amd64-20040928 diff --git a/specs/2004.3/amd64/stage2.spec b/specs/2004.3/amd64/stage2.spec index fe241610..08746994 100644 --- a/specs/2004.3/amd64/stage2.spec +++ b/specs/2004.3/amd64/stage2.spec @@ -1,10 +1,10 @@ -# $Id: stage2.spec,v 1.6 2004-10-25 22:45:10 jhuebel Exp $ +# $Id: stage2.spec,v 1.7 2004-10-27 20:29:26 jhuebel Exp $ subarch: amd64 -version_stamp: 20041025 +version_stamp: 2004.3 target: stage2 rel_type: default rel_version: 2004.3 profile: default-linux/amd64/2004.3 -snapshot: 20041025 -source_subpath: default/stage1-amd64-20041025 +snapshot: 20041022 +source_subpath: default/stage1-amd64-2004.3 diff --git a/specs/2004.3/amd64/stage3.spec b/specs/2004.3/amd64/stage3.spec index 60ac0711..fe203c26 100644 --- a/specs/2004.3/amd64/stage3.spec +++ b/specs/2004.3/amd64/stage3.spec @@ -1,10 +1,10 @@ -# $Id: stage3.spec,v 1.5 2004-10-25 22:45:10 jhuebel Exp $ +# $Id: stage3.spec,v 1.6 2004-10-27 20:29:26 jhuebel Exp $ subarch: amd64 -version_stamp: 20041025 +version_stamp: 2004.3 target: stage3 rel_type: default rel_version: 2004.3 profile: default-linux/amd64/2004.3 -snapshot: 20041025 -source_subpath: default/stage2-amd64-20041025 +snapshot: 20041022 +source_subpath: default/stage2-amd64-2004.3