From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11E3B1382C5 for ; Fri, 5 Jun 2020 13:29:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4665CE08AD; Fri, 5 Jun 2020 13:29:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 291DCE08AD for ; Fri, 5 Jun 2020 13:29:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEABA34EC2D for ; Fri, 5 Jun 2020 13:29:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F29501C8 for ; Fri, 5 Jun 2020 13:29:17 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1591363713.d365ad7299540f2ddf128336d8cd32b3a170e2e7.bkohler@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, releases/specs/amd64/hardened/ X-VCS-Repository: proj/releng X-VCS-Files: releases/specs/amd64/hardened/admincd-stage2.spec releases/specs/amd64/installcd-stage2-minimal.spec X-VCS-Directories: releases/specs/amd64/ releases/specs/amd64/hardened/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: d365ad7299540f2ddf128336d8cd32b3a170e2e7 X-VCS-Branch: master Date: Fri, 5 Jun 2020 13:29:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e8169ce-b8a8-43b4-85a4-d890b91613f0 X-Archives-Hash: 53676f450908dcf9fb646cd467455119 commit: d365ad7299540f2ddf128336d8cd32b3a170e2e7 Author: Ben Kohler gentoo org> AuthorDate: Fri Jun 5 13:28:33 2020 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Jun 5 13:28:33 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d365ad72 specs/amd64: use the new unified kconfig file Signed-off-by: Ben Kohler gentoo.org> releases/specs/amd64/hardened/admincd-stage2.spec | 2 +- releases/specs/amd64/installcd-stage2-minimal.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec index 2ce3cbf9..99799a87 100644 --- a/releases/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/specs/amd64/hardened/admincd-stage2.spec @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD @TIMESTAMP@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-5.4.38.config +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-5.4.38.config boot/kernel/gentoo/packages: sys-fs/zfs diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec index b01f26a9..eedb68e2 100644 --- a/releases/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/specs/amd64/installcd-stage2-minimal.spec @@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 @TIMESTAMP@ boot/kernel: gentoo boot/kernel/gentoo/sources: gentoo-sources -boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/installcd-5.4.38.config +boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-5.4.38.config livecd/unmerge: app-admin/eselect