From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:60502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEHMq-0005gV-Dl for qemu-devel@nongnu.org; Wed, 10 Apr 2019 13:50:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEHMo-0000w7-Mu for qemu-devel@nongnu.org; Wed, 10 Apr 2019 13:50:36 -0400 References: <20190410053629.28829-1-philmd@redhat.com> From: Laszlo Ersek Message-ID: Date: Wed, 10 Apr 2019 19:50:28 +0200 MIME-Version: 1.0 In-Reply-To: <20190410053629.28829-1-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] roms: List and describe the Makefile 'clean' rule List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-trivial@nongnu.org, qemu-devel@nongnu.org On 04/10/19 07:36, Philippe Mathieu-Daud=C3=A9 wrote: > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > roms/Makefile | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/roms/Makefile b/roms/Makefile > index 1ff78b63bb3..f55c4a2d3bb 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -61,6 +61,8 @@ default: > @echo " skiboot -- update skiboot.lid" > @echo " u-boot.e500 -- update u-boot.e500" > @echo " u-boot.sam460 -- update u-boot.sam460" > + @echo " clean -- delete the files generated by the previous= " \ > + "build targets" > =20 > bios: build-seabios-config-seabios-128k build-seabios-config-seabios-2= 56k > cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin This hunk makes sense in general, but it will conflict with my [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates Please let's delay this hunk until after my pull... > @@ -102,7 +104,7 @@ pxe-rom-%: build-pxe-roms > =20 > efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) > =20 > -efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) > +efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools > $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ > -b ipxe/src/bin/$(VID)$(DID).rom \ > -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ This hunk doesn't belong in this patch at all -- it's from my patch [Qemu-devel] [PATCH for-4.1 v4 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools" (The hunk also conflicts with the purpose stated in $SUBJECT.) > @@ -131,7 +133,7 @@ build-efi-roms: build-pxe-roms > # EDK2_BASETOOLS_LDFLAGS=3D'...' \ > # efirom > # > -$(EDK2_EFIROM): > +edk2-basetools: > $(MAKE) -C edk2/BaseTools \ > EXTRA_OPTFLAGS=3D'$(EDK2_BASETOOLS_OPTFLAGS)' \ > EXTRA_LDFLAGS=3D'$(EDK2_BASETOOLS_LDFLAGS)' Ditto. > @@ -156,6 +158,9 @@ skiboot: > $(MAKE) -C skiboot CROSS=3D$(powerpc64_cross_prefix) > cp skiboot/skiboot.lid ../pc-bios/skiboot.lid > =20 > +efi: edk2-basetools > + $(MAKE) -f Makefile.edk2 > + > clean: > rm -rf seabios/.config seabios/out seabios/builds > $(MAKE) -C sgabios clean And this seems to belong to: [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates > @@ -166,3 +171,4 @@ clean: > rm -rf u-boot/build.e500 > $(MAKE) -C u-boot-sam460ex distclean > $(MAKE) -C skiboot clean > + $(MAKE) -f Makefile.edk2 clean >=20 Ditto. So, for qemu-trivial's sake: Nacked-by: Laszlo Ersek Thanks Laszlo 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=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 376D5C10F11 for ; Wed, 10 Apr 2019 17:51:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CB422063F for ; Wed, 10 Apr 2019 17:51:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CB422063F 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 ([127.0.0.1]:35272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEHNm-00067X-BR for qemu-devel@archiver.kernel.org; Wed, 10 Apr 2019 13:51:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEHMq-0005gV-Dl for qemu-devel@nongnu.org; Wed, 10 Apr 2019 13:50:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEHMo-0000w7-Mu for qemu-devel@nongnu.org; Wed, 10 Apr 2019 13:50:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58894) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEHMo-0000vJ-80; Wed, 10 Apr 2019 13:50:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 66E0188ABE; Wed, 10 Apr 2019 17:50:32 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-121-133.rdu2.redhat.com [10.10.121.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4633CBA6E; Wed, 10 Apr 2019 17:50:28 +0000 (UTC) To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-trivial@nongnu.org, qemu-devel@nongnu.org References: <20190410053629.28829-1-philmd@redhat.com> From: Laszlo Ersek Message-ID: Date: Wed, 10 Apr 2019 19:50:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190410053629.28829-1-philmd@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 10 Apr 2019 17:50:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH] roms: List and describe the Makefile 'clean' rule X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190410175028.nPvC7QlkunkpAAhe_fV8rPeEoVabbG_7MMVmGPHhwAg@z> On 04/10/19 07:36, Philippe Mathieu-Daud=C3=A9 wrote: > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > roms/Makefile | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/roms/Makefile b/roms/Makefile > index 1ff78b63bb3..f55c4a2d3bb 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -61,6 +61,8 @@ default: > @echo " skiboot -- update skiboot.lid" > @echo " u-boot.e500 -- update u-boot.e500" > @echo " u-boot.sam460 -- update u-boot.sam460" > + @echo " clean -- delete the files generated by the previous= " \ > + "build targets" > =20 > bios: build-seabios-config-seabios-128k build-seabios-config-seabios-2= 56k > cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin This hunk makes sense in general, but it will conflict with my [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates Please let's delay this hunk until after my pull... > @@ -102,7 +104,7 @@ pxe-rom-%: build-pxe-roms > =20 > efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) > =20 > -efi-rom-%: build-pxe-roms build-efi-roms $(EDK2_EFIROM) > +efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools > $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ > -b ipxe/src/bin/$(VID)$(DID).rom \ > -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ This hunk doesn't belong in this patch at all -- it's from my patch [Qemu-devel] [PATCH for-4.1 v4 06/12] roms/Makefile: replace the $(EDK2_EFIROM) target with "edk2-basetools" (The hunk also conflicts with the purpose stated in $SUBJECT.) > @@ -131,7 +133,7 @@ build-efi-roms: build-pxe-roms > # EDK2_BASETOOLS_LDFLAGS=3D'...' \ > # efirom > # > -$(EDK2_EFIROM): > +edk2-basetools: > $(MAKE) -C edk2/BaseTools \ > EXTRA_OPTFLAGS=3D'$(EDK2_BASETOOLS_OPTFLAGS)' \ > EXTRA_LDFLAGS=3D'$(EDK2_BASETOOLS_LDFLAGS)' Ditto. > @@ -156,6 +158,9 @@ skiboot: > $(MAKE) -C skiboot CROSS=3D$(powerpc64_cross_prefix) > cp skiboot/skiboot.lid ../pc-bios/skiboot.lid > =20 > +efi: edk2-basetools > + $(MAKE) -f Makefile.edk2 > + > clean: > rm -rf seabios/.config seabios/out seabios/builds > $(MAKE) -C sgabios clean And this seems to belong to: [Qemu-devel] [PATCH for-4.1 v4 07/12] roms: build edk2 firmware binaries and variable store templates > @@ -166,3 +171,4 @@ clean: > rm -rf u-boot/build.e500 > $(MAKE) -C u-boot-sam460ex distclean > $(MAKE) -C skiboot clean > + $(MAKE) -f Makefile.edk2 clean >=20 Ditto. So, for qemu-trivial's sake: Nacked-by: Laszlo Ersek Thanks Laszlo