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/hardened/
Date: Thu, 04 Jun 2020 13:26:58
Message-Id: 1591277074.38bf17bf829f67fbc46f68142f1f2bdabfcda287.bkohler@gentoo
1 commit: 38bf17bf829f67fbc46f68142f1f2bdabfcda287
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 4 13:24:34 2020 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 4 13:24:34 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=38bf17bf
7
8 specs/amd64: enable zfs support on admincd again
9
10 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
11
12 releases/specs/amd64/hardened/admincd-stage2.spec | 7 ++-----
13 1 file changed, 2 insertions(+), 5 deletions(-)
14
15 diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
16 index cfcc5fc7..2ce3cbf9 100644
17 --- a/releases/specs/amd64/hardened/admincd-stage2.spec
18 +++ b/releases/specs/amd64/hardened/admincd-stage2.spec
19 @@ -18,11 +18,8 @@ boot/kernel: gentoo
20 boot/kernel/gentoo/sources: gentoo-sources
21 boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-5.4.38.config
22
23 -#boot/kernel/gentoo/packages:
24 -# ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
25 -# sys-kernel/spl
26 -# sys-fs/zfs
27 -# sys-fs/zfs-kmod
28 +boot/kernel/gentoo/packages:
29 + sys-fs/zfs
30
31 livecd/unmerge:
32 app-admin/eselect