From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ermYq-0004Ks-Tm for qemu-devel@nongnu.org; Fri, 02 Mar 2018 10:25:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ermYm-0004HL-Uc for qemu-devel@nongnu.org; Fri, 02 Mar 2018 10:25:28 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41392 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ermYm-0004Gv-Lt for qemu-devel@nongnu.org; Fri, 02 Mar 2018 10:25:24 -0500 References: <20180228180215.25470-1-wei@redhat.com> <20180228180215.25470-3-wei@redhat.com> From: Laurent Vivier Message-ID: <3787bc96-7371-49ac-18b1-76f9cd144037@redhat.com> Date: Fri, 2 Mar 2018 16:25:15 +0100 MIME-Version: 1.0 In-Reply-To: <20180228180215.25470-3-wei@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V7 2/4] tests/migration: Convert the boot block compilation script into Makefile List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wei Huang , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, dgilbert@redhat.com, quintela@redhat.com On 28/02/2018 19:02, Wei Huang wrote: > The x86 boot block header currently is generated with a shell script. > To better support other CPUs (e.g. aarch64), we convert the script > into Makefile. This allows us to 1) support cross-compilation easily, > and 2) avoid creating a script file for every architecture. > > Signed-off-by: Wei Huang > Reviewed-by: Andrew Jones > --- > tests/migration/Makefile | 36 ++++++++++++++++++++++++++++++++ > tests/migration/rebuild-x86-bootblock.sh | 33 ----------------------------- > tests/migration/x86-a-b-bootblock.h | 2 +- > tests/migration/x86-a-b-bootblock.s | 5 ++--- > 4 files changed, 39 insertions(+), 37 deletions(-) > create mode 100644 tests/migration/Makefile > delete mode 100755 tests/migration/rebuild-x86-bootblock.sh > > diff --git a/tests/migration/Makefile b/tests/migration/Makefile > new file mode 100644 > index 0000000000..8fbedaa8b8 > --- /dev/null > +++ b/tests/migration/Makefile > @@ -0,0 +1,36 @@ > +# > +# Copyright (c) 2016-2018 Red Hat, Inc. and/or its affiliates > +# > +# Authors: > +# Dave Gilbert > +# > +# This work is licensed under the terms of the GNU GPL, version 2 or later. > +# See the COPYING file in the top-level directory. > +# > +export __note > +override define __note > +/* This file is automatically generated from > + * tests/migration/$<, edit that and then run > + * "make $@" inside tests/migration to update, > + * and then remember to send both in your patch submission. > + */ > +endef > + > +all: x86-a-b-bootblock.h > +# Dummy command so that make thinks it has done something > + @true > + > +SRC_PATH=../.. > +include $(SRC_PATH)/rules.mak does it work in not in-tree build? > + > +x86_64_cross_prefix := $(call find-cross-prefix,x86_64) > + > +x86-a-b-bootblock.h: x86-a-b-bootblock.s > + $(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o > + $(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot > + dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124 > + echo "$$__note" > $@ > + xxd -i x86.bootsect | sed -e 's/.*int.*//' >> $@ To be really in the spirit of a makefile, you should have a rule by target: x86.o: x86-a-b-bootblock.s $(x86_64_cross_prefix)as --32 -march=i486 $< -o x86.o x86.boot: x86.o $(x86_64_cross_prefix)objcopy -O binary x86.o x86.boot x86.bootsect: x86.boot dd if=x86.boot of=x86.bootsect bs=256 count=2 skip=124 x86-a-b-bootblock.h: x86.bootsect echo "$$__note" > header.tmp xxd -i x86.bootsect | sed -e 's/.*int.*//' >> header.tmp mv header.tmp $@ Thanks, Laurent