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 8300B138359 for ; Tue, 20 Oct 2020 02:50:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71094E0835; Tue, 20 Oct 2020 02:50:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5B27FE0835 for ; Tue, 20 Oct 2020 02:50:21 +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 3E2E0340CCE for ; Tue, 20 Oct 2020 02:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EA073BC 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.4c9aecb6a0c04bb6115cab906ed8c6c72f8b1c01.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: 4c9aecb6a0c04bb6115cab906ed8c6c72f8b1c01 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: 76c2a12d-c9dc-4d39-8fd9-a78b832eac4e X-Archives-Hash: 5afbb70af954de503aa1ca1eb4b37f23 commit: 4c9aecb6a0c04bb6115cab906ed8c6c72f8b1c01 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 23:30:05 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=4c9aecb6 targets: Emerge kernel sources with --update --changed-use Ensure that we have the appropriate version with appropriate USE flags. 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..ee75e0a8 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 --changed-use "${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 --changed-use "${ksource}" if [ ! "${clst_kextraversion}" = "" ] then