From 035af9dd0a6e929e89595b11ae736c526101ceae Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Wed, 20 Feb 2019 11:32:36 -0600 Subject: [PATCH] add gentoo-keys to stage4 and set PORTAGE_GPG_DIR Signed-off-by: Matthew Thode --- releases/weekly/scripts/cloud-prep.sh | 1 + releases/weekly/specs/amd64/hardened/stage4-minimal.spec | 1 + .../weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 1 + releases/weekly/specs/amd64/stage4-minimal.spec | 1 + releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec | 1 + releases/weekly/specs/arm64/stage4-minimal.spec | 1 + tools-musl/stage4-fsscript.sh | 1 + tools-musl/stage4-hardened-amd64.spec | 1 + tools-systemd/stage4-amd64.spec | 1 + 9 files changed, 9 insertions(+) diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh index d1f98f32..699442fb 100644 --- a/releases/weekly/scripts/cloud-prep.sh +++ b/releases/weekly/scripts/cloud-prep.sh @@ -72,6 +72,7 @@ emaint all -f eselect news read all eclean-dist --destructive sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf +echo 'PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"' >> /etc/portage/make.conf # clean up system passwd -d root diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec index 9a32315a..55d2434d 100644 --- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec +++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec @@ -22,6 +22,7 @@ stage4/packages: sys-apps/iproute2 sys-devel/bc sys-power/acpid + app-crypt/gentoo-keys stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh stage4/rcadd: acpid|default diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec index 49aae2ad..46abe8f8 100644 --- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec +++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec @@ -22,6 +22,7 @@ stage4/packages: sys-apps/iproute2 sys-devel/bc sys-power/acpid + app-crypt/gentoo-keys stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh stage4/rcadd: acpid|default diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec index 3b7de47e..4cf8ee84 100644 --- a/releases/weekly/specs/amd64/stage4-minimal.spec +++ b/releases/weekly/specs/amd64/stage4-minimal.spec @@ -22,6 +22,7 @@ stage4/packages: sys-apps/iproute2 sys-devel/bc sys-power/acpid + app-crypt/gentoo-keys stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh stage4/rcadd: acpid|default diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec index 38a62dc6..a18edfb0 100644 --- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec +++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec @@ -22,6 +22,7 @@ stage4/packages: sys-apps/iproute2 sys-devel/bc sys-power/acpid + app-crypt/gentoo-keys stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh stage4/rcadd: acpid|default diff --git a/releases/weekly/specs/arm64/stage4-minimal.spec b/releases/weekly/specs/arm64/stage4-minimal.spec index 5b79d4db..31c1aeb1 100644 --- a/releases/weekly/specs/arm64/stage4-minimal.spec +++ b/releases/weekly/specs/arm64/stage4-minimal.spec @@ -22,6 +22,7 @@ stage4/packages: sys-apps/iproute2 sys-devel/bc sys-power/acpid + app-crypt/gentoo-keys #stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh stage4/rcadd: acpid|default diff --git a/tools-musl/stage4-fsscript.sh b/tools-musl/stage4-fsscript.sh index 18017c7d..1a134ff9 100755 --- a/tools-musl/stage4-fsscript.sh +++ b/tools-musl/stage4-fsscript.sh @@ -76,6 +76,7 @@ emaint all -f eselect news read all eclean-dist --destructive sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf +echo 'PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"' >> /etc/portage/make.conf sed -i '/dev-util\/pkgconf/d' /var/lib/portage/world # clean up system diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec index 40546b02..de305778 100644 --- a/tools-musl/stage4-hardened-amd64.spec +++ b/tools-musl/stage4-hardened-amd64.spec @@ -28,6 +28,7 @@ stage4/packages: sys-devel/bc sys-power/acpid sys-process/cronie + app-crypt/gentoo-keys stage4/fsscript: @REPO_DIR@/stage4-fsscript.sh stage4/rcadd: acpid|default diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec index 880db3ad..61aad32d 100644 --- a/tools-systemd/stage4-amd64.spec +++ b/tools-systemd/stage4-amd64.spec @@ -26,6 +26,7 @@ stage4/packages: sys-apps/iproute2 sys-devel/bc sys-power/acpid + app-crypt/gentoo-keys stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh stage4/rcadd: acpid|default