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 35EFD15800A for ; Wed, 23 Aug 2023 00:39:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 605692BC095; Wed, 23 Aug 2023 00:39:37 +0000 (UTC) Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) (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 555A72BC095 for ; Wed, 23 Aug 2023 00:39:37 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-50079d148aeso4925008e87.3 for ; Tue, 22 Aug 2023 17:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692751175; x=1693355975; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KnAxW1Nah5kSjIwjR6yOgc0PsoDGmDJztoDknqe6L2Y=; b=AjSynbsu0w9H8rjBGQnZEkPzLVBtU36aKKl9Qv8jfQ/VwTEBySI+d7tCkasVlmiwRZ nX1NdAj2SS/n7w3TVW0EF9DUiiiatOyXsvEeRMX5PddBQmfbC6QF4ssrAx7mJwnoIecg uc5iL1YWUWlZzla0RiOENJ2R0ql26o8QJ7eILvcPOm9kN0NK8/H2i2J8t6d6UaWPlUi5 YelhaB41b9Wh2HqeN/ZNNd9N4gn2/wwvQmHUf6cQnAwOb0Zek9wWYK9T/CMeWYnFVihv 7S8yWNFde4DvsiECOI7dYxFSs6hP/iQ1tarLTa5OqLf1raeBHTzszZUei/DfFqqFJWli CUAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692751175; x=1693355975; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KnAxW1Nah5kSjIwjR6yOgc0PsoDGmDJztoDknqe6L2Y=; b=iJYPWud5EyFo9qD+8PvozTIHA42PLtPUC8swa4747rPU4V+4GDFyRN/+rUzLZ84QFt QpEbCbEGJh3InGPrBZW7/BvqPo2wflNpBbovQ0xdgSzbA7BErLg1PgnZZVCxDH55plLI uO5ATVdoh5/kSZqilpm8J8D4MV0y/6cq5svzOhYrNTfXIrSSIYBaLasnJHkAT2paJsrI Fm4/QMyFMNbwI7o3kO4SZ0NCc7Ke60Ol2KHFDrZhYWKatMVb/6krZqmq8VPM5eIGhW1Y Kbsou+s2fMR5rP7lFnjOE9aYB49HWlIfibi8p4e5CM1dIY/k18LebSvC5exdIcieoZia 9IIg== X-Gm-Message-State: AOJu0YwRwPS/JkZGtTpubTr7XNeg4s7vqbGBwkjmv7Ew96tEXpmV+tSV a3Dg/OysDplaVFXxeLGjKDa6qphw80U= X-Google-Smtp-Source: AGHT+IEdPOipLAGLAAKNURiCunWpAcnqdw99uJVTf8QXNLtlCmOiMS9hn3YSvWdOLDtm6pBwNTTsYg== X-Received: by 2002:a05:6512:3b2b:b0:4f7:6a40:9fd7 with SMTP id f43-20020a0565123b2b00b004f76a409fd7mr9604392lfv.47.1692751175104; Tue, 22 Aug 2023 17:39:35 -0700 (PDT) Received: from icewind.auth.lfstrm.tv ([95.161.221.30]) by smtp.gmail.com with ESMTPSA id r11-20020ac25a4b000000b004fe1fc5d0e3sm2416727lfn.206.2023.08.22.17.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 17:39:34 -0700 (PDT) From: "Azamat H. Hackimov" To: gentoo-catalyst@lists.gentoo.org Cc: "Azamat H. Hackimov" Subject: [gentoo-catalyst] [PATCH] Compile external modules with dist-kernel Date: Wed, 23 Aug 2023 03:39:03 +0300 Message-ID: <20230823003903.26556-1-azamat.hackimov@gmail.com> X-Mailer: git-send-email 2.41.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: c0563363-a76e-468c-9bfd-a8ef2538f9d8 X-Archives-Hash: 3417b11143894a203732716ea49dc0fc 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. --- 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 -- 2.41.0