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 EEC9F138359 for ; Wed, 21 Oct 2020 00:24:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 506D2E0A76; Wed, 21 Oct 2020 00:24:23 +0000 (UTC) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) (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 303A6E0A76 for ; Wed, 21 Oct 2020 00:24:23 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id b19so301790pld.0 for ; Tue, 20 Oct 2020 17:24:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9h1pbTC5e6mkNg9Wwn4JIfSeqCUAgZtJKF71GQYZR60=; b=MFFw9+8QKLhZlr0LLjljPWK3THhIeW1uZBgyPjlffEOX5cbL2ftXil2R1GpsKdx3yk Sfgv5i8tH6e+PgCEPs9VBWl3+OtwOKfe3IeECGAP3HcBXcL2lHQ6LXNzqGyxYpyKByv9 0GY7hXimobxLn+M9cKLY/gKu8qoQp1CeNShHscoqziDOG/9fUjv2i3o3oDEKVnlf+DrS 2DNhA+gEcHNvCUdIEAp5kXCA/VZtEzqOy1jLPcNEddRdBK3u5SDCDrfss131+OpvRfcS 7xJXF4AyCnjPncm1efGmqhCUGpaNYrJyX5FQGSbuw/05/jUnVt47WgH+pjJPrDfAD2YT 97EQ== X-Gm-Message-State: AOAM532oXqGwUmBDhIBM7ArLFuwvcV8VmieTCry3eFZTCYCHpQxObM1/ pE4WFoLcpNKL6TGCfD+YqBpIcFsDRgWO/w== X-Google-Smtp-Source: ABdhPJwNerrLux6pR+pnHPI3RxZxEP6SHkLqIdjyfl632kxyoxqnzjDMTboP5yQtkZn/KuXS4bMQLA== X-Received: by 2002:a17:90a:e556:: with SMTP id ei22mr621484pjb.43.1603239861977; Tue, 20 Oct 2020 17:24:21 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id w19sm186035pff.6.2020.10.20.17.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:21 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 15/37] targets: Use pkgcache for kernel sources Date: Tue, 20 Oct 2020 17:23:22 -0700 Message-Id: <20201021002344.378131-15-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: b95bf6b7-1c31-4b44-98ee-0df879adcd60 X-Archives-Hash: e926eac068f4bae2bbf74ac6401083ce 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 --- 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 ] -- 2.26.2