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=-5.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no 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 F3BDFC433DB for ; Mon, 1 Feb 2021 15:49:42 +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 4323664DE1 for ; Mon, 1 Feb 2021 15:49:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4323664DE1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6bSO-0000VT-TW for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 10:49:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6bRc-0007x5-9x for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:48:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6bRY-0007Qt-E1 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 10:48:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612194527; 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=laaY2JoEs1rYtl28GMyzVZuugf3raXmUCQF0DUxH6xc=; b=OCsZ90cw/eVGc5t5ZrEmt/OOKh9DC97j1q1ZwQG+gYq84kJacqQzaoT3mueNTyVWdXxYW/ c0kMHf3XRi2ebkwRbBUAkuuP3+s/fwyofYYtAKvEDuAZ3kTkmGPYh1Ve4+vL8GyHa9r6/q T1XRJUBAOFrFpGei7ippsM2qSXSrjNc= 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-459-WW-SwdIKMe-xyvkDhY4Zow-1; Mon, 01 Feb 2021 10:48:39 -0500 X-MC-Unique: WW-SwdIKMe-xyvkDhY4Zow-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 910B591F9F7; Mon, 1 Feb 2021 15:46:57 +0000 (UTC) Received: from redhat.com (ovpn-114-195.ams2.redhat.com [10.36.114.195]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE2A72BCF7; Mon, 1 Feb 2021 15:46:55 +0000 (UTC) Date: Mon, 1 Feb 2021 15:46:52 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Programmingkid Subject: Re: Makefile has local changes that will be overwritten Message-ID: <20210201154652.GK4131462@redhat.com> References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: ddstreet@canonical.com, Peter Maydell , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, Feb 01, 2021 at 09:23:24AM -0500, Programmingkid wrote: > When trying to build QEMU I see this error: > > error: Your local changes to the following files would be overwritten by checkout: > Makefile > Please commit your changes or stash them before you switch branches. > Aborting This suggests you've made changes to "Makefile" in your local checkout that aren't committed. What does 'git diff Makefile" say ? > > What I do to see this error: > ./configure --target-list=i386-softmmu > > I did some bisecting and found out this is the patch that causes the problem: > > commit 7d7dbf9dc15be6e1465c756c2c5ae7f1ab104fc8 > Author: Dan Streetman > Date: Tue Jan 19 12:20:46 2021 -0500 > > configure: replace --enable/disable-git-update with --with-git-submodules > > Replace the --enable-git-update and --disable-git-update configure params > with the param --with-git-submodules=(update|validate|ignore) to > allow 3 options for building from a git repo. That commit includes changes to "Makefile", so if you have made local changes to Makefile yourself, this will cause the message you see from git. Either stash your changes, or rebase to resolve them. 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 :|