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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55558158451 for ; Mon, 8 Jan 2024 15:36:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E84BE2A05; Mon, 8 Jan 2024 15:36:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5478DE2A05 for ; Mon, 8 Jan 2024 15:36:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B0143432C9 for ; Mon, 8 Jan 2024 15:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1619E95D for ; Mon, 8 Jan 2024 15:36:24 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1704728167.b8500a65023dd4e278af2400ebb94e4768473130.bkohler@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: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: b8500a65023dd4e278af2400ebb94e4768473130 X-VCS-Branch: master Date: Mon, 8 Jan 2024 15:36:24 +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: d0ff88c9-6b45-4297-9cbd-bb59456fd760 X-Archives-Hash: 902927eaf25d215fc04c1660cc7e6f58 commit: b8500a65023dd4e278af2400ebb94e4768473130 Author: Ben Kohler gentoo org> AuthorDate: Mon Jan 8 15:32:28 2024 +0000 Commit: Ben Kohler gentoo org> CommitDate: Mon Jan 8 15:36:07 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b8500a65 kmerge.sh: don't remove the /usr/src/linux symlink Removing this symlink causes failures for any specs building more than one kernel, since we no longer do a full unmerge/remerge of kernel sources between kernel builds. We probably need to set USE=symlink for the kernel sources so that specs building 2 kernels from different sets of sources do not fail. Signed-off-by: Ben Kohler gentoo.org> targets/support/kmerge.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 7114ff91..41fac810 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -207,5 +207,6 @@ fi if [[ ! ${cached_kernel_found} ]]; then run_merge --deselect "${ksource}" - rm /usr/src/linux + # This was breaking multi-kernel iso builds, probably not needed + # rm /usr/src/linux fi