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 99C0313835A for ; Tue, 20 Oct 2020 02:50:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D40C8E0829; Tue, 20 Oct 2020 02:50:19 +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 BB491E0829 for ; Tue, 20 Oct 2020 02:50:19 +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 7BA7F340CC8 for ; Tue, 20 Oct 2020 02:50:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00E173B2 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.4e677fb7fbd6d0a9453e2ad653a27565c56c5b11.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: 4e677fb7fbd6d0a9453e2ad653a27565c56c5b11 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: f87fd99c-5357-4aca-a55b-0d4488916680 X-Archives-Hash: 236b118375df91663e6ab8ab5e209f5d commit: 4e677fb7fbd6d0a9453e2ad653a27565c56c5b11 Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 17:11:58 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=4e677fb7 targets: Use pkgcache for kernel sources The rationale for not using it before made sense, given that multiple binpkgs could not exist for the same version of a package. But we now use FEATURES=binpkg-multi-instance so this is no longer the case. The dumbest part of this is that the code wasn't even disabling the package cache. It was instead just overriding PKGDIR to dump the binary package into a location (named "ebuilds" no less!) that emerge would never otherwise use. Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 15a21b90..aec4d71e 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -3,7 +3,6 @@ source /tmp/chroot-functions.sh install -d /tmp/kerncache -PKGDIR=/tmp/kerncache/${kname}/ebuilds setup_gk_args() { # default genkernel args @@ -85,7 +84,6 @@ genkernel_compile(){ else gk_callback_opts=(-qN) fi - PKGDIR=${PKGDIR} if [ -n "${clst_KERNCACHE}" ] then gk_callback_opts+=(-kb) @@ -126,11 +124,6 @@ then ksource="virtual/linux-sources" fi -# Don't use pkgcache here, as the kernel source may get emerged with different -# USE variables (and thus different patches enabled/disabled.) Also, there's no -# real benefit in using the pkgcache for kernel source ebuilds. - - # Check if we have a match in kerncach if [ -n "${clst_KERNCACHE}" ] @@ -145,8 +138,6 @@ then then USE_MATCH=1 else - [ -d /tmp/kerncache/${kname}/ebuilds ] && \ - rm -r /tmp/kerncache/${kname}/ebuilds [ -e /tmp/kerncache/${kname}/usr/src/linux/.config ] && \ rm /tmp/kerncache/${kname}/usr/src/linux/.config fi @@ -181,7 +172,7 @@ then # install dependencies of kernel sources ahead of time in case # package.provided generated below causes them not to be (re)installed - PKGDIR=${PKGDIR} run_merge --onlydeps "${ksource}" + run_merge --onlydeps "${ksource}" # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${kname} @@ -205,7 +196,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} run_merge "${ksource}" + run_merge "${ksource}" SOURCESDIR="/tmp/kerncache/${kname}/sources" if [ -L /usr/src/linux ]