| 1 |
Author: jmbsvicetto |
| 2 |
Date: 2011-10-30 12:34:55 +0000 (Sun, 30 Oct 2011) |
| 3 |
New Revision: 820 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
| 7 |
trunk/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
| 8 |
trunk/releases/weekly/specs/amd64/installcd-stage1.spec |
| 9 |
trunk/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
| 10 |
trunk/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 11 |
trunk/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 12 |
trunk/releases/weekly/specs/x86/installcd-stage1.spec |
| 13 |
trunk/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 14 |
Log: |
| 15 |
Updated amd64 and x86 specs to address a few issues: |
| 16 |
stop dropping strings and binutils symlinks - bug 330893 |
| 17 |
stop dropping /usr/include - bug 383609 |
| 18 |
drop dokeymap from livecd/bootargs - bug 378745 |
| 19 |
add rfkill to the installcd stage1 specs - bug 375343 |
| 20 |
add dmidecode to the installcd stage1 specs - bug 385771 |
| 21 |
change admincd version string. |
| 22 |
|
| 23 |
|
| 24 |
Modified: trunk/releases/weekly/specs/amd64/hardened/admincd-stage1.spec |
| 25 |
=================================================================== |
| 26 |
--- trunk/releases/weekly/specs/amd64/hardened/admincd-stage1.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 27 |
+++ trunk/releases/weekly/specs/amd64/hardened/admincd-stage1.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 28 |
@@ -124,6 +124,7 @@ |
| 29 |
net-wireless/iwl4965-ucode |
| 30 |
net-wireless/iwl5000-ucode |
| 31 |
net-wireless/prism54-firmware |
| 32 |
+ net-wireless/rfkill |
| 33 |
net-wireless/wireless-tools |
| 34 |
net-wireless/wpa_supplicant |
| 35 |
net-wireless/zd1201-firmware |
| 36 |
|
| 37 |
Modified: trunk/releases/weekly/specs/amd64/hardened/admincd-stage2.spec |
| 38 |
=================================================================== |
| 39 |
--- trunk/releases/weekly/specs/amd64/hardened/admincd-stage2.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 40 |
+++ trunk/releases/weekly/specs/amd64/hardened/admincd-stage2.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 41 |
@@ -1,12 +1,12 @@ |
| 42 |
subarch: amd64 |
| 43 |
-version_stamp: hardened-2008.0 |
| 44 |
+version_stamp: 2008.0 |
| 45 |
target: livecd-stage2 |
| 46 |
rel_type: hardened |
| 47 |
profile: hardened/linux/amd64 |
| 48 |
snapshot: 2008.0 |
| 49 |
source_subpath: hardened/admincd-stage1-amd64-2008.0 |
| 50 |
|
| 51 |
-livecd/bootargs: dokeymap |
| 52 |
+#livecd/bootargs: dokeymap |
| 53 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 54 |
livecd/fstype: squashfs |
| 55 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 56 |
@@ -79,6 +79,7 @@ |
| 57 |
media-libs/alsa-oss |
| 58 |
media-sound/alsa-utils |
| 59 |
net-dialup/globespan-adsl |
| 60 |
+ sys-fs/ntfs3g |
| 61 |
|
| 62 |
# These were not stable at time of snapshot/release. |
| 63 |
# net-wireless/rtl8180 |
| 64 |
@@ -159,7 +160,6 @@ |
| 65 |
/usr/i?86-gentoo-linux-uclibc |
| 66 |
/usr/i?86-pc-linux-gnu |
| 67 |
/usr/i?86-pc-linux-uclibc |
| 68 |
- /usr/include |
| 69 |
/usr/lib/X11/config |
| 70 |
/usr/lib/X11/doc |
| 71 |
/usr/lib/X11/etc |
| 72 |
@@ -296,10 +296,8 @@ |
| 73 |
/usr/bin/powerpc64-unknown-linux-gnu-* |
| 74 |
/usr/bin/sparc-unknown-linux-gnu-* |
| 75 |
/usr/bin/sparc64-unknown-linux-gnu-* |
| 76 |
- /usr/bin/strings |
| 77 |
/usr/bin/strip |
| 78 |
/usr/bin/tbz2tool |
| 79 |
- /usr/bin/x86_64-pc-linux-gnu-* |
| 80 |
/usr/bin/xpak |
| 81 |
/usr/bin/yacc |
| 82 |
/usr/lib*/*.a |
| 83 |
|
| 84 |
Modified: trunk/releases/weekly/specs/amd64/installcd-stage1.spec |
| 85 |
=================================================================== |
| 86 |
--- trunk/releases/weekly/specs/amd64/installcd-stage1.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 87 |
+++ trunk/releases/weekly/specs/amd64/installcd-stage1.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 88 |
@@ -65,12 +65,14 @@ |
| 89 |
net-wireless/iwl4965-ucode |
| 90 |
net-wireless/iwl5000-ucode |
| 91 |
net-wireless/prism54-firmware |
| 92 |
+ net-wireless/rfkill |
| 93 |
net-wireless/wireless-tools |
| 94 |
net-wireless/wpa_supplicant |
| 95 |
net-wireless/zd1201-firmware |
| 96 |
net-wireless/zd1211-firmware |
| 97 |
sys-apps/apmd |
| 98 |
sys-block/eject |
| 99 |
+ sys-apps/dmidecode |
| 100 |
sys-apps/ethtool |
| 101 |
sys-apps/fxload |
| 102 |
sys-apps/hdparm |
| 103 |
|
| 104 |
Modified: trunk/releases/weekly/specs/amd64/installcd-stage2-minimal.spec |
| 105 |
=================================================================== |
| 106 |
--- trunk/releases/weekly/specs/amd64/installcd-stage2-minimal.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 107 |
+++ trunk/releases/weekly/specs/amd64/installcd-stage2-minimal.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 108 |
@@ -6,7 +6,7 @@ |
| 109 |
snapshot: 2008.0 |
| 110 |
source_subpath: default/livecd-stage1-amd64-2008.0 |
| 111 |
|
| 112 |
-livecd/bootargs: dokeymap |
| 113 |
+#livecd/bootargs: dokeymap |
| 114 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 115 |
livecd/fstype: squashfs |
| 116 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 117 |
@@ -79,6 +79,8 @@ |
| 118 |
media-libs/alsa-oss |
| 119 |
media-sound/alsa-utils |
| 120 |
net-dialup/globespan-adsl |
| 121 |
+ sys-fs/ntfs3g |
| 122 |
+ |
| 123 |
# These were not stable at time of snapshot/release. |
| 124 |
# net-wireless/rtl8180 |
| 125 |
# net-wireless/rtl8187 |
| 126 |
@@ -155,10 +157,9 @@ |
| 127 |
/tmp |
| 128 |
/usr/diet/include |
| 129 |
/usr/diet/man |
| 130 |
- /usr/i386-gentoo-linux-uclibc |
| 131 |
- /usr/i386-pc-linux-gnu |
| 132 |
- /usr/i386-pc-linux-uclibc |
| 133 |
- /usr/include |
| 134 |
+ /usr/i?86-gentoo-linux-uclibc |
| 135 |
+ /usr/i?86-pc-linux-gnu |
| 136 |
+ /usr/i?86-pc-linux-uclibc |
| 137 |
/usr/lib/X11/config |
| 138 |
/usr/lib/X11/doc |
| 139 |
/usr/lib/X11/etc |
| 140 |
@@ -277,8 +278,8 @@ |
| 141 |
/usr/bin/gcc* |
| 142 |
/usr/bin/genkernel |
| 143 |
/usr/bin/gprof |
| 144 |
- /usr/bin/i386-gentoo-linux-uclibc-* |
| 145 |
- /usr/bin/i386-pc-linux-* |
| 146 |
+ /usr/bin/i?86-gentoo-linux-uclibc-* |
| 147 |
+ /usr/bin/i?86-pc-linux-* |
| 148 |
/usr/bin/jpegtran |
| 149 |
/usr/bin/ld |
| 150 |
/usr/bin/libpng* |
| 151 |
@@ -295,10 +296,8 @@ |
| 152 |
/usr/bin/powerpc64-unknown-linux-gnu-* |
| 153 |
/usr/bin/sparc-unknown-linux-gnu-* |
| 154 |
/usr/bin/sparc64-unknown-linux-gnu-* |
| 155 |
- /usr/bin/strings |
| 156 |
/usr/bin/strip |
| 157 |
/usr/bin/tbz2tool |
| 158 |
- /usr/bin/x86_64-pc-linux-gnu-* |
| 159 |
/usr/bin/xpak |
| 160 |
/usr/bin/yacc |
| 161 |
/usr/lib*/*.a |
| 162 |
|
| 163 |
Modified: trunk/releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 164 |
=================================================================== |
| 165 |
--- trunk/releases/weekly/specs/x86/hardened/admincd-stage1.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 166 |
+++ trunk/releases/weekly/specs/x86/hardened/admincd-stage1.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 167 |
@@ -124,6 +124,7 @@ |
| 168 |
net-wireless/iwl4965-ucode |
| 169 |
net-wireless/iwl5000-ucode |
| 170 |
net-wireless/prism54-firmware |
| 171 |
+ net-wireless/rfkill |
| 172 |
net-wireless/wireless-tools |
| 173 |
net-wireless/wpa_supplicant |
| 174 |
net-wireless/zd1201-firmware |
| 175 |
|
| 176 |
Modified: trunk/releases/weekly/specs/x86/hardened/admincd-stage2.spec |
| 177 |
=================================================================== |
| 178 |
--- trunk/releases/weekly/specs/x86/hardened/admincd-stage2.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 179 |
+++ trunk/releases/weekly/specs/x86/hardened/admincd-stage2.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 180 |
@@ -1,12 +1,12 @@ |
| 181 |
subarch: x86 |
| 182 |
-version_stamp: hardened-2008.0 |
| 183 |
+version_stamp: 2008.0 |
| 184 |
target: livecd-stage2 |
| 185 |
rel_type: hardened |
| 186 |
profile: hardened/linux/x86 |
| 187 |
snapshot: 2008.0 |
| 188 |
source_subpath: hardened/admincd-stage1-x86-2008.0 |
| 189 |
|
| 190 |
-livecd/bootargs: dokeymap |
| 191 |
+#livecd/bootargs: dokeymap |
| 192 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 193 |
livecd/fstype: squashfs |
| 194 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 195 |
@@ -79,6 +79,7 @@ |
| 196 |
media-libs/alsa-oss |
| 197 |
media-sound/alsa-utils |
| 198 |
net-dialup/globespan-adsl |
| 199 |
+ sys-fs/ntfs3g |
| 200 |
|
| 201 |
# These were not stable at time of snapshot/release. |
| 202 |
# net-wireless/rtl8180 |
| 203 |
@@ -159,7 +160,6 @@ |
| 204 |
/usr/i?86-gentoo-linux-uclibc |
| 205 |
/usr/i?86-pc-linux-gnu |
| 206 |
/usr/i?86-pc-linux-uclibc |
| 207 |
- /usr/include |
| 208 |
/usr/lib/X11/config |
| 209 |
/usr/lib/X11/doc |
| 210 |
/usr/lib/X11/etc |
| 211 |
@@ -296,10 +296,8 @@ |
| 212 |
/usr/bin/powerpc64-unknown-linux-gnu-* |
| 213 |
/usr/bin/sparc-unknown-linux-gnu-* |
| 214 |
/usr/bin/sparc64-unknown-linux-gnu-* |
| 215 |
- /usr/bin/strings |
| 216 |
/usr/bin/strip |
| 217 |
/usr/bin/tbz2tool |
| 218 |
- /usr/bin/x86_64-pc-linux-gnu-* |
| 219 |
/usr/bin/xpak |
| 220 |
/usr/bin/yacc |
| 221 |
/usr/lib*/*.a |
| 222 |
|
| 223 |
Modified: trunk/releases/weekly/specs/x86/installcd-stage1.spec |
| 224 |
=================================================================== |
| 225 |
--- trunk/releases/weekly/specs/x86/installcd-stage1.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 226 |
+++ trunk/releases/weekly/specs/x86/installcd-stage1.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 227 |
@@ -62,12 +62,14 @@ |
| 228 |
net-wireless/iwl4965-ucode |
| 229 |
net-wireless/iwl5000-ucode |
| 230 |
net-wireless/prism54-firmware |
| 231 |
+ net-wireless/rfkill |
| 232 |
net-wireless/wireless-tools |
| 233 |
net-wireless/wpa_supplicant |
| 234 |
net-wireless/zd1201-firmware |
| 235 |
net-wireless/zd1211-firmware |
| 236 |
sys-apps/apmd |
| 237 |
sys-block/eject |
| 238 |
+ sys-apps/dmidecode |
| 239 |
sys-apps/ethtool |
| 240 |
sys-apps/fxload |
| 241 |
sys-apps/hdparm |
| 242 |
|
| 243 |
Modified: trunk/releases/weekly/specs/x86/installcd-stage2-minimal.spec |
| 244 |
=================================================================== |
| 245 |
--- trunk/releases/weekly/specs/x86/installcd-stage2-minimal.spec 2011-10-24 16:19:50 UTC (rev 819) |
| 246 |
+++ trunk/releases/weekly/specs/x86/installcd-stage2-minimal.spec 2011-10-30 12:34:55 UTC (rev 820) |
| 247 |
@@ -6,7 +6,7 @@ |
| 248 |
snapshot: 2008.0 |
| 249 |
source_subpath: default/livecd-stage1-x86-2008.0 |
| 250 |
|
| 251 |
-livecd/bootargs: dokeymap |
| 252 |
+#livecd/bootargs: dokeymap |
| 253 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 254 |
livecd/fstype: squashfs |
| 255 |
livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8 |
| 256 |
@@ -78,8 +78,6 @@ |
| 257 |
app-accessibility/espeakup |
| 258 |
media-libs/alsa-oss |
| 259 |
media-sound/alsa-utils |
| 260 |
-### Compile failure w/ 2.6.24 |
| 261 |
-# net-dialup/slmodem |
| 262 |
net-dialup/globespan-adsl |
| 263 |
net-wireless/hostap-utils |
| 264 |
# net-dialup/fritzcapi |
| 265 |
@@ -157,7 +155,6 @@ |
| 266 |
/usr/i?86-gentoo-linux-uclibc |
| 267 |
/usr/i?86-pc-linux-gnu |
| 268 |
/usr/i?86-pc-linux-uclibc |
| 269 |
- /usr/include |
| 270 |
/usr/lib/X11/config |
| 271 |
/usr/lib/X11/doc |
| 272 |
/usr/lib/X11/etc |
| 273 |
@@ -294,10 +291,8 @@ |
| 274 |
/usr/bin/powerpc64-unknown-linux-gnu-* |
| 275 |
/usr/bin/sparc-unknown-linux-gnu-* |
| 276 |
/usr/bin/sparc64-unknown-linux-gnu-* |
| 277 |
- /usr/bin/strings |
| 278 |
/usr/bin/strip |
| 279 |
/usr/bin/tbz2tool |
| 280 |
- /usr/bin/x86_64-pc-linux-gnu-* |
| 281 |
/usr/bin/xpak |
| 282 |
/usr/bin/yacc |
| 283 |
/usr/lib*/*.a |
Archives