diff options
| author | Vyacheslav Barinov <v.barinov@samsung.com> | 2014-10-31 16:13:01 +0300 |
|---|---|---|
| committer | Vyacheslav Barinov <v.barinov@samsung.com> | 2015-02-16 10:34:10 +0300 |
| commit | 9bb157217c3994d7294155a64d3451d400fe68c7 (patch) | |
| tree | 4c99ea9745360e4246e29313441938d6363f17ee | |
| parent | fa17132886628c55338692026dcff46423bb57f4 (diff) | |
| download | binutils-9bb157217c3994d7294155a64d3451d400fe68c7.tar.gz binutils-9bb157217c3994d7294155a64d3451d400fe68c7.tar.bz2 binutils-9bb157217c3994d7294155a64d3451d400fe68c7.zip | |
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>
| -rw-r--r-- | packaging/cross-aarch64-binutils.spec | 4 | ||||
| -rw-r--r-- | packaging/cross-arm-binutils.spec | 4 | ||||
| -rw-r--r-- | packaging/cross-i386-binutils.spec | 4 | ||||
| -rw-r--r-- | packaging/cross-x86_64-binutils.spec | 4 | ||||
| -rwxr-xr-x | packaging/pre_checkin.sh | 3 |
5 files changed, 9 insertions, 10 deletions
diff --git a/packaging/cross-aarch64-binutils.spec b/packaging/cross-aarch64-binutils.spec index a7cc73941fe..4f4824069f6 100644 --- 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 ae31b44f9f3..0bde260f4f2 100644 --- 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 c34ff70856d..e25e0f3937d 100644 --- 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 00bdc9cb0f3..f4741c586fe 100644 --- 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 ea693f156c6..d71b4da4d7f 100755 --- 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 |