| 1 |
commit: 0422a99519805880834ec00ef75fb52a838c2032 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 4 20:32:28 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 4 20:32:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0422a995 |
| 7 |
|
| 8 |
x86: Move hardened builds from pardalote to demeter |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
...incd-stage1.spec => admincd-stage1-openrc.spec} | 4 +- |
| 13 |
...incd-stage2.spec => admincd-stage2-openrc.spec} | 4 +- |
| 14 |
releases/specs/x86/hardened/installcd-stage1.spec | 86 ------ |
| 15 |
.../x86/hardened/installcd-stage2-minimal.spec | 321 --------------------- |
| 16 |
.../hardened/{stage1.spec => stage1-openrc.spec} | 4 +- |
| 17 |
.../hardened/{stage2.spec => stage2-openrc.spec} | 4 +- |
| 18 |
.../hardened/{stage3.spec => stage3-openrc.spec} | 4 +- |
| 19 |
tools/catalyst-auto-x86-demeter.conf | 19 +- |
| 20 |
tools/catalyst-auto-x86.conf | 8 +- |
| 21 |
9 files changed, 29 insertions(+), 425 deletions(-) |
| 22 |
|
| 23 |
diff --git a/releases/specs/x86/hardened/admincd-stage1.spec b/releases/specs/x86/hardened/admincd-stage1-openrc.spec |
| 24 |
similarity index 97% |
| 25 |
rename from releases/specs/x86/hardened/admincd-stage1.spec |
| 26 |
rename to releases/specs/x86/hardened/admincd-stage1-openrc.spec |
| 27 |
index 7ce6cbf8..e38a8ccc 100644 |
| 28 |
--- a/releases/specs/x86/hardened/admincd-stage1.spec |
| 29 |
+++ b/releases/specs/x86/hardened/admincd-stage1-openrc.spec |
| 30 |
@@ -1,10 +1,10 @@ |
| 31 |
subarch: i686 |
| 32 |
-version_stamp: @TIMESTAMP@ |
| 33 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
| 34 |
target: livecd-stage1 |
| 35 |
rel_type: hardened |
| 36 |
profile: default/linux/x86/17.0/hardened |
| 37 |
snapshot: @TIMESTAMP@ |
| 38 |
-source_subpath: hardened/stage3-i686-hardened-@TIMESTAMP@ |
| 39 |
+source_subpath: hardened/stage3-i686-hardened-openrc-@TIMESTAMP@ |
| 40 |
compression_mode: pixz_x |
| 41 |
portage_confdir: @REPO_DIR@/releases/portage/isos |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/releases/specs/x86/hardened/admincd-stage2.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec |
| 45 |
similarity index 97% |
| 46 |
rename from releases/specs/x86/hardened/admincd-stage2.spec |
| 47 |
rename to releases/specs/x86/hardened/admincd-stage2-openrc.spec |
| 48 |
index f553cd9b..74867913 100644 |
| 49 |
--- a/releases/specs/x86/hardened/admincd-stage2.spec |
| 50 |
+++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec |
| 51 |
@@ -1,10 +1,10 @@ |
| 52 |
subarch: i686 |
| 53 |
-version_stamp: @TIMESTAMP@ |
| 54 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
| 55 |
target: livecd-stage2 |
| 56 |
rel_type: hardened |
| 57 |
profile: default/linux/x86/17.0/hardened |
| 58 |
snapshot: @TIMESTAMP@ |
| 59 |
-source_subpath: hardened/livecd-stage1-i686-@TIMESTAMP@ |
| 60 |
+source_subpath: hardened/livecd-stage1-i686-hardened-openrc-@TIMESTAMP@ |
| 61 |
portage_confdir: @REPO_DIR@/releases/portage/isos |
| 62 |
|
| 63 |
livecd/bootargs: dokeymap |
| 64 |
|
| 65 |
diff --git a/releases/specs/x86/hardened/installcd-stage1.spec b/releases/specs/x86/hardened/installcd-stage1.spec |
| 66 |
deleted file mode 100644 |
| 67 |
index fa629e5e..00000000 |
| 68 |
--- a/releases/specs/x86/hardened/installcd-stage1.spec |
| 69 |
+++ /dev/null |
| 70 |
@@ -1,86 +0,0 @@ |
| 71 |
-subarch: x86 |
| 72 |
-version_stamp: hardened-@TIMESTAMP@ |
| 73 |
-target: livecd-stage1 |
| 74 |
-rel_type: hardened |
| 75 |
-profile: default/linux/x86/17.0/hardened |
| 76 |
-snapshot: @TIMESTAMP@ |
| 77 |
-source_subpath: hardened/stage3-x86-hardened-@TIMESTAMP@ |
| 78 |
-compression_mode: pixz_x |
| 79 |
-livecd/use: |
| 80 |
- -* |
| 81 |
- compile-locales |
| 82 |
- fbcon |
| 83 |
- ipv6 |
| 84 |
- livecd |
| 85 |
- modules |
| 86 |
- ncurses |
| 87 |
-# nls |
| 88 |
- pam |
| 89 |
- readline |
| 90 |
- socks5 |
| 91 |
- ssl |
| 92 |
-# unicode |
| 93 |
- xml |
| 94 |
- |
| 95 |
-livecd/packages: |
| 96 |
- app-accessibility/brltty |
| 97 |
- app-admin/hddtemp |
| 98 |
- app-admin/pwgen |
| 99 |
- app-admin/syslog-ng |
| 100 |
- app-arch/unzip |
| 101 |
- app-crypt/gnupg |
| 102 |
- app-editors/mg |
| 103 |
- app-misc/livecd-tools |
| 104 |
- app-misc/screen |
| 105 |
- app-misc/tmux |
| 106 |
- app-portage/mirrorselect |
| 107 |
- app-text/wgetpaste |
| 108 |
- media-gfx/fbgrab |
| 109 |
- net-analyzer/tcptraceroute |
| 110 |
- net-analyzer/traceroute |
| 111 |
- net-dialup/mingetty |
| 112 |
- net-dialup/pptpclient |
| 113 |
- net-dialup/rp-pppoe |
| 114 |
- net-fs/nfs-utils |
| 115 |
- net-irc/irssi |
| 116 |
- net-misc/dhcpcd |
| 117 |
- net-misc/iputils |
| 118 |
- net-misc/ntp |
| 119 |
- net-misc/rdate |
| 120 |
- net-misc/vconfig |
| 121 |
- net-proxy/dante |
| 122 |
- net-proxy/tsocks |
| 123 |
- net-wireless/wireless-tools |
| 124 |
- net-wireless/wpa_supplicant |
| 125 |
- sys-apps/ethtool |
| 126 |
- sys-apps/fxload |
| 127 |
- sys-apps/hdparm |
| 128 |
- sys-apps/iproute2 |
| 129 |
- sys-apps/memtester |
| 130 |
- sys-apps/netplug |
| 131 |
- sys-block/parted |
| 132 |
- sys-apps/sdparm |
| 133 |
-# sys-block/partimage |
| 134 |
-# sys-block/qla-fc-firmware |
| 135 |
- sys-firmware/ipw2100-firmware |
| 136 |
- sys-firmware/ipw2200-firmware |
| 137 |
- sys-firmware/zd1201-firmware |
| 138 |
- sys-firmware/zd1211-firmware |
| 139 |
- sys-fs/cryptsetup |
| 140 |
- sys-fs/dmraid |
| 141 |
- sys-fs/dosfstools |
| 142 |
- sys-fs/e2fsprogs |
| 143 |
-# sys-fs/hfsplusutils |
| 144 |
-# sys-fs/hfsutils |
| 145 |
- sys-fs/jfsutils |
| 146 |
- sys-fs/lsscsi |
| 147 |
- sys-fs/lvm2 |
| 148 |
-# sys-fs/mac-fdisk |
| 149 |
- sys-fs/mdadm |
| 150 |
-# sys-fs/multipath-tools |
| 151 |
- sys-fs/ntfs3g |
| 152 |
- sys-fs/reiserfsprogs |
| 153 |
- sys-fs/xfsprogs |
| 154 |
- sys-libs/gpm |
| 155 |
- sys-power/acpid |
| 156 |
- www-client/links |
| 157 |
|
| 158 |
diff --git a/releases/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/specs/x86/hardened/installcd-stage2-minimal.spec |
| 159 |
deleted file mode 100644 |
| 160 |
index 79b4bd7f..00000000 |
| 161 |
--- a/releases/specs/x86/hardened/installcd-stage2-minimal.spec |
| 162 |
+++ /dev/null |
| 163 |
@@ -1,321 +0,0 @@ |
| 164 |
-subarch: x86 |
| 165 |
-version_stamp: hardened-@TIMESTAMP@ |
| 166 |
-target: livecd-stage2 |
| 167 |
-rel_type: hardened |
| 168 |
-profile: default/linux/x86/17.0/hardened |
| 169 |
-snapshot: @TIMESTAMP@ |
| 170 |
-source_subpath: hardened/livecd-stage1-x86-hardened-@TIMESTAMP@ |
| 171 |
- |
| 172 |
-livecd/bootargs: dokeymap |
| 173 |
-#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
| 174 |
-livecd/fstype: squashfs |
| 175 |
-livecd/iso: install-x86-minimal-@TIMESTAMP@.iso |
| 176 |
-livecd/type: gentoo-release-minimal |
| 177 |
-livecd/volid: Gentoo x86 @TIMESTAMP@ |
| 178 |
- |
| 179 |
-boot/kernel: gentoo |
| 180 |
- |
| 181 |
-boot/kernel/gentoo/sources: gentoo-sources |
| 182 |
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/x86/hardened/installcd-2.6.38.config |
| 183 |
-boot/kernel/gentoo/use: |
| 184 |
- -* |
| 185 |
- alsa |
| 186 |
- alsa_pcm_plugins_adpcm |
| 187 |
- alsa_pcm_plugins_alaw |
| 188 |
- alsa_pcm_plugins_asym |
| 189 |
- alsa_pcm_plugins_copy |
| 190 |
- alsa_pcm_plugins_dmix |
| 191 |
- alsa_pcm_plugins_dshare |
| 192 |
- alsa_pcm_plugins_dsnoop |
| 193 |
- alsa_pcm_plugins_empty |
| 194 |
- alsa_pcm_plugins_extplug |
| 195 |
- alsa_pcm_plugins_file |
| 196 |
- alsa_pcm_plugins_hooks |
| 197 |
- alsa_pcm_plugins_iec958 |
| 198 |
- alsa_pcm_plugins_ioplug |
| 199 |
- alsa_pcm_plugins_ladspa |
| 200 |
- alsa_pcm_plugins_lfloat |
| 201 |
- alsa_pcm_plugins_linear |
| 202 |
- alsa_pcm_plugins_meter |
| 203 |
- alsa_pcm_plugins_mmap_emul |
| 204 |
- alsa_pcm_plugins_mulaw |
| 205 |
- alsa_pcm_plugins_multi |
| 206 |
- alsa_pcm_plugins_null |
| 207 |
- alsa_pcm_plugins_plug |
| 208 |
- alsa_pcm_plugins_rate |
| 209 |
- alsa_pcm_plugins_route |
| 210 |
- alsa_pcm_plugins_share |
| 211 |
- alsa_pcm_plugins_shm |
| 212 |
- alsa_pcm_plugins_softvol |
| 213 |
- atm |
| 214 |
- fbcon |
| 215 |
- ipv6 |
| 216 |
- livecd |
| 217 |
- midi |
| 218 |
- modules |
| 219 |
- ncurses |
| 220 |
-# nls |
| 221 |
- nptl |
| 222 |
- pam |
| 223 |
- png |
| 224 |
- readline |
| 225 |
- socks5 |
| 226 |
- ssl |
| 227 |
- truetype |
| 228 |
-# unicode |
| 229 |
- usb |
| 230 |
- |
| 231 |
-boot/kernel/gentoo/packages: |
| 232 |
-### These need to be added for software speech. |
| 233 |
- app-accessibility/espeakup |
| 234 |
- media-libs/alsa-oss |
| 235 |
- media-sound/alsa-utils |
| 236 |
- net-dialup/slmodem |
| 237 |
- net-wireless/hostap-utils |
| 238 |
-# net-dialup/fritzcapi |
| 239 |
-# net-dialup/fcdsl |
| 240 |
- sys-apps/pcmciautils |
| 241 |
- sys-kernel/linux-firmware |
| 242 |
- |
| 243 |
-livecd/unmerge: |
| 244 |
- app-admin/eselect |
| 245 |
- app-admin/eselect-ctags |
| 246 |
- app-admin/eselect-vi |
| 247 |
- app-admin/perl-cleaner |
| 248 |
- app-admin/python-updater |
| 249 |
- app-arch/cpio |
| 250 |
- dev-libs/gmp |
| 251 |
- dev-libs/libxml2 |
| 252 |
- dev-libs/mpfr |
| 253 |
- dev-libs/popt |
| 254 |
- dev-python/pycrypto |
| 255 |
- dev-util/pkgconfig |
| 256 |
- net-misc/rsync |
| 257 |
- perl-core/PodParser |
| 258 |
- perl-core/Test-Harness |
| 259 |
- sys-apps/debianutils |
| 260 |
- sys-apps/diffutils |
| 261 |
- sys-apps/file |
| 262 |
- sys-apps/groff |
| 263 |
- sys-apps/man-db |
| 264 |
- sys-apps/man-pages |
| 265 |
- sys-apps/miscfiles |
| 266 |
- sys-apps/sandbox |
| 267 |
- sys-apps/texinfo |
| 268 |
- sys-devel/autoconf |
| 269 |
- sys-devel/autoconf-wrapper |
| 270 |
- sys-devel/automake |
| 271 |
- sys-devel/automake-wrapper |
| 272 |
- sys-devel/binutils |
| 273 |
- sys-devel/binutils-config |
| 274 |
- sys-devel/bison |
| 275 |
- sys-devel/flex |
| 276 |
- sys-devel/gcc |
| 277 |
- sys-devel/gcc-config |
| 278 |
- sys-devel/gettext |
| 279 |
- sys-devel/gnuconfig |
| 280 |
- sys-devel/libtool |
| 281 |
- sys-devel/m4 |
| 282 |
- sys-devel/make |
| 283 |
- sys-devel/patch |
| 284 |
- sys-libs/db |
| 285 |
- sys-libs/gdbm |
| 286 |
- sys-kernel/genkernel |
| 287 |
- sys-kernel/linux-headers |
| 288 |
- |
| 289 |
-livecd/empty: |
| 290 |
- /boot |
| 291 |
- /etc/cron.daily |
| 292 |
- /etc/cron.hourly |
| 293 |
- /etc/cron.monthly |
| 294 |
- /etc/cron.weekly |
| 295 |
- /etc/logrotate.d |
| 296 |
- /etc/modules.autoload.d |
| 297 |
- /etc/rsync |
| 298 |
- /etc/runlevels/single |
| 299 |
- /etc/skel |
| 300 |
- /lib/dev-state |
| 301 |
- /lib/udev-state |
| 302 |
- /lib64/dev-state |
| 303 |
- /lib64/udev-state |
| 304 |
- /root/.ccache |
| 305 |
- /tmp |
| 306 |
- /usr/diet/include |
| 307 |
- /usr/diet/man |
| 308 |
- /usr/include |
| 309 |
- /usr/i?86-gentoo-linux-uclibc |
| 310 |
- /usr/i?86-pc-linux-gnu |
| 311 |
- /usr/i?86-pc-linux-uclibc |
| 312 |
- /usr/lib/X11/config |
| 313 |
- /usr/lib/X11/doc |
| 314 |
- /usr/lib/X11/etc |
| 315 |
- /usr/lib/awk |
| 316 |
- /usr/lib/ccache |
| 317 |
- /usr/lib/gcc-config |
| 318 |
- /usr/lib/nfs |
| 319 |
- /usr/lib/perl5/site_perl |
| 320 |
- /usr/lib/portage |
| 321 |
- /usr/lib64/X11/config |
| 322 |
- /usr/lib64/X11/doc |
| 323 |
- /usr/lib64/X11/etc |
| 324 |
- /usr/lib64/awk |
| 325 |
- /usr/lib64/ccache |
| 326 |
- /usr/lib64/gcc-config |
| 327 |
- /usr/lib64/nfs |
| 328 |
- /usr/lib64/perl5/site_perl |
| 329 |
- /usr/lib64/portage |
| 330 |
- /usr/local |
| 331 |
- /usr/portage |
| 332 |
- /usr/powerpc-unknown-linux-gnu |
| 333 |
- /usr/powerpc64-unknown-linux-gnu |
| 334 |
- /usr/share/aclocal |
| 335 |
- /usr/share/baselayout |
| 336 |
- /usr/share/binutils-data |
| 337 |
- /usr/share/consolefonts/partialfonts |
| 338 |
- /usr/share/consoletrans |
| 339 |
- /usr/share/dict |
| 340 |
- /usr/share/doc |
| 341 |
- /usr/share/emacs |
| 342 |
- /usr/share/et |
| 343 |
- /usr/share/gcc-data |
| 344 |
- /usr/share/genkernel |
| 345 |
- /usr/share/gettext |
| 346 |
- /usr/share/glib-2.0 |
| 347 |
- /usr/share/gnuconfig |
| 348 |
- /usr/share/gtk-doc |
| 349 |
- /usr/share/i18n |
| 350 |
- /usr/share/info |
| 351 |
- /usr/share/lcms |
| 352 |
- /usr/share/libtool |
| 353 |
- /usr/share/locale |
| 354 |
- /usr/share/man |
| 355 |
- /usr/share/rfc |
| 356 |
- /usr/share/ss |
| 357 |
- /usr/share/state |
| 358 |
- /usr/share/texinfo |
| 359 |
- /usr/share/unimaps |
| 360 |
- /usr/share/zoneinfo |
| 361 |
- /usr/sparc-unknown-linux-gnu |
| 362 |
- /usr/src |
| 363 |
- /usr/x86_64-pc-linux-gnu |
| 364 |
- /var/cache |
| 365 |
- /var/empty |
| 366 |
- /var/lib/portage |
| 367 |
- /var/lock |
| 368 |
- /var/log |
| 369 |
- /var/run |
| 370 |
- /var/spool |
| 371 |
- /var/state |
| 372 |
- /var/tmp |
| 373 |
- |
| 374 |
-livecd/rm: |
| 375 |
- /boot/System* |
| 376 |
- /boot/initr* |
| 377 |
- /boot/kernel* |
| 378 |
- /etc/*- |
| 379 |
- /etc/*.old |
| 380 |
- /etc/default/audioctl |
| 381 |
- /etc/dispatch-conf.conf |
| 382 |
- /etc/env.d/05binutils |
| 383 |
- /etc/env.d/05gcc |
| 384 |
- /etc/etc-update.conf |
| 385 |
- /etc/hosts.bck |
| 386 |
- /etc/issue* |
| 387 |
- /etc/genkernel.conf |
| 388 |
- /etc/make.conf* |
| 389 |
- /etc/make.globals |
| 390 |
- /etc/make.profile |
| 391 |
- /etc/man.conf |
| 392 |
- /etc/resolv.conf |
| 393 |
- /lib*/*.a |
| 394 |
- /lib*/*.la |
| 395 |
- /lib*/cpp |
| 396 |
- /root/.bash_history |
| 397 |
- /root/.viminfo |
| 398 |
- /sbin/*.static |
| 399 |
- /sbin/fsck.cramfs |
| 400 |
- /sbin/fsck.minix |
| 401 |
- /sbin/mkfs.bfs |
| 402 |
- /sbin/mkfs.cramfs |
| 403 |
- /sbin/mkfs.minix |
| 404 |
- /usr/bin/addr2line |
| 405 |
- /usr/bin/ar |
| 406 |
- /usr/bin/as |
| 407 |
- /usr/bin/audioctl |
| 408 |
- /usr/bin/c++* |
| 409 |
- /usr/bin/cc |
| 410 |
- /usr/bin/cjpeg |
| 411 |
- /usr/bin/cpp |
| 412 |
- /usr/bin/djpeg |
| 413 |
- /usr/bin/ebuild |
| 414 |
- /usr/bin/egencache |
| 415 |
- /usr/bin/emerge |
| 416 |
- /usr/bin/emerge-webrsync |
| 417 |
- /usr/bin/emirrordist |
| 418 |
- /usr/bin/elftoaout |
| 419 |
- /usr/bin/f77 |
| 420 |
- /usr/bin/g++* |
| 421 |
- /usr/bin/g77 |
| 422 |
- /usr/bin/gcc* |
| 423 |
- /usr/bin/genkernel |
| 424 |
- /usr/bin/gprof |
| 425 |
- /usr/bin/i?86-gentoo-linux-uclibc-* |
| 426 |
- /usr/bin/i?86-pc-linux-* |
| 427 |
- /usr/bin/jpegtran |
| 428 |
- /usr/bin/ld |
| 429 |
- /usr/bin/libpng* |
| 430 |
- /usr/bin/nm |
| 431 |
- /usr/bin/objcopy |
| 432 |
- /usr/bin/objdump |
| 433 |
- /usr/bin/piggyback* |
| 434 |
- /usr/bin/portageq |
| 435 |
- /usr/bin/ranlib |
| 436 |
- /usr/bin/readelf |
| 437 |
- /usr/bin/repoman |
| 438 |
- /usr/bin/size |
| 439 |
- /usr/bin/powerpc-unknown-linux-gnu-* |
| 440 |
- /usr/bin/powerpc64-unknown-linux-gnu-* |
| 441 |
- /usr/bin/sparc-unknown-linux-gnu-* |
| 442 |
- /usr/bin/sparc64-unknown-linux-gnu-* |
| 443 |
- /usr/bin/strings |
| 444 |
- /usr/bin/strip |
| 445 |
- /usr/bin/tbz2tool |
| 446 |
- /usr/bin/x86_64-pc-linux-gnu-* |
| 447 |
- /usr/bin/xpak |
| 448 |
- /usr/bin/yacc |
| 449 |
- /usr/lib*/*.a |
| 450 |
- /usr/lib*/*.la |
| 451 |
- /usr/lib*/perl5/site_perl |
| 452 |
- /usr/lib*/gcc-lib/*/*/libgcj* |
| 453 |
- /usr/sbin/archive-conf |
| 454 |
- /usr/sbin/dispatch-conf |
| 455 |
- /usr/sbin/emaint |
| 456 |
- /usr/sbin/env-update |
| 457 |
- /usr/sbin/etc-update |
| 458 |
- /usr/sbin/fb* |
| 459 |
- /usr/sbin/fixpackages |
| 460 |
- /usr/sbin/quickpkg |
| 461 |
- /usr/sbin/regenworld |
| 462 |
- /usr/share/consolefonts/1* |
| 463 |
- /usr/share/consolefonts/7* |
| 464 |
- /usr/share/consolefonts/8* |
| 465 |
- /usr/share/consolefonts/9* |
| 466 |
- /usr/share/consolefonts/A* |
| 467 |
- /usr/share/consolefonts/C* |
| 468 |
- /usr/share/consolefonts/E* |
| 469 |
- /usr/share/consolefonts/G* |
| 470 |
- /usr/share/consolefonts/L* |
| 471 |
- /usr/share/consolefonts/M* |
| 472 |
- /usr/share/consolefonts/R* |
| 473 |
- /usr/share/consolefonts/a* |
| 474 |
- /usr/share/consolefonts/c* |
| 475 |
- /usr/share/consolefonts/dr* |
| 476 |
- /usr/share/consolefonts/g* |
| 477 |
- /usr/share/consolefonts/i* |
| 478 |
- /usr/share/consolefonts/k* |
| 479 |
- /usr/share/consolefonts/l* |
| 480 |
- /usr/share/consolefonts/r* |
| 481 |
- /usr/share/consolefonts/s* |
| 482 |
- /usr/share/consolefonts/t* |
| 483 |
- /usr/share/consolefonts/v* |
| 484 |
- /usr/share/misc/*.old |
| 485 |
|
| 486 |
diff --git a/releases/specs/x86/hardened/stage1.spec b/releases/specs/x86/hardened/stage1-openrc.spec |
| 487 |
similarity index 73% |
| 488 |
rename from releases/specs/x86/hardened/stage1.spec |
| 489 |
rename to releases/specs/x86/hardened/stage1-openrc.spec |
| 490 |
index de8cba3d..4519abca 100644 |
| 491 |
--- a/releases/specs/x86/hardened/stage1.spec |
| 492 |
+++ b/releases/specs/x86/hardened/stage1-openrc.spec |
| 493 |
@@ -1,10 +1,10 @@ |
| 494 |
subarch: i686 |
| 495 |
target: stage1 |
| 496 |
-version_stamp: hardened-@TIMESTAMP@ |
| 497 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
| 498 |
rel_type: hardened |
| 499 |
profile: default/linux/x86/17.0/hardened |
| 500 |
snapshot: @TIMESTAMP@ |
| 501 |
-source_subpath: hardened/stage3-i686-hardened-latest |
| 502 |
+source_subpath: hardened/stage3-i686-hardened-openrc-latest |
| 503 |
compression_mode: pixz_x |
| 504 |
update_seed: yes |
| 505 |
update_seed_command: --update --deep --newuse @world |
| 506 |
|
| 507 |
diff --git a/releases/specs/x86/hardened/stage2.spec b/releases/specs/x86/hardened/stage2-openrc.spec |
| 508 |
similarity index 66% |
| 509 |
rename from releases/specs/x86/hardened/stage2.spec |
| 510 |
rename to releases/specs/x86/hardened/stage2-openrc.spec |
| 511 |
index d9007708..894b9fc1 100644 |
| 512 |
--- a/releases/specs/x86/hardened/stage2.spec |
| 513 |
+++ b/releases/specs/x86/hardened/stage2-openrc.spec |
| 514 |
@@ -1,10 +1,10 @@ |
| 515 |
subarch: i686 |
| 516 |
target: stage2 |
| 517 |
-version_stamp: hardened-@TIMESTAMP@ |
| 518 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
| 519 |
rel_type: hardened |
| 520 |
profile: default/linux/x86/17.0/hardened |
| 521 |
snapshot: @TIMESTAMP@ |
| 522 |
-source_subpath: hardened/stage1-i686-hardened-@TIMESTAMP@ |
| 523 |
+source_subpath: hardened/stage1-i686-hardened-openrc-@TIMESTAMP@ |
| 524 |
compression_mode: pixz_x |
| 525 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 526 |
portage_prefix: releng |
| 527 |
|
| 528 |
diff --git a/releases/specs/x86/hardened/stage3.spec b/releases/specs/x86/hardened/stage3-openrc.spec |
| 529 |
similarity index 66% |
| 530 |
rename from releases/specs/x86/hardened/stage3.spec |
| 531 |
rename to releases/specs/x86/hardened/stage3-openrc.spec |
| 532 |
index 3b51fceb..93ef92e6 100644 |
| 533 |
--- a/releases/specs/x86/hardened/stage3.spec |
| 534 |
+++ b/releases/specs/x86/hardened/stage3-openrc.spec |
| 535 |
@@ -1,10 +1,10 @@ |
| 536 |
subarch: i686 |
| 537 |
target: stage3 |
| 538 |
-version_stamp: hardened-@TIMESTAMP@ |
| 539 |
+version_stamp: hardened-openrc-@TIMESTAMP@ |
| 540 |
rel_type: hardened |
| 541 |
profile: default/linux/x86/17.0/hardened |
| 542 |
snapshot: @TIMESTAMP@ |
| 543 |
-source_subpath: hardened/stage2-i686-hardened-@TIMESTAMP@ |
| 544 |
+source_subpath: hardened/stage2-i686-hardened-openrc-@TIMESTAMP@ |
| 545 |
compression_mode: pixz_x |
| 546 |
portage_confdir: @REPO_DIR@/releases/portage/stages |
| 547 |
portage_prefix: releng |
| 548 |
|
| 549 |
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf |
| 550 |
index 84c2f985..98c2d131 100644 |
| 551 |
--- a/tools/catalyst-auto-x86-demeter.conf |
| 552 |
+++ b/tools/catalyst-auto-x86-demeter.conf |
| 553 |
@@ -15,6 +15,7 @@ SETS=" |
| 554 |
i486_openrc |
| 555 |
i686_openrc |
| 556 |
i686_systemd |
| 557 |
+ hardened_openrc |
| 558 |
" |
| 559 |
|
| 560 |
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec" |
| 561 |
@@ -23,13 +24,16 @@ SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd |
| 562 |
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage2-openrc.spec i686/stage3-openrc.spec" |
| 563 |
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec" |
| 564 |
|
| 565 |
+SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec" |
| 566 |
+SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec" |
| 567 |
+ |
| 568 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86 |
| 569 |
|
| 570 |
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" |
| 571 |
|
| 572 |
update_symlinks() { |
| 573 |
# Symlink the latest stages3 to build from |
| 574 |
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do |
| 575 |
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened} ; do |
| 576 |
pushd "${d}" >/dev/null || exit |
| 577 |
shopt -s extglob |
| 578 |
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do |
| 579 |
@@ -51,9 +55,9 @@ update_symlinks() { |
| 580 |
|
| 581 |
post_build() { |
| 582 |
local set=$1 spec=$2 |
| 583 |
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE} |
| 584 |
|
| 585 |
pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit |
| 586 |
- UPLOAD_DEST=${BUILD_DESTDIR_BASE} |
| 587 |
case ${spec} in |
| 588 |
i486/stage3-openrc.spec) |
| 589 |
upload stage3-i486-openrc-${TIMESTAMP}.tar.xz* |
| 590 |
@@ -69,6 +73,17 @@ post_build() { |
| 591 |
;; |
| 592 |
esac |
| 593 |
popd >/dev/null || exit |
| 594 |
+ |
| 595 |
+ pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit |
| 596 |
+ case ${spec} in |
| 597 |
+ hardened/stage3-openrc.spec) |
| 598 |
+ upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz* |
| 599 |
+ ;; |
| 600 |
+ hardened/admincd-stage2-openrc.spec) |
| 601 |
+ upload admincd-x86-hardened-openrc-${TIMESTAMP}.iso* |
| 602 |
+ ;; |
| 603 |
+ esac |
| 604 |
+ popd >/dev/null || exit |
| 605 |
} |
| 606 |
|
| 607 |
# vim:ft=sh: |
| 608 |
|
| 609 |
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf |
| 610 |
index b19aa911..075bb447 100644 |
| 611 |
--- a/tools/catalyst-auto-x86.conf |
| 612 |
+++ b/tools/catalyst-auto-x86.conf |
| 613 |
@@ -11,12 +11,8 @@ source /etc/catalyst/release/build.env |
| 614 |
|
| 615 |
SPECS_DIR=${REPO_DIR}/releases/specs/x86 |
| 616 |
|
| 617 |
-SETS=" |
| 618 |
- hardened |
| 619 |
-" |
| 620 |
- |
| 621 |
-SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 622 |
-SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 623 |
+SETS="" |
| 624 |
+SPECS="nosuchfile.spec" |
| 625 |
|
| 626 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86 |
Archives