From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9859559CA9 for ; Sun, 27 Mar 2016 04:55:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE65121C014; Sun, 27 Mar 2016 04:55:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 751E421C014 for ; Sun, 27 Mar 2016 04:55:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2C25340BCB for ; Sun, 27 Mar 2016 04:55:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17B8D201 for ; Sun, 27 Mar 2016 04:55:31 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1459054506.71e548298c6f9a42c8f99f43864a738d3c5f4a00.vapier@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: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 71e548298c6f9a42c8f99f43864a738d3c5f4a00 X-VCS-Branch: master Date: Sun, 27 Mar 2016 04:55:31 +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-Archives-Salt: d24e2ab2-c342-43d7-a7d4-74db85cdfbc9 X-Archives-Hash: 69660b6d84e08db1530219d4365931eb commit: 71e548298c6f9a42c8f99f43864a738d3c5f4a00 Author: Mike Frysinger gentoo org> AuthorDate: Wed Mar 23 02:46:33 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Mar 27 04:55:06 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=71e54829 kmerge: do not use --nodeps with kernel install The kernel might pull in some tools needed to build it (like bc), so don't merge it with --nodeps. Seems like its inclusion in fed3b45bb608d2022fbc2 was an oversight. targets/support/kmerge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 3d4afea..fc066cc 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -220,7 +220,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1 SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" if [ -L /usr/src/linux ]