[rtems-source-builder commit] qemu: Add a package name to create a tarball.

Chris Johns chrisj at rtems.org
Mon Mar 7 04:29:09 UTC 2016


Module:    rtems-source-builder
Branch:    master
Commit:    e645642255cc77468e48f471f7de1b5f8ed38747
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=e645642255cc77468e48f471f7de1b5f8ed38747

Author:    Chris Johns <chrisj at rtems.org>
Date:      Mon Mar  7 11:59:51 2016 +1100

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
@@ -5,6 +5,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}')



More information about the vc mailing list