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 9B99E158020 for ; Wed, 26 Oct 2022 11:31:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFDBDE0919; Wed, 26 Oct 2022 11:31:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7E3B4E0916 for ; Wed, 26 Oct 2022 11:31:45 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 0/4] dist-kernel: Improved kernel version logic, take two Date: Wed, 26 Oct 2022 13:31:36 +0200 Message-Id: <20221026113140.3213-1-mgorny@gentoo.org> X-Mailer: git-send-email 2.38.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 48aa86c9-0a0b-45cf-8d81-2891f41a0d4e X-Archives-Hash: d53c2575562329776a00323e6a403494 Hi, The previous attempt to improve version handling in dist-kernel eclasses turned out not to work for live ebuilds. Let's try a different approach that: 1) uses ${PV}${KV_LOCALVERSION} for /usr/src/linux-* directory (i.e. "6.0_rc1-gentoo-dist" or "5.15.9999-dist") because it's the simplest approach 2) grabs the version from the "release" file for /lib/modules directory (i.e. "6.0.0-rc1-gentoo-dist" or "5.15.74-dist") because that should easily handle all the corner cases, including live ebuilds and custom configs 3) uses the transformed version for the pkg_preinst() version check in non-live ebuilds because that should be good enough to verify that we did not fail to bump genpatches version Michał Górny (4): kernel-build.eclass: Revert "Respect KV_FULL" kernel-install.eclass: Revert "Add KV_FULL [...]" kernel-install.eclass: Account for PV/KV mismatch kernel-build.eclass: Account for PV/KV mismatch eclass/kernel-build.eclass | 45 ++++++++++------- eclass/kernel-install.eclass | 93 ++++++++++++++++++++---------------- 2 files changed, 78 insertions(+), 60 deletions(-) -- 2.38.1