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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, 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 EDB33C433ED for ; Fri, 14 May 2021 10:29:14 +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 736D261396 for ; Fri, 14 May 2021 10:29:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 736D261396 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]:56258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhV4D-0007ah-Jy for qemu-devel@archiver.kernel.org; Fri, 14 May 2021 06:29:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhUy5-0000LV-QV for qemu-devel@nongnu.org; Fri, 14 May 2021 06:22:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhUy2-0007P9-HV for qemu-devel@nongnu.org; Fri, 14 May 2021 06:22:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620987769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tlXm9fVnhbKRgOmNDNe/uaJeAebTfBheO3ZsqWoNnUk=; b=h3abC28qxI4xGJt4YyW4O4ioAGmaXd9PVdRYkAd2+xWlc95OGWZibsZZZMSpNnfzj6EWme pJTc29mXc7Xh4LAI/Po7i5j84kxwtkBth0Vc5Dbt+W0PVwoq/6DgX6tYIONk4aibvsTh4L iPEOBfB8XaZwt9l5iqgM5vhl0GTVkdc= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-LwlI5fRXMoGsC2YZPmxKuw-1; Fri, 14 May 2021 06:22:48 -0400 X-MC-Unique: LwlI5fRXMoGsC2YZPmxKuw-1 Received: by mail-ed1-f71.google.com with SMTP id k10-20020a50cb8a0000b0290387e0173bf7so16258248edi.8 for ; Fri, 14 May 2021 03:22:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=tlXm9fVnhbKRgOmNDNe/uaJeAebTfBheO3ZsqWoNnUk=; b=fblBqU2WWGsYY5Ic3708rL6jQHN8wu0Ld3iATMbJLfpZJv0oxvh3NW6lU9OvshJ+/I iQjwOVdUyBN7bzbB18BMSHMSjSJj8WmKI3Xt2wuNYsIK0o2tFTggdAOLR7GXKtWuBBjQ 37McSGJJyImDqUYChns4TwfLcHlTUf4R1lm3FL42YnDI3ROw2W4qy/YkUWqXRBhiTJZm AxXH3UkEtw/SPPvvkr/CZD+pGTVi4eepjKNuaa6Rki0sWg8MV+2GfErk3RcOeada0pyl TKh4g56nhXkWLWEAvNqhVBHL3P/wQF2vwahc8o5bvqvTj/rKwaCLYQQwl8Gnz7HsWWCX ZAVg== X-Gm-Message-State: AOAM533vsSkqVhbJXkn5WYoDPeyKqzm/x2ejPuLOtgRZRhBNCXbrD8jn vKCdCLJbfNoCAk7gLHe7BCN2zxY4fl32EEo7mfGi6Dx2S5C57vSymIi8+nNhybPAh5KnLW5+jso YwZqczrPkwTMWDb+8R/u2oYjUb3bzOF+NKqpfXulFGCYQcKaQYTy97hNhjN9QBvF8 X-Received: by 2002:a17:906:2559:: with SMTP id j25mr46881415ejb.42.1620987766279; Fri, 14 May 2021 03:22:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLhx/JtnPFs6B7SIzG1yj8S9QK3kgmgkWD78xTN6IS3J8st237fHnYlxVAQ6+CpfE4wkggnA== X-Received: by 2002:a17:906:2559:: with SMTP id j25mr46881394ejb.42.1620987765956; Fri, 14 May 2021 03:22:45 -0700 (PDT) Received: from [192.168.1.36] (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id cq9sm2577110edb.44.2021.05.14.03.22.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 May 2021 03:22:45 -0700 (PDT) Subject: Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches To: Thomas Huth , Paolo Bonzini , Peter Maydell References: <20210503104456.1036472-1-thuth@redhat.com> <66206f67-f3c8-eb1c-fd5d-8c7555fe5316@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <11382e1f-4ab9-6f04-6c53-938bd50a1e78@redhat.com> Date: Fri, 14 May 2021 12:22:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=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: , Cc: QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 5/9/21 6:05 PM, Thomas Huth wrote: > On 07/05/2021 14.41, Paolo Bonzini wrote: >> On 07/05/21 11:45, Thomas Huth wrote: >>> >>> >>> diff --git a/Makefile b/Makefile >>> index bcbbec71a1..3088502329 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -85,7 +85,8 @@ x := $(shell rm -rf meson-private meson-info >>> meson-logs) >>>   endif >>> >>>   # 1. ensure config-host.mak is up-to-date >>> -config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios >>> $(SRC_PATH)/VERSION >>> +config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios >>> $(SRC_PATH)/VERSION \ >>> +                $(SRC_PATH)/default-configs/targets >>>          @echo config-host.mak is out-of-date, running configure >>>          @if test -f meson-private/coredata.dat; then \ >>>            ./config.status --skip-meson; \ >>> >>> I.e. re-run configure if somethings in default-configs/targets changed. >>> Does that look sane? >> >> I am not sure if using a directory is reliable (it's pre-existing for >> pc-bios).  However you probably can use >> >> # currently in tests/Makefile.include, move it to toplevel Makefile >> TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, >> $(ninja-targets))) >> config-host.mak: $(SRC_PATH)/configure >> $(TARGETS:%=default-configs/targets/%) >> >> And then if a file goes missing it will trigger the rebuild of >> config-host.mak. > > Sounds like an idea, too ... but I'm unsure whether it's doable due to > the order of the statements there... TARGETS gets populated from > ninja-targets, but ninja-targets gets set *after* the config-host.mak > block ... would it be safe to move the config-host.mak block around? Not sure I understood Paolo's suggestion, I tried: -- >8 -- diff --git a/Makefile b/Makefile index bcbbec71a1c..3ef3622228b 100644 --- a/Makefile +++ b/Makefile @@ -152,6 +152,10 @@ ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) -d keepdepfile \ $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat) endif + +TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets))) +config-host.mak: $(SRC_PATH)/configure $(TARGETS:%=default-configs/targets/%) + endif # Force configure to re-run if the API symbols are updated --- But still get (after git pull this morning): $ ninja qemu-system-ppc [0/1] Regenerating build files. ... meson.build:1303:2: ERROR: Failed to load default-configs/targets/moxie-softmmu.mak: [Errno 2] No such file or directory: 'default-configs/targets/moxie-softmmu.mak' A full log can be found at meson-logs/meson-log.txt FAILED: build.ninja I'm keeping the directory unmodified in case you want me to try other fixes.