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,SPF_PASS, 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 69905C43460 for ; Fri, 14 May 2021 10:27:13 +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 C31A361396 for ; Fri, 14 May 2021 10:27:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C31A361396 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]:52598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhV2F-00054g-3V for qemu-devel@archiver.kernel.org; Fri, 14 May 2021 06:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhV0n-0003cO-1Q for qemu-devel@nongnu.org; Fri, 14 May 2021 06:25:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45588) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhV0l-0000sv-93 for qemu-devel@nongnu.org; Fri, 14 May 2021 06:25:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620987929; 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=krTQ1xP985KMAk0WCsxzfxopd4FyuXN001EYeEPwISM=; b=S1YJJ4mJ+UBovBMixyzfHiIFRgAvN785cydBeFHtQcVg/BYQbPo7dUHYoSY8UDSiztT4hg p8mxGSpEtseA+NZVe2jfYd/U7OlPd9Q8AKhUZl8lb4mqg6O4DyKmoTcKsQ+pIJGsnvxjDW OuZve19yXU8R+EnlGFIwRwTog8xz2ZE= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-z1EJQI_YO-CT_bkhnXyFEQ-1; Fri, 14 May 2021 06:25:27 -0400 X-MC-Unique: z1EJQI_YO-CT_bkhnXyFEQ-1 Received: by mail-wr1-f69.google.com with SMTP id r12-20020adfc10c0000b029010d83323601so12510351wre.22 for ; Fri, 14 May 2021 03:25:27 -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=krTQ1xP985KMAk0WCsxzfxopd4FyuXN001EYeEPwISM=; b=HCFzumS+jKg2XPJZhH+0h25dj1nw0z51e2FF3jf4GtpAtEysRU3J1FWEpyqETAODxF /+8xcY3GNi/0yFHZ6+xhKoeWgugNLcXVZhJcSnaaQabGaoD/7Ehb5Y6DB/xEYA8a7uQn l05ptsM8lia4izLwDV0G9aJk+v9tIQFxvTKBsQW3wQF92Y9/DVr7xcvsfGy7PeKJrvm6 BwVHVUpymKyqZYJgP35kQy7ViuD1ncKQpYI1cHqqDEKLrf1sLKJTF7F48nfevXdUL8mQ kSNwsF6EAt4LZO+cxBhuAdYrdohD/1Kn6LmidfT3tTa2d811nl1pdwEGHYDINNuocavJ rppQ== X-Gm-Message-State: AOAM5327+UDFfQVJUe5N0X516SlNw6FxQhxgWRFTZb3H5BMbI8iUZzVT sSyF2KrIDiHnKeQVWhALtgWqxDLWiQqXB5DmX2U56/Z+tCzNwPYxMI2yy6n+GWZtlmehL52+y1r mWPdio5vQLjsuAXoh1ORsW8c0cXEm0O+qoJfcjsfdAC0XHu6hLI6pcl9R4maV35o= X-Received: by 2002:a05:600c:198a:: with SMTP id t10mr7888065wmq.97.1620987926805; Fri, 14 May 2021 03:25:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9k318xNWpHPvmTCZnhIwvEosarABE+WbwhIyqE1Tl2JG7MA0f/kYXb0vh9yehFKs136rDJQ== X-Received: by 2002:a05:600c:198a:: with SMTP id t10mr7888038wmq.97.1620987926485; Fri, 14 May 2021 03:25:26 -0700 (PDT) Received: from thuth.remote.csb (pd9e83cd9.dip0.t-ipconnect.de. [217.232.60.217]) by smtp.gmail.com with ESMTPSA id d15sm2900091wrv.84.2021.05.14.03.25.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 May 2021 03:25:26 -0700 (PDT) Subject: Re: [PULL 00/10] Gitlab-CI, qtest, moxie removal and misc patches To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Paolo Bonzini , Peter Maydell References: <20210503104456.1036472-1-thuth@redhat.com> <66206f67-f3c8-eb1c-fd5d-8c7555fe5316@redhat.com> <11382e1f-4ab9-6f04-6c53-938bd50a1e78@redhat.com> From: Thomas Huth Message-ID: <9840231d-9b5b-a61e-fd8c-098c1a9a7596@redhat.com> Date: Fri, 14 May 2021 12:25:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <11382e1f-4ab9-6f04-6c53-938bd50a1e78@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@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 14/05/2021 12.22, Philippe Mathieu-Daudé wrote: > 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. If you run ninja directly, you certainly won't fix this issue by patching the "Makefile" ;-) Thomas