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 B02BB138335 for ; Sun, 17 Mar 2019 07:28:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DE06E09B4; Sun, 17 Mar 2019 07:27:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 76D09E09AD for ; Sun, 17 Mar 2019 07:27:59 +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 03DF3335CC0 for ; Sun, 17 Mar 2019 07:27:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CB8856B for ; Sun, 17 Mar 2019 07:27:56 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1552805591.1a88084e8baffbe1b8fbe4d62c52ddc90d1a9e88.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 1a88084e8baffbe1b8fbe4d62c52ddc90d1a9e88 X-VCS-Branch: master Date: Sun, 17 Mar 2019 07:27:56 +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: c9ce2003-0277-46c4-afba-0cb90b010da7 X-Archives-Hash: 71a6cc32dc9aa12e3c53dc8fcc6fa895 commit: 1a88084e8baffbe1b8fbe4d62c52ddc90d1a9e88 Author: Michal Privoznik redhat com> AuthorDate: Sun Mar 17 05:50:06 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sun Mar 17 06:53:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a88084e app-emulation/libvirt-9999: Update hash generation algorithm I've noticed that bootstrap is run twice. This is because the first time it is run in src_prepare() and there some hash is computed so later when src_configre() gets its word it'll find everything prepared. Well, in the upstream commit of 6d53255377b50b7e412350d079 the hash was changed therefore src_configure() did not find the expected hash and thus re-ran the bootstrap script. Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Matthias Maier gentoo.org> app-emulation/libvirt/libvirt-9999.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index ad8ef5b0f12..d297b556e5b 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -226,8 +226,9 @@ src_prepare() { # bug #377279 ./bootstrap || die "bootstrap failed" ( - git submodule status | sed 's/^[ +-]//;s/ .*//' - git hash-object bootstrap.conf + git submodule status .gnulib | awk '{ print $1 }' + git hash-object bootstrap.conf + git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' ) >.git-module-status fi