Switching ExcludeArch to ExclusiveArch

Helps to avoid cross-arm -> aarch64 and cross-aarch64 -> arm builds.

Change-Id: Iea31ec9aec7d4ddceeb0401bf820135f342fad30
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>

diff --git a/packaging/cross-aarch64-binutils.spec b/packaging/cross-aarch64-binutils.spec
index a7cc739..4f48240 100644 (file)
--- a/packaging/cross-aarch64-binutils.spec
+++ b/packaging/cross-aarch64-binutils.spec
@@ -1,5 +1,5 @@
-Name:         cross-aarch64-binutils
-ExcludeArch: aarch64
+Name:          cross-aarch64-binutils
+ExclusiveArch: %{ix86} x86_64
 %define cross 1
 %define TARGET aarch64
 BuildRequires:  bison

diff --git a/packaging/cross-arm-binutils.spec b/packaging/cross-arm-binutils.spec
index ae31b44..0bde260 100644 (file)
--- a/packaging/cross-arm-binutils.spec
+++ b/packaging/cross-arm-binutils.spec
@@ -1,5 +1,5 @@
-Name:         cross-arm-binutils
-ExcludeArch: %arm
+Name:          cross-arm-binutils
+ExclusiveArch: %{ix86} x86_64
 %define cross 1
 %define TARGET arm
 BuildRequires:  bison

diff --git a/packaging/cross-i386-binutils.spec b/packaging/cross-i386-binutils.spec
index c34ff70..e25e0f3 100644 (file)
--- a/packaging/cross-i386-binutils.spec
+++ b/packaging/cross-i386-binutils.spec
@@ -1,5 +1,5 @@
-Name:         cross-i386-binutils
-ExcludeArch: %ix86
+Name:          cross-i386-binutils
+ExclusiveArch: %{ix86} x86_64
 %define cross 1
 %define TARGET i586
 BuildRequires:  bison

diff --git a/packaging/cross-x86_64-binutils.spec b/packaging/cross-x86_64-binutils.spec
index 00bdc9c..f4741c5 100644 (file)
--- a/packaging/cross-x86_64-binutils.spec
+++ b/packaging/cross-x86_64-binutils.spec
@@ -1,5 +1,5 @@
-Name:         cross-x86_64-binutils
-ExcludeArch: x86_64
+Name:          cross-x86_64-binutils
+ExclusiveArch: %{ix86} x86_64
 %define cross 1
 %define TARGET x86_64
 BuildRequires:  bison

diff --git a/packaging/pre_checkin.sh b/packaging/pre_checkin.sh
index ea693f1..d71b4da 100755 (executable)
--- a/packaging/pre_checkin.sh
+++ b/packaging/pre_checkin.sh
@@ -8,8 +8,7 @@ for arch in arm aarch64 i386 x86_64; do
 
    #ln -f binutils.changes cross-$arch-binutils.changes
    targetarch=`echo $arch | sed -e "s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/"`
-   exclarch=`echo $arch | sed -e 's/parisc/hppa/;s/i.86/%ix86/;s/arm/%arm/'`
-   sed -e "s/^Name:.*binutils\$/Name:         cross-$arch-binutils\nExcludeArch: $exclarch\n%define cross 1\n%define TARGET $targetarch/;" \
+   sed -e "s/^Name:.*binutils\$/Name:\t\tcross-$arch-binutils\nExclusiveArch: %{ix86} x86_64\n%define cross 1\n%define TARGET $targetarch/;" \
        binutils.spec | sed '/manifest/d' |sed '/1001/d' > cross-$arch-binutils.spec
    echo " done."
 done