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 DE824138334 for ; Thu, 21 Mar 2019 03:12:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1095E08A4; Thu, 21 Mar 2019 03:12:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AAE2CE08A4 for ; Thu, 21 Mar 2019 03:12:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F08C335C7B for ; Thu, 21 Mar 2019 03:12:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 669EA4B2 for ; Thu, 21 Mar 2019 03:12:21 +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: <1553137859.bddcef62229d2a58f04924e848a014980e6f47bf.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: bddcef62229d2a58f04924e848a014980e6f47bf X-VCS-Branch: master Date: Thu, 21 Mar 2019 03:12:21 +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: 93a84122-fbf3-4d06-bf14-3851f064421e X-Archives-Hash: 6627d73c1be9c3d34fb2be259b9eec46 commit: bddcef62229d2a58f04924e848a014980e6f47bf Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 21 03:10:59 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 21 03:10:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddcef62 sys-boot/grub: bootstrap gnulib in the live ebuild Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/grub/grub-9999.ebuild | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 662c83807ee..0663509415e 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,6 +6,7 @@ EAPI=6 if [[ ${PV} == 9999 ]]; then GRUB_AUTOGEN=1 GRUB_AUTORECONF=1 + GRUB_BOOTSTRAP=1 fi if [[ -n ${GRUB_AUTOGEN} ]]; then @@ -136,6 +137,11 @@ QA_MULTILIB_PATHS="usr/lib/grub/.*" src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack + cd "${P}" || die + local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git" + local GNULIB_REVISION=$(source bootstrap.conf; echo "${GNULIB_REVISION}") + git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" + git-r3_checkout "${GNULIB_URI}" gnulib fi default } @@ -160,11 +166,15 @@ src_prepare() { if [[ -n ${GRUB_AUTOGEN} ]]; then python_setup - bash autogen.sh || die + if [[ -n ${GRUB_BOOTSTRAP} ]]; then + eautopoint --force + AUTOPOINT=: AUTORECONF=: ./bootstrap || die + else + ./autogen.sh || die + fi fi if [[ -n ${GRUB_AUTORECONF} ]]; then - autopoint() { :; } eautoreconf fi }