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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7ED5158089 for ; Sun, 3 Sep 2023 20:03:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FB432BC013; Sun, 3 Sep 2023 20:03:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EB78B2BC013 for ; Sun, 3 Sep 2023 20:03:07 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1983A335CCF for ; Sun, 3 Sep 2023 20:03:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64BD610D0 for ; Sun, 3 Sep 2023 20:03:05 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1693771361.7247751e4c5ad19786c40a7ed1c87ad0b836026e.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 7247751e4c5ad19786c40a7ed1c87ad0b836026e X-VCS-Branch: master Date: Sun, 3 Sep 2023 20:03:05 +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: 6f8f5597-a433-472c-be67-3091bdb02eb2 X-Archives-Hash: b5df99558d05b76cefaa2bed8c644c1a commit: 7247751e4c5ad19786c40a7ed1c87ad0b836026e Author: Azamat H. Hackimov gmail com> AuthorDate: Wed Aug 23 00:39:03 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Sep 3 20:02:41 2023 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7247751e Compile external modules with dist-kernel If boot/kernel/${kernel}/packages is defined, force build external module packages for dist-kernels. Also don't unmerge kernel after merging as it may needed for building process, just deselect. Later it will be unmerged by depclean process. Signed-off-by: Andreas K. Hüttel gentoo.org> targets/support/kmerge.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index c5beddc9..7114ff91 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -152,6 +152,11 @@ if [[ -n ${clst_KERNCACHE} ]]; then fi if [[ ${distkernel} = "yes" ]] ; then + # Build external kernel modules + if [[ -n ${kernel_merge} ]]; then + run_merge ${kernel_merge} + fi + # Kernel already built, let's run dracut to make initramfs distkernel_source_path=$(equery -Cq f ${ksource} | grep "/usr/src/linux-" -m1) distkernel_image_path=$(distkmerge_get_image_path) @@ -201,6 +206,6 @@ if [[ -n ${clst_KERNCACHE} && ! ${cached_kernel_found} ]]; then fi if [[ ! ${cached_kernel_found} ]]; then - run_merge -C "${ksource}" + run_merge --deselect "${ksource}" rm /usr/src/linux fi