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 A0F0815802E for ; Fri, 28 Jun 2024 06:33:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA29CE2B1D; Fri, 28 Jun 2024 06:33:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 94F1AE2B18 for ; Fri, 28 Jun 2024 06:33:12 +0000 (UTC) From: Ulrich Mueller To: Andrew Nowa Ammerlaan Cc: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH 1/5 v2] mount-boot.eclass: check for ESP as well as /boot, split, eclass In-Reply-To: <6d9a5b23-21d4-417e-86f0-36a0047629d1@gentoo.org> (Andrew Nowa Ammerlaan's message of "Thu, 27 Jun 2024 16:24:20 +0200") References: <38ed17cb-950a-4abd-b904-537388dbe612@gentoo.org> <476674df-a57c-4c4d-ad1e-487211a4daf0@gentoo.org> <6d9a5b23-21d4-417e-86f0-36a0047629d1@gentoo.org> Date: Fri, 28 Jun 2024 08:33:02 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) 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: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Archives-Salt: 3354157c-8869-4459-b3b8-fa3d5547d143 X-Archives-Hash: a488831c7231dcfa6025e30911c7ffcc --=-=-= Content-Type: text/plain >>>>> On Thu, 27 Jun 2024, Andrew Nowa Ammerlaan wrote: > On 27/06/2024 06:00, Ulrich Mueller wrote: >> AFAICS, no EAPI 6 ebuild inherits mount-boot, so EAPI 6 could be >> dropped? > Yes, might as well drop that now. Here's v2: > +# @FUNCTION: mount-boot_is_disabled > +# @INTERNAL > +# @DESCRIPTION: > +# Detect whether the current environment/build settings are such that > we do not > +# want to mess with any mounts. > +mount-boot_is_disabled() { > + # Since this eclass only deals with /boot, skip things when > EROOT is active. > + if [[ ${EROOT:-/} != / ]] ; then This could be simplified to [[ -n ${EROOT} ]], because EROOT is guaranteed not to end in a slash in EAPI 7 and later. (Sorry, I had missed this one in v1.) > + return 0 > + fi > + > + # If we're only building a package, then there's no need to check things. > + if [[ ${MERGE_TYPE} == buildonly ]] ; then > + return 0 > + fi > + > + # The user wants us to leave things be. > + if [[ -n ${DONT_MOUNT_BOOT} ]] ; then > + return 0 > + fi > + > + # OK, we want to handle things ourselves. > + return 1 > +} --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmZ+WR4PHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uWugIAJeRzPKrZvphp3fnAYn7v0jV1ZP5bOlbPctF 9+SRbbbtQ/m4FgTQ0qasZaoc/LERDxpUnjruaDcpzpHk1L4aOjH7Bzq3iRrISoSR Qw81gnUC7pn/tOlJL4s09nno/ZAFHJAjSodgcVJA4zRdN/g8nDvishXhtfsiLtmH UqdKyr4QIN4COuIUEejJftqrddoK3HPrdCmuwvW8yDO8QKrYPzOMRxhK/VHDArWm zQrDAGAG0ZIq0WVvlOse/lUrYWSFu7xZDR38lhP4wpaN3HwJof7CV8U+qphpH2kS 9aKfecGaI9vhWxF/e2d+TkMAODnwxP2f/1F2/PmTizK+9sh3fHw= =25RC -----END PGP SIGNATURE----- --=-=-=--