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 D7BB613835C for ; Tue, 20 Oct 2020 08:30:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05105E082B; Tue, 20 Oct 2020 08:30:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E1363E082B for ; Tue, 20 Oct 2020 08:30:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 422C7340CCB for ; Tue, 20 Oct 2020 08:30:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE8503B2 for ; Tue, 20 Oct 2020 08:30:27 +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: <1603177803.0fe50361b38be1f7ad67d4172962c4d2f4adb453.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: 0fe50361b38be1f7ad67d4172962c4d2f4adb453 X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 08:30:27 +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: b241accf-a73b-4b73-bf8a-cd0109ad6638 X-Archives-Hash: f17eddb08fd031b135311547208ce8a2 commit: 0fe50361b38be1f7ad67d4172962c4d2f4adb453 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 22:08:28 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 07:10:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0fe50361 targets: Use USE=symlink when emerging kernel sources Just use the thing that exists instead of rolling our own... Signed-off-by: Matt Turner gentoo.org> 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}" 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 A9A08138359 for ; Wed, 21 Oct 2020 17:58:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83CC2E0980; Wed, 21 Oct 2020 17:58:50 +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 6ACC7E0980 for ; Wed, 21 Oct 2020 17:58:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2CA95340D5A for ; Wed, 21 Oct 2020 17:58:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC7923B3 for ; Wed, 21 Oct 2020 17:58:47 +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: <1603177803.0fe50361b38be1f7ad67d4172962c4d2f4adb453.mattst88@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: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0fe50361b38be1f7ad67d4172962c4d2f4adb453 X-VCS-Branch: master Date: Wed, 21 Oct 2020 17:58:47 +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: ae1cc1c2-c3d6-4bd5-b247-492ae75baf77 X-Archives-Hash: ccca9ccfa7c13ac858cb5d9af7dee8e9 Message-ID: <20201021175847.MWvMD26jT5L1bi8Tx3Gfqfx20rfp7hm9GRVFBgdcysU@z> commit: 0fe50361b38be1f7ad67d4172962c4d2f4adb453 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 22:08:28 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 07:10:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0fe50361 targets: Use USE=symlink when emerging kernel sources Just use the thing that exists instead of rolling our own... Signed-off-by: Matt Turner gentoo.org> 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}"