From nobody Mon Feb 9 13:52:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1598976137; cv=none; d=zohomail.com; s=zohoarc; b=gSokxh436r0kJtUgd0vb4OfgcUXK3QtuNFc5O21Rq+T4wXpZDV63nmGA5zrapykb9aGcR9zknRO2WXSaulkpnqVzKtw8FtsuoCtSVPKmLFsvBn2J63JRDkS2g1ZFfd61dFRLzvP5Cp6oUygrxFIGHx8cAUdgkeBELyGL8OAdnqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598976137; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GbroRfMpI0EWDBe0aDmqV7ZNaXkgGlSM688OsrPjiUg=; b=bGex/MxsvdmdV2kZBIx280nfKqo7g5xzMBYPdookCwPGA07cPoR+iutpmBKjhEZEfobavxvl1UuAWNW7WXMDvbjt/jvCW631hvmjxKYGHrUjuCA3DTNKBCPbH3OG9Ms04rCvK+qRW966kX5komZgQ6NfP9wuk+v+BQ5OjyJIoXU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598976137240215.30110559830564; Tue, 1 Sep 2020 09:02:17 -0700 (PDT) Received: from localhost ([::1]:60022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7Lh-0003Qv-Qi for importer@patchew.org; Tue, 01 Sep 2020 10:33:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD78y-0001hS-O5 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:20:16 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50153 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD78x-000563-7V for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:20:16 -0400 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-506-BsOtR3ioOmaC8hHh-Te3Ag-1; Tue, 01 Sep 2020 10:20:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B351425D3 for ; Tue, 1 Sep 2020 14:20:11 +0000 (UTC) Received: from bahia.lan (ovpn-112-6.ams2.redhat.com [10.36.112.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id D34F778B40; Tue, 1 Sep 2020 14:20:10 +0000 (UTC) X-MC-Unique: BsOtR3ioOmaC8hHh-Te3Ag-1 Subject: [PATCH 1/2] Makefile: Add back TAGS/ctags/cscope rules From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 01 Sep 2020 16:20:10 +0200 Message-ID: <159897001005.442705.16516671603870288336.stgit@bahia.lan> In-Reply-To: <159896923655.442705.11922948674073863022.stgit@bahia.lan> References: <159896923655.442705.11922948674073863022.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=205.139.110.61; envelope-from=groug@kaod.org; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 10:16:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no 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: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It is a bit of a pain to be forced to run configure before being able to use cscope and friends. Add back the rules to build them in-tree as before commit a56650518f5b. Fixes: a56650518f5b ("configure: integrate Meson in the build system") Signed-off-by: Greg Kurz --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 81794d5c34a2..8ffe2872915d 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ ninja-distclean:: build.ninja: config-host.mak =20 Makefile.ninja: build.ninja ninjatool - ./ninjatool -t ninja2make --omit clean dist uninstall < $< > $@ + ./ninjatool -t ninja2make --omit clean dist uninstall cscope TAGS ctags <= $< > $@ -include Makefile.ninja =20 ${ninja-targets-c_COMPILER} ${ninja-targets-cpp_COMPILER}: .var.command += =3D -MP @@ -229,6 +229,21 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk =20 +.PHONY: ctags +ctags: + rm -f tags + find "$(SRC_PATH)" -name '*.[hc]' -exec ctags --append {} + + +.PHONY: TAGS +TAGS: + rm -f TAGS + find "$(SRC_PATH)" -name '*.[hc]' -exec etags --append {} + + +cscope: + rm -f "$(SRC_PATH)"/cscope.* + find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed -e 's,^\./,,' > "$(SRC_= PATH)/cscope.files" + cscope -b -i"$(SRC_PATH)/cscope.files" + ifdef INSTALL_BLOBS BLOBS=3Dbios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vg= abios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ From nobody Mon Feb 9 13:52:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1598977272; cv=none; d=zohomail.com; s=zohoarc; b=ie5uxEqA+wQ3mD9NgVF/9SbeAFcGsWWplPBhLFiiRIPID3+e6uqbnyM0VJXGo1VeByRxWZqqXMr1TdhtQzbBOE2SHTIkueczOYSZdE3tmIQl16AxvnWUKn7SlXO6ndxypNqVZsIpg2rC3rDYCCzDyjcR5N5sBXrJ7RmLfV8lf54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598977272; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DujfYD2m+cS5e+sVyvi5R4j350uHACjTyrbxK1H+zEk=; b=OnEdNnnMZbHp/n15OUdGZeIO7i17mZ4jmLJJaHWlAYDBcS19xr2gzg2+0JDZEUtUCLP341uxclQNcb0wAsJY4H01HUrRxkEG+atmYA290t1stEFHpy3c4LZQT8C96HSfva3irIB3PV756DWos7aXalCxknVcn7rz8hlmU1pQwl0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15989772723721010.2700153812957; Tue, 1 Sep 2020 09:21:12 -0700 (PDT) Received: from localhost ([::1]:34626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7Ra-00009B-MG for importer@patchew.org; Tue, 01 Sep 2020 10:39:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD795-0001z7-CV for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:20:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20892 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD793-0005BP-Ky for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:20:23 -0400 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-553-KJqd5laeNCGggcmv5okXgQ-1; Tue, 01 Sep 2020 10:20:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0810E801AF2 for ; Tue, 1 Sep 2020 14:20:18 +0000 (UTC) Received: from bahia.lan (ovpn-112-6.ams2.redhat.com [10.36.112.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DF865C1C4; Tue, 1 Sep 2020 14:20:17 +0000 (UTC) X-MC-Unique: KJqd5laeNCGggcmv5okXgQ-1 Subject: [PATCH 2/2] Makefile: Fix in-tree clean/distclean From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 01 Sep 2020 16:20:16 +0200 Message-ID: <159897001659.442705.15538955005543395950.stgit@bahia.lan> In-Reply-To: <159896923655.442705.11922948674073863022.stgit@bahia.lan> References: <159896923655.442705.11922948674073863022.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=207.211.31.120; envelope-from=groug@kaod.org; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no 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: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Doing 'make clean' or 'make distclean' in a freshly cloned tree results in: make: *** No rule to make target 'ninja-clean', needed by 'clean'. Stop. Make the fallback rules global. While here, change the ninjatool recipe to always have a zero exit status and thus prevent make to emit a warning. Fixes: a56650518f5b ("configure: integrate Meson in the build system") Signed-off-by: Greg Kurz --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 8ffe2872915d..08f4d3eb5c3c 100644 --- a/Makefile +++ b/Makefile @@ -54,13 +54,6 @@ export NINJA=3D./ninjatool # enough to prime the rest of the build. ninjatool: build.ninja =20 -# Only needed in case Makefile.ninja does not exist. -.PHONY: ninja-clean ninja-distclean clean-ctlist -clean-ctlist: -ninja-clean:: -ninja-distclean:: -build.ninja: config-host.mak - Makefile.ninja: build.ninja ninjatool ./ninjatool -t ninja2make --omit clean dist uninstall cscope TAGS ctags <= $< > $@ -include Makefile.ninja @@ -115,6 +108,13 @@ ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)= ),$(if $(MAKECMDGOALS),,fa endif endif =20 +# Only needed in case Makefile.ninja does not exist. +.PHONY: ninja-clean ninja-distclean clean-ctlist +clean-ctlist: +ninja-clean:: +ninja-distclean:: +build.ninja: config-host.mak + include $(SRC_PATH)/rules.mak =20 # lor is defined in rules.mak @@ -195,7 +195,7 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) ###################################################################### =20 clean: recurse-clean ninja-clean clean-ctlist - -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean + if test -f ninjatool; then ./ninjatool $(if $(V),-v,) -t clean; fi # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \