Add the host name to the package name.

Adding the host name results in the tar files created by the
--bset-tar-file and --pkg-tar-files to contain the host name.
This is useful when building Cxc packages.

12 files changed, 14 insertions, 14 deletions

diff --git a/bare/config/gnu-tools-4.6.bset b/bare/config/gnu-tools-4.6.bset
index 54d9a56..fa3ced8 100644
--- a/bare/config/gnu-tools-4.6.bset
+++ b/bare/config/gnu-tools-4.6.bset
@@ -4,7 +4,7 @@
 
 %define release 1
 
-package: gnu-tool-%{_target}-%{release}
+package: gnu-tool-%{_target}-%{_host}-%{release}
 
 #
 # Project custom message
diff --git a/bare/config/gnu-tools-4.8.2.bset b/bare/config/gnu-tools-4.8.2.bset
index b428d88..9dd4b8a 100644
--- a/bare/config/gnu-tools-4.8.2.bset
+++ b/bare/config/gnu-tools-4.8.2.bset
@@ -4,7 +4,7 @@
 
 %define release 1
 
-package: gnu-tools-%{_target}-%{release}
+package: gnu-tools-%{_target}-%{_host}-%{release}
 
 #
 # Project custom message
diff --git a/bare/config/lang/gcc491.bset b/bare/config/lang/gcc491.bset
index 9281041..39e5296 100644
--- a/bare/config/lang/gcc491.bset
+++ b/bare/config/lang/gcc491.bset
@@ -4,7 +4,7 @@
 
 %define release 1
 
-package: gcc491-%{_target}-%{release}
+package: gcc491-%{_target}-%{_host}-%{release}
 
 #
 # Project custom message
diff --git a/rtems/config/4.10/rtems-autotools.bset b/rtems/config/4.10/rtems-autotools.bset
index b56b3cd..004bb31 100644
--- a/rtems/config/4.10/rtems-autotools.bset
+++ b/rtems/config/4.10/rtems-autotools.bset
@@ -14,7 +14,7 @@
 #
 # The autotoolspackage.
 #
-package: rtems-%{rtems_version}-autotools-%{release}
+package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
 
 #
 # Tools configuration.
diff --git a/rtems/config/4.11/rtems-autotools-base.bset b/rtems/config/4.11/rtems-autotools-base.bset
index fb446d4..601be1a 100644
--- a/rtems/config/4.11/rtems-autotools-base.bset
+++ b/rtems/config/4.11/rtems-autotools-base.bset
@@ -14,7 +14,7 @@
 #
 # The autotools package.
 #
-package: rtems-%{rtems_version}-autotools-%{release}
+package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
 
 #
 # Tools configuration.
diff --git a/rtems/config/4.9/rtems-autotools.bset b/rtems/config/4.9/rtems-autotools.bset
index b56b3cd..004bb31 100644
--- a/rtems/config/4.9/rtems-autotools.bset
+++ b/rtems/config/4.9/rtems-autotools.bset
@@ -14,7 +14,7 @@
 #
 # The autotoolspackage.
 #
-package: rtems-%{rtems_version}-autotools-%{release}
+package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
 
 #
 # Tools configuration.
diff --git a/rtems/config/rtems-base.bset b/rtems/config/rtems-base.bset
index 1c4b724..0e61423 100644
--- a/rtems/config/rtems-base.bset
+++ b/rtems/config/rtems-base.bset
@@ -10,7 +10,7 @@
 #
 # The generic package name.
 #
-package: rtems-%{rtems_version}-%{_target}-%{release}
+package: rtems-%{rtems_version}-%{_target}-%{_host}-%{release}
 
 #
 # Project custom message
diff --git a/source-builder/config/binutils-2-1.cfg b/source-builder/config/binutils-2-1.cfg
index 42b45d7..c74a2c7 100644
--- a/source-builder/config/binutils-2-1.cfg
+++ b/source-builder/config/binutils-2-1.cfg
@@ -14,7 +14,7 @@
 #
 # The description.
 #
-Name:      %{_target}-binutils-%{binutils_version}-%{release}
+Name:      %{_target}-binutils-%{binutils_version}-%{_host}-%{release}
 Summary:   Binutils v%{binutils_version} for target %{_target} on host %{_host}
 Version:   %{binutils_version}
 Release:   %{release}
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index 700cc87..35e7efa 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -14,7 +14,7 @@
 #
 # The package description.
 #
-Name:      %{_target}-gcc-%{gcc_version}-newlib-%{newlib_version}-%{release}
+Name:      %{_target}-gcc-%{gcc_version}-newlib-%{newlib_version}-%{_host}-%{release}
 Summary:   GCC v%{gcc_version} and Newlib v%{newlib_version} for target %{_target} on host %{_host}
 Version:   %{gcc_version}
 Release:   %{release}
diff --git a/source-builder/config/gdb-6-1.cfg b/source-builder/config/gdb-6-1.cfg
index ae1f877..deca448 100644
--- a/source-builder/config/gdb-6-1.cfg
+++ b/source-builder/config/gdb-6-1.cfg
@@ -6,7 +6,7 @@
 
 %include %{_configdir}/checks.cfg
 
-Name:      %{_target}-gdb-%{gdb_version}-%{release}
+Name:      %{_target}-gdb-%{gdb_version}-%{_host}-%{release}
 Summary:   GDB v%{gdb_version} for target %{_target} on host %{_host}
 Version:   %{gdb_version}
 Release:   %{release}
diff --git a/source-builder/config/gdb-7-1.cfg b/source-builder/config/gdb-7-1.cfg
index 4418c8f..11d2cbc 100644
--- a/source-builder/config/gdb-7-1.cfg
+++ b/source-builder/config/gdb-7-1.cfg
@@ -33,7 +33,7 @@
 #
 # The description.
 #
-Name:      %{_target}-gdb-%{gdb_version}-%{release}
+Name:      %{_target}-gdb-%{gdb_version}-%{_host}-%{release}
 Summary:   GDB v%{gdb_version} for target %{_target} on host %{_host}
 Version:   %{gdb_version}
 Release:   %{release}
diff --git a/source-builder/config/or1ksim-1-1.cfg b/source-builder/config/or1ksim-1-1.cfg
index 30dfe13..fb77567 100644
--- a/source-builder/config/or1ksim-1-1.cfg
+++ b/source-builder/config/or1ksim-1-1.cfg
@@ -8,7 +8,7 @@
 %define release 1
 %endif
 
-Name:      or1ksim-1.1.0
+Name:      or1ksim-%{or1ksim_version}-%{_host}-%{release}
 Summary:   or1ksim-github
 Version:   %{or1ksim_version}
 Release:   %{release}
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 #
 # Source
 #
-%source set or1ksim https://github.com/openrisc/or1ksim/archive/or1k-master.zip 
+%source set or1ksim https://github.com/openrisc/or1ksim/archive/or1k-master.zip
 
 #
 # Prepare the source code.
@@ -33,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 %build
   build_top=$(pwd)
 
-  cd or1ksim-or1k-master/ 
+  cd or1ksim-or1k-master/
 
   ../or1ksim-or1k-master/configure \
   --target=or1k-elf            \