arm-linux-gnueabi-toolchain: Fix build ID conflict for Fedora 27 and later

3 files changed, 24 insertions, 3 deletions

diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec
index 69eed16..9635eae 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-binutils/arm-linux-gnueabi-binutils.spec
@@ -2,9 +2,13 @@
 %define cross_triplet   arm-linux-gnueabi
 %define cross_sysroot   %{_prefix}/%{cross_triplet}/sys-root
 
+%if 0%{?_unique_build_ids}
+%define _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}"
+%endif
+
 Name:       %{cross_triplet}-binutils
 Version:    2.29.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A GNU collection of binary utilities (%{cross_triplet})
 
 Group:      Development/Tools
@@ -85,6 +89,9 @@ rm -rf %{buildroot}%{_infodir}
 
 
 %changelog
+* Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.29.1-2
+- Fix build ID conflict for Fedora 27 and later
+
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.29.1-1
 - Update to 2.29.1
 
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
index 612f464..3975268 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
@@ -2,6 +2,10 @@
 %define cross_triplet   arm-linux-gnueabi
 %define cross_sysroot   %{_prefix}/%{cross_triplet}/sys-root
 
+%if 0%{?_unique_build_ids}
+%define _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}"
+%endif
+
 %if 0%{!?cross_stage:1}
 %define cross_stage     final
 %endif
@@ -26,7 +30,7 @@
 
 Name:       %{cross_triplet}-gcc%{pkg_suffix}
 Version:    7.2.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    The GNU Compiler Collection (%{cross_triplet})
 
 %define major_version   %(echo %{version} | sed 's/\\..*$//')
@@ -351,6 +355,9 @@ chmod +x %{__ar_no_strip}
 
 
 %changelog
+* Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 7.2.0-3
+- Fix build ID conflict for Fedora 27 and later
+
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 7.2.0-2
 - Rebuilt for Fedora 27 and 28
 
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec
index 0f1218e..eed7e9f 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec
@@ -2,6 +2,10 @@
 %define cross_triplet   arm-linux-gnueabi
 %define cross_sysroot   %{_prefix}/%{cross_triplet}/sys-root
 
+%if 0%{?_unique_build_ids}
+%define _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}"
+%endif
+
 %if 0%{?bootstrap:1}
 %define headers_only    1
 %define pkg_suffix      -headers
@@ -44,7 +48,7 @@
 
 Name:       %{cross_triplet}-glibc%{pkg_suffix}
 Version:    2.26
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    The GNU C Library (%{cross_triplet})
 
 Group:      Development/Libraries
@@ -574,6 +578,9 @@ chmod +x %{__ar_no_strip}
 
 
 %changelog
+* Thu Dec 07 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.26-4
+- Fix build ID conflict for Fedora 27 and later
+
 * Mon Oct 16 2017 Ting-Wei Lan <lantw44@gmail.com> - 2.26-3
 - Rebuilt for Fedora 27 and 28