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 26EDC15800F for ; Tue, 17 Jan 2023 16:03:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11C8EE07C7; Tue, 17 Jan 2023 16:03:19 +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 EF374E07C7 for ; Tue, 17 Jan 2023 16:03:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6389340D30 for ; Tue, 17 Jan 2023 16:03:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF76D836 for ; Tue, 17 Jan 2023 16:03:15 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1673971381.b28240ad2f78ec1ff5395432db4def46be7effb3.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b28240ad2f78ec1ff5395432db4def46be7effb3 X-VCS-Branch: master Date: Tue, 17 Jan 2023 16:03:15 +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: 3f2cd266-3f06-41f6-98ab-2eb54736807b X-Archives-Hash: 0329d536284e0c68edf937efc0fdd4fb commit: b28240ad2f78ec1ff5395432db4def46be7effb3 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jan 17 15:52:38 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jan 17 16:03:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28240ad sys-boot/grub: clean up autogen.sh handling Signed-off-by: Mike Gilbert gentoo.org> sys-boot/grub/grub-9999.ebuild | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 3f9fdfc128e2..cc531c4c9010 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -5,13 +5,13 @@ EAPI=7 # This ebuild uses 3 special global variables: # GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib). -# GRUB_AUTOGEN: Depend on python and invoke the autogen.sh. +# GRUB_AUTOGEN: Depend on python and invoke autogen.sh. # GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf. # # When applying patches: # If gnulib is updated, set GRUB_BOOTSTRAP=1 -# If *.def is updated, set GRUB_AUTOGEN=1 -# If gnulib, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1 +# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1 +# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1 # # If any of the above applies to a user patch, the user should set the # corresponding variable in make.conf or the environment. @@ -156,8 +156,6 @@ src_unpack() { src_prepare() { default - sed -i -e /autoreconf/d autogen.sh || die - if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then python_setup else @@ -168,7 +166,7 @@ src_prepare() { eautopoint --force AUTOPOINT=: AUTORECONF=: ./bootstrap || die elif [[ -n ${GRUB_AUTOGEN} ]]; then - ./autogen.sh || die + FROM_BOOTSTRAP=1 ./autogen.sh || die fi if [[ -n ${GRUB_AUTORECONF} ]]; then