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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6A2915852A for ; Thu, 22 Aug 2024 18:40:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC0B32BC01E; Thu, 22 Aug 2024 18:40:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9E502BC01E for ; Thu, 22 Aug 2024 18:40:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8E9433BE12 for ; Thu, 22 Aug 2024 18:40:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24498F42 for ; Thu, 22 Aug 2024 18:39:59 +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: <1724351993.836744689e0cc09a1a0a89b7272142d5dfb99bd4.bkohler@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 836744689e0cc09a1a0a89b7272142d5dfb99bd4 X-VCS-Branch: master Date: Thu, 22 Aug 2024 18:39:59 +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: 2a96e9b5-5487-4505-8fb4-497c03fa2201 X-Archives-Hash: 5a1b9a60c0a15fbc547514fce7e1f55e commit: 836744689e0cc09a1a0a89b7272142d5dfb99bd4 Author: Ian Jordan gmail com> AuthorDate: Tue Jul 30 18:27:34 2024 +0000 Commit: Ben Kohler gentoo org> CommitDate: Thu Aug 22 18:39:53 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=83674468 Add Dist-kernel kconfig support Based on the orginal patch by oldfashionedcow to add the abilty for a user to set a custom kconfig for their livecd to be moved to /etc/kernel/config.d/ before sys-kernel/gentoo-kernel is emerged. Syntax is the same as the one used for Genkernel kconfigs. Closes: https://bugs.gentoo.org/936676 Co-authored-by: Rahul Sandh sandhuservices.dev> Co-authored-by: Christopher Fore posteo.net> Signed-off-by: Ian Jordan gmail.com> Closes: https://github.com/gentoo/catalyst/pull/21 Signed-off-by: Ben Kohler gentoo.org> catalyst/base/stagebase.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a23b1d90..8a3d2af6 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1707,8 +1707,13 @@ class StageBase(TargetBase, ClearBase, GenBase): raise CatalystError("Can't find kernel config: %s" % self.settings[key]) - shutil.copy(self.settings[key], - self.settings['chroot_path'] + '/var/tmp/' + kname + '.config') + if "boot/kernel/" + kname + "/distkernel" in self.settings: + os.makedirs(self.settings['chroot_path'] + '/etc//kernel/config.d') + shutil.copy(self.settings[key], + self.settings['chroot_path'] + '/etc//kernel/config.d') + else: + shutil.copy(self.settings[key], + self.settings['chroot_path'] + '/var/tmp/' + kname + '.config') def _copy_initramfs_overlay(self, kname): key = 'boot/kernel/' + kname + '/initramfs_overlay'