Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/amd64/hardened/, releases/weekly/specs/x86/hardened/
Date: Fri, 24 Aug 2018 12:59:58
Message-Id: 1535115536.69ac785a45428721f71b54f0a258fcfc82031785.bkohler@gentoo
1 commit: 69ac785a45428721f71b54f0a258fcfc82031785
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 24 12:58:56 2018 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 24 12:58:56 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=69ac785a
7
8 specs/{amd64,x86}/hardened: comment cdtar to enable UEFI bootloader
9
10 releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 2 +-
11 releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 2 +-
12 releases/weekly/specs/x86/hardened/admincd-stage2.spec | 2 +-
13 releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec | 2 +-
14 4 files changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
17 index 31f54e65..87155f71 100644
18 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
19 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
20 @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-latest-selinux
21 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
22
23 livecd/bootargs: dokeymap
24 -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
25 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
26 livecd/fstype: squashfs
27 livecd/iso: admincd-amd64-latest.iso
28 livecd/type: gentoo-release-minimal
29
30 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
31 index 7148645a..949c6085 100644
32 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
33 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
34 @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-amd64-latest
35 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
36
37 livecd/bootargs: dokeymap
38 -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
39 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
40 livecd/fstype: squashfs
41 livecd/iso: admincd-amd64-latest.iso
42 livecd/type: gentoo-release-minimal
43
44 diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
45 index c061ab47..9f773e9b 100644
46 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
47 +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
48 @@ -8,7 +8,7 @@ source_subpath: hardened/livecd-stage1-x86-latest
49 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
50
51 livecd/bootargs: dokeymap
52 -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
53 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
54 livecd/fstype: squashfs
55 livecd/iso: admincd-x86-latest.iso
56 livecd/type: gentoo-release-minimal
57
58 diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
59 index 50d153e5..7080346e 100644
60 --- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
61 +++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
62 @@ -7,7 +7,7 @@ snapshot: latest
63 source_subpath: hardened/livecd-stage1-x86-hardened-latest
64
65 livecd/bootargs: dokeymap
66 -livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
67 +#livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
68 livecd/fstype: squashfs
69 livecd/iso: install-x86-minimal-latest.iso
70 livecd/type: gentoo-release-minimal