Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/weekly/specs/x86/, releases/weekly/specs/amd64/, ...
Date: Thu, 14 Dec 2017 20:51:17
Message-Id: 1513284663.375233d0d103575281ae9fab5bc903ab3edd2a21.robbat2@gentoo
1 commit: 375233d0d103575281ae9fab5bc903ab3edd2a21
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 14 20:51:03 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 14 20:51:03 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=375233d0
7
8 weekly: catalyst3 already removes keymaps, so rcdel fails.
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec | 1 -
13 releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 1 -
14 releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 1 -
15 releases/weekly/specs/x86/hardened/admincd-stage2.spec | 1 -
16 releases/weekly/specs/x86/installcd-stage2-minimal.spec | 1 -
17 5 files changed, 5 deletions(-)
18
19 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
20 index b1cbd8a2..0cef3154 100644
21 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
22 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2-selinux.spec
23 @@ -14,7 +14,6 @@ livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
24 livecd/iso: admincd-amd64-latest.iso
25 livecd/type: gentoo-release-minimal
26 livecd/volid: Gentoo Linux Admin CD latest
27 -livecd/rcdel: keymaps|boot
28
29 boot/kernel: gentoo
30
31
32 diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
33 index 63638561..0b432eac 100644
34 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
35 +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
36 @@ -14,7 +14,6 @@ livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
37 livecd/iso: admincd-amd64-latest.iso
38 livecd/type: gentoo-release-minimal
39 livecd/volid: Gentoo Linux Admin CD latest
40 -livecd/rcdel: keymaps|boot
41
42 boot/kernel: gentoo
43
44
45 diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
46 index 99d147f0..35defa6e 100644
47 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
48 +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
49 @@ -14,7 +14,6 @@ livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
50 livecd/iso: install-amd64-minimal-latest.iso
51 livecd/type: gentoo-release-minimal
52 livecd/volid: Gentoo Linux amd64 latest
53 -livecd/rcdel: keymaps|boot
54
55 boot/kernel: gentoo
56
57
58 diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
59 index ad5ace60..0ad0e9d5 100644
60 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
61 +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
62 @@ -14,7 +14,6 @@ livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
63 livecd/iso: admincd-x86-latest.iso
64 livecd/type: gentoo-release-minimal
65 livecd/volid: Gentoo Linux Admin CD latest
66 -livecd/rcdel: keymaps|boot
67
68 boot/kernel: gentoo
69
70
71 diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
72 index e42e9126..b847f622 100644
73 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
74 +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
75 @@ -14,7 +14,6 @@ livecd/gk_mainargs: --lvm --dmraid --mdadm --makeopts=-j8
76 livecd/iso: install-x86-minimal-latest.iso
77 livecd/type: gentoo-release-minimal
78 livecd/volid: Gentoo Linux x86 latest
79 -livecd/rcdel: keymaps|boot
80
81 boot/kernel: gentoo