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 58082138359 for ; Wed, 21 Oct 2020 00:24:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2735E0AA5; Wed, 21 Oct 2020 00:24:37 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) (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 ABED8E0AA5 for ; Wed, 21 Oct 2020 00:24:37 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id 144so417673pfb.4 for ; Tue, 20 Oct 2020 17:24:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kmGYCbSkdf8SDlY/5XKhLtUjIL/TMJP7o23c7X+Y8LU=; b=tbhg1RyAbXc0f9pBvmeqwI5+xlNuQRMC/wNARoxpLrbuUEpgSjdcCwLad2U+ux7/VT UWbj52hBQk83s/1W7PjTQPi+pOLXYLOqxLsX/QFJSSlaNCgSjCPKyqCGMuzGRGrYe1ed xenmBm/qN2p4uEhkDO8groqZ0VvS7Qyvkm6OaAprIW++J8wbEXYBC59ExHh5WRhOpQ8l U/VbKOveyHj6HMXLl13Bn655WmBOR6h1Rg1pwPMPaQ1PCG0zNVyOCnz6C6YMj+SQ3tBL kAiDjOliVMTX8YzJkUAenoL+3rD4kYcz+QvgicXrfymbEec0N5mfh2HcDj99tlqpkOkW SUCw== X-Gm-Message-State: AOAM530B4NyYdzyAgzfuv81u0lpDXci+y8SKYzDdammgoHFhQtT91do4 6QLHJfWMdCDa+fWp/OeFgdM3zfEWUHnGCA== X-Google-Smtp-Source: ABdhPJx/YEzmkH70hk4wUClvIMxPgqL8vpjoItvTOtIqgfBvletXYv/cA5T71X2KIU0X27juAV8rPg== X-Received: by 2002:aa7:8588:0:b029:155:7861:4c47 with SMTP id w8-20020aa785880000b029015578614c47mr647871pfn.14.1603239876446; Tue, 20 Oct 2020 17:24:36 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id y1sm252864pjl.12.2020.10.20.17.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:35 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 23/37] targets: Default to sys-kernel/gentoo-sources directly Date: Tue, 20 Oct 2020 17:23:30 -0700 Message-Id: <20201021002344.378131-23-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@gentoo.org> 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: e6d7e147-be92-4fbd-b5ea-1edbba79fcce X-Archives-Hash: 871a3e8c2fc49a497b6e12b72430d30d 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 --- 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 40e208e4..c4136dec 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 -- 2.26.2