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 33E95138359 for ; Wed, 21 Oct 2020 00:24:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71F6CE0A9B; Wed, 21 Oct 2020 00:24:32 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) (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 6AFA6E0A9B for ; Wed, 21 Oct 2020 00:24:32 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id r10so353135pgb.10 for ; Tue, 20 Oct 2020 17:24:32 -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=GtmVN9HZYyfWPkrZKPJf/tVnuAEppQk71yqknsU4tKI=; b=abxPr6S4eARDyxr+gKrXwRAjOMdWzAEPhqkhL1/UPJ+1G4fxXHfO/YUrI189dYihgr 6SG3jmRqUWITnd3fC9uyDhKzPuWKcnluPWqjTiDuaVEsvoKHILtWrdGPnlqX/O9sTH2t P0u8tTUzBuzJdIy4IKG7Uk+agunrG8mAK78G0c+FME5/pR8l8VE2N0+CZVO6X2Bcj9O/ +sZbz1ZmnJ0zmMC8LOqPhE9tMiANYM7baW+kVoNVByWDZQLPPGg9x2aRlKRzSo8mWv98 fkIbgpF4eyOnOpZiFupmr5GCopM9ER5IaU29MdgmivSWyrfeROnfg8++Sm0myf1XVEj/ UGFw== X-Gm-Message-State: AOAM532a9p4Tj43sMv6J5cr+4y9ssg6I3h9wTIIQUVv6Yxq+nn8tUzHU AaXlXERz0G9AUJGGBnIRfq7niYPiBhjw/Q== X-Google-Smtp-Source: ABdhPJxu8N3oXs1mPq5ERbb/JZgQxfg+Kteid67xsDptj2Gyw7ShEbEDk9RggABeRtIMZY8s77Grbg== X-Received: by 2002:a63:1212:: with SMTP id h18mr739220pgl.196.1603239871124; Tue, 20 Oct 2020 17:24:31 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id z5sm254230pjn.2.2020.10.20.17.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:30 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 20/37] targets: Remove wrong make.conf munging Date: Tue, 20 Oct 2020 17:23:27 -0700 Message-Id: <20201021002344.378131-20-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: de8e52b4-fbcb-4b88-8e69-a13ef295ef31 X-Archives-Hash: cae1c4b3dd2fde19061daaad5c31d673 With pkgcache fixed for kernel sources in a prior commit, I noticed that if a livecd-stage2 built three kernels, the first would emerge normally and build a binpkg, the second would emerge and fail to use the binpkg produced earlier, and the third would use a previously produced binpkg. I discovered the reason is that the second and third emerges are run after USE="... build" has been added to make.conf. We intentionally removed this in commit c0fcbf02 ("kmerge.sh: Don't set USE=build for emerging kernels.") years ago, so I was surprised to find this code. The commit mentioned below inexplicably (and wrongly) readded USE=build to make.conf, failed to update the sed command to remove it, and readded the addition in entirely the wrong spot so it didn't even affect the kernel merge. genkernel doesn't source the system's make.conf, so this code would be entirely useless if it wasn't harmful. Fixes: 0343a18e ("Fix merging kernel without kerncache enabled.") Signed-off-by: Matt Turner --- targets/support/kmerge.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 4f82a01f..1209e330 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -238,14 +238,8 @@ $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev fi fi -# Update USE flag in make.conf -[ -e ${clst_make_conf} ] && \ - echo "USE=\"\${USE} ${kernel_use} build\"" >> ${clst_make_conf} - genkernel_compile -sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf} - if [ -n "${clst_KERNCACHE}" ] then echo ${kernel_use} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE -- 2.26.2