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/specs/amd64/, releases/specs/amd64/hardened/
Date: Fri, 05 Jun 2020 13:29:23
Message-Id: 1591363713.d365ad7299540f2ddf128336d8cd32b3a170e2e7.bkohler@gentoo
1 commit: d365ad7299540f2ddf128336d8cd32b3a170e2e7
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 5 13:28:33 2020 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 5 13:28:33 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d365ad72
7
8 specs/amd64: use the new unified kconfig file
9
10 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
11
12 releases/specs/amd64/hardened/admincd-stage2.spec | 2 +-
13 releases/specs/amd64/installcd-stage2-minimal.spec | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
17 index 2ce3cbf9..99799a87 100644
18 --- a/releases/specs/amd64/hardened/admincd-stage2.spec
19 +++ b/releases/specs/amd64/hardened/admincd-stage2.spec
20 @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD @TIMESTAMP@
21 boot/kernel: gentoo
22
23 boot/kernel/gentoo/sources: gentoo-sources
24 -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-5.4.38.config
25 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-5.4.38.config
26
27 boot/kernel/gentoo/packages:
28 sys-fs/zfs
29
30 diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec
31 index b01f26a9..eedb68e2 100644
32 --- a/releases/specs/amd64/installcd-stage2-minimal.spec
33 +++ b/releases/specs/amd64/installcd-stage2-minimal.spec
34 @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 @TIMESTAMP@
35 boot/kernel: gentoo
36
37 boot/kernel/gentoo/sources: gentoo-sources
38 -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/installcd-5.4.38.config
39 +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-5.4.38.config
40
41 livecd/unmerge:
42 app-admin/eselect