From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7D9AC433F5 for ; Tue, 21 Sep 2021 12:49:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F3E461168 for ; Tue, 21 Sep 2021 12:49:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3F3E461168 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:34296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSfDT-0004f7-97 for qemu-devel@archiver.kernel.org; Tue, 21 Sep 2021 08:49:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSfCZ-0003ob-IA for qemu-devel@nongnu.org; Tue, 21 Sep 2021 08:48:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSfCV-0003H8-NM for qemu-devel@nongnu.org; Tue, 21 Sep 2021 08:48:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632228521; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=n5D1ImWB9w4DIFcvAxhdSnbsDSuN/g9P2gxMEandinI=; b=Ui8+sMAwih3Cc2v8vN+EGC1j5wabXlUQl880TJrtqJTGwLIdXGCmGpH6bIabuQ37ak48MH 50qzBk89PjrP7GYp9Bl5Qmed6vUEhGxLA6CH+sbEM3s0rgGkwRQanik12hkQks39itejiL ZBO50OYfGW4TeZ7dbWSyFBvArrVKn2Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-147-WHk3-JO-OayAxqB6xHYLDg-1; Tue, 21 Sep 2021 08:48:35 -0400 X-MC-Unique: WHk3-JO-OayAxqB6xHYLDg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB7F5BBEE7; Tue, 21 Sep 2021 12:48:34 +0000 (UTC) Received: from redhat.com (unknown [10.39.195.77]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C820F101E1C5; Tue, 21 Sep 2021 12:48:33 +0000 (UTC) Date: Tue, 21 Sep 2021 13:48:31 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Peter Maydell Subject: Re: [PULL 0/3] Update meson version Message-ID: References: <20210918093140.5797-1-pbonzini@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.475, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Paolo Bonzini , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Sep 21, 2021 at 01:40:36PM +0100, Peter Maydell wrote: > On Sat, 18 Sept 2021 at 10:34, Paolo Bonzini wrote: > > > > The following changes since commit 831aaf24967a49d7750090b9dcfd6bf356f16529: > > > > Merge remote-tracking branch 'remotes/marcandre/tags/misc-pull-request' into staging (2021-09-14 18:14:56 +0100) > > > > are available in the Git repository at: > > > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > > > for you to fetch changes up to ccc3f971c37bd2202a21abc9f0be093f10426364: > > > > hexagon: use env keyword argument to pass PYTHONPATH (2021-09-15 09:12:55 +0200) > > > > ---------------------------------------------------------------- > > * Update Meson to 0.58.2 > > > > ---------------------------------------------------------------- > > Paolo Bonzini (3): > > meson: bump submodule to 0.58.2 > > meson: switch minimum meson version to 0.58.2 > > hexagon: use env keyword argument to pass PYTHONPATH > > So, I tried merging this, ran into some "is this an issue with this > pullreq or is it just an intermittent or infrastructure" issues, > and decided to postpone the merge for a bit and retry it later. > > It has made an absolute mess of my incremental build setups. > They now all fail with errors like this, even after having blown > away the build directory and re-created it: Might want to 'git submodule deinit --all --force' to purge all currently checked out submodules, so it'll then re-init them in a clean (older) state. In theory this should be handled by the git-submodule.sh script we have in QEMU, but 'deinit' is a big hammer to try if wierd things appear to be happening despite cleaning the build dir. > Is there anything that can be done to make meson version bumps > not a horrific pain to back out ? This seems to go wrong pretty > much every time. Save your previous 'build' directory contents somewhere safe and record the submodule checkout hashes, so they can be reset to that ? Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|