From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=57965 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OFl1G-0004o4-MA
	for qemu-devel@nongnu.org; Sat, 22 May 2010 05:29:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <blauwirbel@gmail.com>) id 1OFl1B-00026p-A0
	for qemu-devel@nongnu.org; Sat, 22 May 2010 05:29:22 -0400
Received: from mail-pz0-f181.google.com ([209.85.222.181]:58474)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <blauwirbel@gmail.com>) id 1OFl1B-00026g-5I
	for qemu-devel@nongnu.org; Sat, 22 May 2010 05:29:17 -0400
Received: by pzk11 with SMTP id 11so1063402pzk.28
	for <qemu-devel@nongnu.org>; Sat, 22 May 2010 02:29:16 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <20100512194204.GA9273@zubnet.me.uk>
References: <20100512194204.GA9273@zubnet.me.uk>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 22 May 2010 09:28:56 +0000
Message-ID: <AANLkTik288A_-RG3yMeYr758ztpgCHnBsnTWqm6TRNXP@mail.gmail.com>
Subject: Re: [Qemu-devel] [PATCH] Fix tarbin Makefile rule
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stuart Brady <sdb@zubnet.me.uk>
Cc: qemu-devel@nongnu.org

Thanks, applied.

On Wed, May 12, 2010 at 7:42 PM, Stuart Brady <sdb@zubnet.me.uk> wrote:
> The 'tarbin' Makefile rule doesn't include qemu-system-sparc64, but
> should do, now that sparc64-softmmu is in the default target list.
>
> The rule attempts to tar up binaries that were not built if a target
> list was passed to the configure script -- in which case, it will
> either fail, or otherwise include binaries from previous builds.
>
> Fix both problems once and for all by building a list of binaries to
> include in the tarball, using the list of targets to be built.
>
> Signed-off-by: Stuart Brady <sdb@zubnet.me.uk>
> ---
> diff --git a/Makefile b/Makefile
> index eb9e02b..25c825c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -298,43 +298,22 @@ tar:
> =C2=A0 =C2=A0 =C2=A0 =C2=A0cd /tmp && tar zcvf ~/$(FILE).tar.gz $(FILE) -=
-exclude CVS --exclude .git --exclude .svn
> =C2=A0 =C2=A0 =C2=A0 =C2=A0rm -rf /tmp/$(FILE)
>
> +SYSTEM_TARGETS=3D$(filter %-softmmu,$(TARGET_DIRS))
> +SYSTEM_PROGS=3D$(patsubst qemu-system-i386,qemu, \
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(patsubst %-softmmu,qemu-sys=
tem-%, \
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(SYSTEM_TARGETS)))
> +
> +USER_TARGETS=3D$(filter %-user,$(TARGET_DIRS))
> +USER_PROGS=3D$(patsubst %-bsd-user,qemu-%, \
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(patsubst %-darwin-user,qemu-%, \
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(patsubst %-linux-user,qemu-%, \
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(USER_TARGETS))))
> +
> =C2=A0# generate a binary distribution
> =C2=A0tarbin:
> =C2=A0 =C2=A0 =C2=A0 =C2=A0cd / && tar zcvf ~/qemu-$(VERSION)-$(ARCH).tar=
.gz \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-x86_64 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-arm \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-cris \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-m68k \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-microblaze \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-mips \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-mipsel \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-mips64 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-mips64el \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-ppc \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-ppcemb \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-ppc64 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-sh4 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-sh4eb \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-system-sparc \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-i386 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-x86_64 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-alpha \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-arm \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-armeb \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-cris \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-m68k \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-microblaze \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-mips \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-mipsel \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-ppc \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-ppc64 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-ppc64abi32 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-sh4 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-sh4eb \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-sparc \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-sparc64 \
> - =C2=A0 =C2=A0 =C2=A0 $(bindir)/qemu-sparc32plus \
> + =C2=A0 =C2=A0 =C2=A0 $(patsubst %,$(bindir)/%, $(SYSTEM_PROGS)) \
> + =C2=A0 =C2=A0 =C2=A0 $(patsubst %,$(bindir)/%, $(USER_PROGS)) \
> =C2=A0 =C2=A0 =C2=A0 =C2=A0$(bindir)/qemu-img \
> =C2=A0 =C2=A0 =C2=A0 =C2=A0$(bindir)/qemu-nbd \
> =C2=A0 =C2=A0 =C2=A0 =C2=A0$(datadir)/bios.bin \
>
>
>