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 B643E13835C for ; Tue, 20 Oct 2020 02:50:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA231E0833; Tue, 20 Oct 2020 02:50:20 +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 CDCDDE0831 for ; Tue, 20 Oct 2020 02:50:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E8B37340CC7 for ; Tue, 20 Oct 2020 02:50:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 360A73B7 for ; Tue, 20 Oct 2020 02:50:17 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603162208.a6da8b1dcb1503e898b2d0d3f792dc8be9999313.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: a6da8b1dcb1503e898b2d0d3f792dc8be9999313 X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 02:50: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: 86e3bb10-9841-4f55-92c5-069056356c0e X-Archives-Hash: b843b8b7864f4c6f5c92950ad77a3d61 commit: a6da8b1dcb1503e898b2d0d3f792dc8be9999313 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 18:17:56 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 02:50:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a6da8b1d targets: Default to sys-kernel/gentoo-sources directly Using virtual/linux-sources was a nice idea, but leads to multiple failures in practice. For example, we use 'portageq contents' later, and the virtual provides no files. We could handle the indirection with 'portageq expand_virtual' in some cases but that requires the virtual to be installed on the system. Fixes: 388def77 ("kmerge.sh blows away the /usr/src/linux symlink ...") Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 911d7cb3..b2c4a31a 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -118,11 +118,7 @@ eval "kernel_merge=\$clst_boot_kernel_${kname}_packages" eval "kernel_use=\$clst_boot_kernel_${kname}_use" eval eval kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs ) eval "ksource=\$clst_boot_kernel_${kname}_sources" - -if [ -z "${ksource}" ] -then - ksource="virtual/linux-sources" -fi +[[ -z ${ksource} ]] && ksource="sys-kernel/gentoo-sources" # Check if we have a match in kerncach