Fix the stages name and move from 2008.0 name to latest.

Added app-arch/xz-utils to installcd specs - bug 347557.
Synced the hardened installcd specs to the default installcd specs.

svn path=/trunk/; revision=765

releases/weekly/specs/x86/hardened/installcd-stage1.spec

@@ -4,7 +4,7 @@ target: livecd-stage1
 rel_type: hardened
 profile: hardened/linux/x86
 snapshot: 2008.0
-source_subpath: hardened/stage3-x86-hardened-2008.0
+source_subpath: hardened/stage3-x86-hardened-latest
 livecd/use:
 	-*
 	deprecated
@@ -29,6 +29,7 @@ livecd/packages:
 	app-admin/pwgen
 	app-admin/syslog-ng
 	app-arch/unzip
+	app-arch/xz-utils
 	app-crypt/gnupg
 	app-editors/zile
 	app-misc/screen

releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec

@@ -9,17 +9,45 @@ source_subpath: hardened/livecd-stage1-x86-hardened-2008.0
 livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
-livecd/gk_mainargs: --lvm --dmraid --evms --mdadm
+livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8
-livecd/iso: /var/tmp/catalyst/builds/default/install-x86-minimal-2008.0.iso
+livecd/iso: /release/buildroot/x86-dev/builds/hardened/install-x86-minimal-2008.0.iso
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo Linux x86 2008.0
 
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /var/cvsroot/gentoo/src/releng/kconfig/2008.0/x86/hardened/installcd-2.6.20.config
+boot/kernel/gentoo/config: /release/svn-releng/trunk/releases/weekly/kconfig/x86/hardened/installcd-2.6.20.config
 boot/kernel/gentoo/use:
 	-*
+	alsa
+	alsa_pcm_plugins_adpcm
+	alsa_pcm_plugins_alaw
+	alsa_pcm_plugins_asym
+	alsa_pcm_plugins_copy
+	alsa_pcm_plugins_dmix
+	alsa_pcm_plugins_dshare
+	alsa_pcm_plugins_dsnoop
+	alsa_pcm_plugins_empty
+	alsa_pcm_plugins_extplug
+	alsa_pcm_plugins_file
+	alsa_pcm_plugins_hooks
+	alsa_pcm_plugins_iec958
+	alsa_pcm_plugins_ioplug
+	alsa_pcm_plugins_ladspa
+	alsa_pcm_plugins_lfloat
+	alsa_pcm_plugins_linear
+	alsa_pcm_plugins_meter
+	alsa_pcm_plugins_mmap_emul
+	alsa_pcm_plugins_mulaw
+	alsa_pcm_plugins_multi
+	alsa_pcm_plugins_null
+	alsa_pcm_plugins_plug
+	alsa_pcm_plugins_rate
+	alsa_pcm_plugins_route
+	alsa_pcm_plugins_share
+	alsa_pcm_plugins_shm
+	alsa_pcm_plugins_softvol
 	atm
 	deprecated
 	fbcon
@@ -28,7 +56,9 @@ boot/kernel/gentoo/use:
 	livecd
 	loop-aes
 	lvm1
+	midi
 	mng
+	modules
 	ncurses
 #	nls
 	nptl
@@ -43,14 +73,15 @@ boot/kernel/gentoo/use:
 	usb
 
 boot/kernel/gentoo/packages:
+### These need to be added for software speech.
+	app-accessibility/espeakup
+	media-libs/alsa-oss
+	media-sound/alsa-utils
 	net-dialup/slmodem
 	net-dialup/globespan-adsl
 	net-wireless/hostap-utils
 #	net-dialup/fritzcapi
 #	net-dialup/fcdsl
-	net-wireless/rt2500
-	net-wireless/acx
-	net-wireless/ipw3945
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g
 
@@ -88,7 +119,8 @@ livecd/unmerge:
 	sys-devel/binutils-config
 	sys-devel/bison
 	sys-devel/flex
-	sys-devel/gcc
+# This might be needed for software speech.
+#	sys-devel/gcc
 	sys-devel/gcc-config
 	sys-devel/gettext
 	sys-devel/gnuconfig
@@ -120,9 +152,9 @@ livecd/empty:
 	/tmp
 	/usr/diet/include
 	/usr/diet/man
-	/usr/i386-gentoo-linux-uclibc
+	/usr/i?86-gentoo-linux-uclibc
-	/usr/i386-pc-linux-gnu
+	/usr/i?86-pc-linux-gnu
-	/usr/i386-pc-linux-uclibc
+	/usr/i?86-pc-linux-uclibc
 	/usr/include
 	/usr/lib/X11/config
 	/usr/lib/X11/doc
@@ -242,8 +274,8 @@ livecd/rm:
 	/usr/bin/gcc*
 	/usr/bin/genkernel
 	/usr/bin/gprof
-	/usr/bin/i386-gentoo-linux-uclibc-*
+	/usr/bin/i?86-gentoo-linux-uclibc-*
-	/usr/bin/i386-pc-linux-*
+	/usr/bin/i?86-pc-linux-*
 	/usr/bin/jpegtran
 	/usr/bin/ld
 	/usr/bin/libpng*

releases/weekly/specs/x86/hardened/stage1.spec

@@ -4,4 +4,4 @@ version_stamp: hardened-2008.0
 rel_type: hardened
 profile: hardened/linux/x86
 snapshot: 2008.0
-source_subpath: hardened/stage3-i686-hardened-2008.0
+source_subpath: hardened/stage3-i686-hardened-latest

releases/weekly/specs/x86/i686/stage1.spec

@@ -4,4 +4,4 @@ version_stamp: 2008.0
 rel_type: default
 profile: default/linux/x86/10.0
 snapshot: 2008.0
-source_subpath: default/stage3-i686-2008.0
+source_subpath: default/stage3-i686-latest

releases/weekly/specs/x86/installcd-stage1.spec

@@ -4,7 +4,7 @@ target: livecd-stage1
 rel_type: default
 profile: default/linux/x86/10.0
 snapshot: 2008.0
-source_subpath: default/stage3-i486-2008.0
+source_subpath: default/stage3-i486-latest
 livecd/use:
 	-*
 	deprecated
@@ -29,6 +29,7 @@ livecd/packages:
 	app-admin/pwgen
 	app-admin/syslog-ng
 	app-arch/unzip
+	app-arch/xz-utils
 	app-crypt/gnupg
 	app-editors/zile
 	app-misc/screen

releases/weekly/specs/x86/installcd-stage2-minimal.spec

@@ -84,11 +84,6 @@ boot/kernel/gentoo/packages:
 	net-wireless/hostap-utils
 #	net-dialup/fritzcapi
 #	net-dialup/fcdsl
-### Compile failure and in-kernel
-#	net-wireless/rt2500
-#	net-wireless/acx
-### In-kernel
-#	net-wireless/ipw3945
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g
 

releases/weekly/specs/x86/stage1.spec

@@ -4,4 +4,4 @@ version_stamp: 2008.0
 rel_type: default
 profile: default/linux/x86/10.0
 snapshot: 2008.0
-source_subpath: default/stage3-x86-2008.0
+source_subpath: default/stage3-i486-latest