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 BCFE0138359 for ; Wed, 21 Oct 2020 00:24:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 133C3E0AA4; Wed, 21 Oct 2020 00:24:34 +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 0D521E0AA4 for ; Wed, 21 Oct 2020 00:24:34 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id b26so421669pff.3 for ; Tue, 20 Oct 2020 17:24:34 -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=tIdndjj4xIldP1VpSP5rBV1cpp2qdvFqeOqC4vZcpSM=; b=nlnxd7JrwY/l2jV7BzNsPy0AH+fpkmOC88bkUn8bs8k2NZLAZ/mhJ4k+k4GjotamjA O7VIZryKZA63x6o1vjZE17ufZHmWwq+4maThr2UobeL/8PYIiAmYLNjhlTpVVCoq2wpl DftYcC1ClrkZ8muZQOjuIgfalVfuWgHq1ugPoU7sioCsV/n3s+UE4oS/bxzOeS+yVF2b IGlPyaM9dcfcFXkc7f7lzF7ejQ4n1ZRAO2LAZs7+t2XqYj0Z89+oqLPZYYxv6JUBItfc FFBKnqhgMQzNp6gPXrLlsygVeME2YVC7Lgsb4PDbo11NvaPJg9u4cucUXF88CqxAKzui ZXMg== X-Gm-Message-State: AOAM531f/Rx3Gs3daeqI9gCFFImUySDzvjZiklnSyw6oWIxsr4scAYeh 4U306Dj9GPbUko4kZREJmuGwSq6xZh/lvQ== X-Google-Smtp-Source: ABdhPJzhfML+yJ9pNxq6sHOA/jGAu1M45kaGuhRHco16sX8E3XQwJqMQd+Axl6B04e8lzy30SPuj0Q== X-Received: by 2002:a63:e345:: with SMTP id o5mr704422pgj.398.1603239872771; Tue, 20 Oct 2020 17:24:32 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id q4sm269935pgj.44.2020.10.20.17.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:32 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 21/37] targets: Use USE=symlink when emerging kernel sources Date: Tue, 20 Oct 2020 17:23:28 -0700 Message-Id: <20201021002344.378131-21-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: 8a8cd764-06dc-4081-aafc-434e9a99a1b9 X-Archives-Hash: ff4622feff1d21813e428626527ca005 Just use the thing that exists instead of rolling our own... Signed-off-by: Matt Turner --- targets/support/kmerge.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 1209e330..7eb18313 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -193,9 +193,7 @@ then rm -f ${clst_port_conf}/profile/package.provided fi - [ -L /usr/src/linux ] && rm -f /usr/src/linux - - run_merge "${ksource}" + USE=symlink run_merge "${ksource}" SOURCESDIR="/tmp/kerncache/${kname}/sources" if [ -L /usr/src/linux ] @@ -225,12 +223,8 @@ then fi fi else - run_merge "${ksource}" - #ensure that there is a /usr/src/linux symlink and it points to the sources we just installed - echo "Adjusting /usr/src/linux to point to \ -$(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)" - ln -snf $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \ - /usr/src/linux + USE=symlink run_merge "${ksource}" + if [ ! "${clst_kextraversion}" = "" ] then echo "Setting extraversion to ${clst_kextraversion}" -- 2.26.2