Updated amd64 and x86 specs to address a few issues:

stop dropping strings and binutils symlinks - bug 330893
stop dropping /usr/include - bug 383609
drop dokeymap from livecd/bootargs - bug 378745
add rfkill to the installcd stage1 specs - bug 375343
add dmidecode to the installcd stage1 specs - bug 385771
change admincd version string.

svn path=/trunk/; revision=820

releases/weekly/specs/amd64/hardened/admincd-stage1.spec

@@ -124,6 +124,7 @@ livecd/packages:
 	net-wireless/iwl4965-ucode
 	net-wireless/iwl5000-ucode
 	net-wireless/prism54-firmware
+	net-wireless/rfkill
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
 	net-wireless/zd1201-firmware

releases/weekly/specs/amd64/hardened/admincd-stage2.spec

@@ -1,12 +1,12 @@
 subarch: amd64
-version_stamp: hardened-2008.0
+version_stamp: 2008.0
 target: livecd-stage2
 rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: hardened/admincd-stage1-amd64-2008.0
 
-livecd/bootargs: dokeymap
+#livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
@@ -79,6 +79,7 @@ boot/kernel/gentoo/packages:
 	media-libs/alsa-oss
 	media-sound/alsa-utils
 	net-dialup/globespan-adsl
+	sys-fs/ntfs3g
 
 # These were not stable at time of snapshot/release.
 #	net-wireless/rtl8180
@@ -159,7 +160,6 @@ livecd/empty:
 	/usr/i?86-gentoo-linux-uclibc
 	/usr/i?86-pc-linux-gnu
 	/usr/i?86-pc-linux-uclibc
-	/usr/include
 	/usr/lib/X11/config
 	/usr/lib/X11/doc
 	/usr/lib/X11/etc
@@ -296,10 +296,8 @@ livecd/rm:
 	/usr/bin/powerpc64-unknown-linux-gnu-*
 	/usr/bin/sparc-unknown-linux-gnu-*
 	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
 	/usr/bin/strip
 	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
 	/usr/bin/xpak
 	/usr/bin/yacc
 	/usr/lib*/*.a

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

@@ -65,12 +65,14 @@ livecd/packages:
 	net-wireless/iwl4965-ucode
 	net-wireless/iwl5000-ucode
 	net-wireless/prism54-firmware
+	net-wireless/rfkill
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
 	net-wireless/zd1201-firmware
 	net-wireless/zd1211-firmware
 	sys-apps/apmd
 	sys-block/eject
+	sys-apps/dmidecode
 	sys-apps/ethtool
 	sys-apps/fxload
 	sys-apps/hdparm

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

@@ -6,7 +6,7 @@ profile: default/linux/amd64/10.0/no-multilib
 snapshot: 2008.0
 source_subpath: default/livecd-stage1-amd64-2008.0
 
-livecd/bootargs: dokeymap
+#livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
@@ -79,6 +79,8 @@ boot/kernel/gentoo/packages:
 	media-libs/alsa-oss
 	media-sound/alsa-utils
 	net-dialup/globespan-adsl
+	sys-fs/ntfs3g
+
 # These were not stable at time of snapshot/release.
 #	net-wireless/rtl8180
 #	net-wireless/rtl8187
@@ -155,10 +157,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
 	/usr/lib/X11/etc
@@ -277,8 +278,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*
@@ -295,10 +296,8 @@ livecd/rm:
 	/usr/bin/powerpc64-unknown-linux-gnu-*
 	/usr/bin/sparc-unknown-linux-gnu-*
 	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
 	/usr/bin/strip
 	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
 	/usr/bin/xpak
 	/usr/bin/yacc
 	/usr/lib*/*.a

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

@@ -124,6 +124,7 @@ livecd/packages:
 	net-wireless/iwl4965-ucode
 	net-wireless/iwl5000-ucode
 	net-wireless/prism54-firmware
+	net-wireless/rfkill
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
 	net-wireless/zd1201-firmware

releases/weekly/specs/x86/hardened/admincd-stage2.spec

@@ -1,12 +1,12 @@
 subarch: x86
-version_stamp: hardened-2008.0
+version_stamp: 2008.0
 target: livecd-stage2
 rel_type: hardened
 profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: hardened/admincd-stage1-x86-2008.0
 
-livecd/bootargs: dokeymap
+#livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
@@ -79,6 +79,7 @@ boot/kernel/gentoo/packages:
 	media-libs/alsa-oss
 	media-sound/alsa-utils
 	net-dialup/globespan-adsl
+	sys-fs/ntfs3g
 
 # These were not stable at time of snapshot/release.
 #	net-wireless/rtl8180
@@ -159,7 +160,6 @@ livecd/empty:
 	/usr/i?86-gentoo-linux-uclibc
 	/usr/i?86-pc-linux-gnu
 	/usr/i?86-pc-linux-uclibc
-	/usr/include
 	/usr/lib/X11/config
 	/usr/lib/X11/doc
 	/usr/lib/X11/etc
@@ -296,10 +296,8 @@ livecd/rm:
 	/usr/bin/powerpc64-unknown-linux-gnu-*
 	/usr/bin/sparc-unknown-linux-gnu-*
 	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
 	/usr/bin/strip
 	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
 	/usr/bin/xpak
 	/usr/bin/yacc
 	/usr/lib*/*.a

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

@@ -62,12 +62,14 @@ livecd/packages:
 	net-wireless/iwl4965-ucode
 	net-wireless/iwl5000-ucode
 	net-wireless/prism54-firmware
+	net-wireless/rfkill
 	net-wireless/wireless-tools
 	net-wireless/wpa_supplicant
 	net-wireless/zd1201-firmware
 	net-wireless/zd1211-firmware
 	sys-apps/apmd
 	sys-block/eject
+	sys-apps/dmidecode
 	sys-apps/ethtool
 	sys-apps/fxload
 	sys-apps/hdparm

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

@@ -6,7 +6,7 @@ profile: default/linux/x86/10.0
 snapshot: 2008.0
 source_subpath: default/livecd-stage1-x86-2008.0
 
-livecd/bootargs: dokeymap
+#livecd/bootargs: dokeymap
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/fstype: squashfs
 livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
@@ -78,8 +78,6 @@ boot/kernel/gentoo/packages:
 	app-accessibility/espeakup
 	media-libs/alsa-oss
 	media-sound/alsa-utils
-### Compile failure w/ 2.6.24
-#	net-dialup/slmodem
 	net-dialup/globespan-adsl
 	net-wireless/hostap-utils
 #	net-dialup/fritzcapi
@@ -157,7 +155,6 @@ livecd/empty:
 	/usr/i?86-gentoo-linux-uclibc
 	/usr/i?86-pc-linux-gnu
 	/usr/i?86-pc-linux-uclibc
-	/usr/include
 	/usr/lib/X11/config
 	/usr/lib/X11/doc
 	/usr/lib/X11/etc
@@ -294,10 +291,8 @@ livecd/rm:
 	/usr/bin/powerpc64-unknown-linux-gnu-*
 	/usr/bin/sparc-unknown-linux-gnu-*
 	/usr/bin/sparc64-unknown-linux-gnu-*
-	/usr/bin/strings
 	/usr/bin/strip
 	/usr/bin/tbz2tool
-	/usr/bin/x86_64-pc-linux-gnu-*
 	/usr/bin/xpak
 	/usr/bin/yacc
 	/usr/lib*/*.a