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 7713B138359 for ; Tue, 20 Oct 2020 04:31:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD14AE0831; Tue, 20 Oct 2020 04:31:52 +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 9CB9CE0831 for ; Tue, 20 Oct 2020 04:31:52 +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 C0BFC3406F2 for ; Tue, 20 Oct 2020 04:31:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A5EA3A5 for ; Tue, 20 Oct 2020 04:31:50 +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: <1603166089.3676184ec6609b36c1b04523ce36a1dfa3f73b79.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: 3676184ec6609b36c1b04523ce36a1dfa3f73b79 X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 04:31:50 +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: a5eb2984-4fa4-4add-adf7-eff342e9c78b X-Archives-Hash: 4c6bf4c9acae00759899abf0ebd6c7fc commit: 3676184ec6609b36c1b04523ce36a1dfa3f73b79 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 23:30:05 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 03:54:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3676184e targets: Emerge kernel sources with --update Ensure that we have the appropriate version. Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 7f1f029c..c241440a 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -189,7 +189,7 @@ then rm -f ${clst_port_conf}/profile/package.provided fi - USE=symlink run_merge "${ksource}" + USE=symlink run_merge --update "${ksource}" SOURCESDIR="/tmp/kerncache/${kname}/sources" if [ -L /usr/src/linux ] @@ -219,7 +219,7 @@ then fi fi else - USE=symlink run_merge "${ksource}" + USE=symlink run_merge --update "${ksource}" if [ ! "${clst_kextraversion}" = "" ] then