From e02eaa67b6ed0c49b660a3d32544337fcb87e5a1 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 7 Mar 2016 11:59:51 +1100 Subject: [PATCH] qemu: Add a package name to create a tarball. --- bare/config/devel/qemu.bset | 5 +++++ source-builder/sb/setbuilder.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bare/config/devel/qemu.bset b/bare/config/devel/qemu.bset index e15339d..db147fe 100644 --- a/bare/config/devel/qemu.bset +++ b/bare/config/devel/qemu.bset @@ -4,6 +4,11 @@ %define release 1 +# +# Name of the package. +# +package: qemu-%{qemu_version}-%{_host}-%{release} + # # A magic internal path that would break if changes in the defaults.mc # macro file are made. diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index e213d03..d899916 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -197,7 +197,7 @@ class buildset: if (self.opts.get_arg('--bset-tar-file') or self.opts.canadian_cross()) \ and not _build.macros.get('%{_disable_packaging}'): path.mkdir(tardir) - tar = path.join(tardir, _build.config.expand('%s.tar.bz2' % (self.bset_pkg))) + tar = path.join(tardir, _build.config.expand('%s.tar.bz2' % (_build.main_package().name()))) log.notice('tarball: %s' % (os.path.relpath(path.host(tar)))) if not self.opts.dry_run(): tmproot = _build.config.expand('%{_tmproot}')