From 8fa234ceed4ff050d6073e7e49f23600e50f7133 Mon Sep 17 00:00:00 2001 From: Junfeng Dong Date: Thu, 11 Jul 2013 16:43:22 +0800 Subject: [PATCH] Fix gbs packaging problem and disable manifest file for cross toolchain. Not use macro in %setup to satisfy gbs 0.17 and latter version. (DEVT-77) Not set manifest file for cross toolchain. Change-Id: I102754fefde7f1ce454cf1ddde4a6b04d1aa3678 Signed-off-by: Junfeng Dong --- packaging/binutils.changes | 3 +++ packaging/binutils.spec | 6 ++--- packaging/cross-arm-binutils.spec | 43 +++--------------------------------- packaging/cross-i386-binutils.spec | 43 +++--------------------------------- packaging/cross-x86_64-binutils.spec | 43 +++--------------------------------- packaging/pre_checkin.sh | 3 +-- 6 files changed, 16 insertions(+), 125 deletions(-) mode change 100644 => 100755 packaging/pre_checkin.sh diff --git a/packaging/binutils.changes b/packaging/binutils.changes index e3b3570..378e1a9 100644 --- a/packaging/binutils.changes +++ b/packaging/binutils.changes @@ -1,3 +1,6 @@ +* Thu Jul 11 2013 Junfeng Dong accepted/tizen/20130710.221052@5aba908 +- Fix gbs packaging problem and disable manifest file for cross toolchain. + * Sat May 11 2013 Anas Nashif submit/tizen/20130509.172723@9ec8d4c - Set license using %license diff --git a/packaging/binutils.spec b/packaging/binutils.spec index 1de3a71..986d516 100644 --- a/packaging/binutils.spec +++ b/packaging/binutils.spec @@ -42,11 +42,11 @@ Release: 0 # # Url: http://www.gnu.org/software/binutils/ -%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') +#%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') Summary: GNU Binutils License: GFDL-1.3 and GPL-3.0+ Group: Development/Tools/Building -Source: binutils-%{binutils_version}.tar.bz2 +Source: binutils-%{version}.tar.bz2 Source1: pre_checkin.sh Source3: baselibs.conf Source1001: binutils.manifest @@ -95,7 +95,7 @@ binutils. %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." -%setup -q -n binutils-%{binutils_version} +%setup -q cp %{SOURCE1001} . sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h diff --git a/packaging/cross-arm-binutils.spec b/packaging/cross-arm-binutils.spec index 1629f5a..6195437 100644 --- a/packaging/cross-arm-binutils.spec +++ b/packaging/cross-arm-binutils.spec @@ -45,26 +45,13 @@ Release: 0 # # Url: http://www.gnu.org/software/binutils/ -%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') +#%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') Summary: GNU Binutils License: GFDL-1.3 and GPL-3.0+ Group: Development/Tools/Building -Source: binutils-%{binutils_version}.tar.bz2 +Source: binutils-%{version}.tar.bz2 Source1: pre_checkin.sh Source3: baselibs.conf -# Patches auto-generated by git-buildpackage: -Patch0: 0001-skip-rpaths.patch -Patch1: 0002-x86-64-biarch.patch -Patch2: 0003-unit-at-a-time.patch -Patch3: 0004-ld-dtags.patch -Patch4: 0005-ld-relro.patch -Patch5: 0006-testsuite.patch -Patch6: 0007-enable-targets-gold.patch -Patch7: 0008-use-hashtype-both-by-default.patch -Patch8: 0009-build-as-needed.patch -Patch9: 0010-fixup-testcase-perturb.patch -Patch10: 0011-gold-depend-on-opcodes.patch -Patch11: 0012-bso12451.patch %description C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib, @@ -110,31 +97,7 @@ binutils. %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." -%setup -q -n binutils-%{binutils_version} -# 0001-skip-rpaths.patch -%patch0 -p1 -# 0002-x86-64-biarch.patch -%patch1 -p1 -# 0003-unit-at-a-time.patch -%patch2 -p1 -# 0004-ld-dtags.patch -%patch3 -p1 -# 0005-ld-relro.patch -%patch4 -p1 -# 0006-testsuite.patch -%patch5 -p1 -# 0007-enable-targets-gold.patch -%patch6 -p1 -# 0008-use-hashtype-both-by-default.patch -%patch7 -p1 -# 0009-build-as-needed.patch -%patch8 -p1 -# 0010-fixup-testcase-perturb.patch -%patch9 -p1 -# 0011-gold-depend-on-opcodes.patch -%patch10 -p1 -# 0012-bso12451.patch -%patch11 -p1 +%setup -q sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build diff --git a/packaging/cross-i386-binutils.spec b/packaging/cross-i386-binutils.spec index 0209e5f..97fcd44 100644 --- a/packaging/cross-i386-binutils.spec +++ b/packaging/cross-i386-binutils.spec @@ -45,26 +45,13 @@ Release: 0 # # Url: http://www.gnu.org/software/binutils/ -%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') +#%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') Summary: GNU Binutils License: GFDL-1.3 and GPL-3.0+ Group: Development/Tools/Building -Source: binutils-%{binutils_version}.tar.bz2 +Source: binutils-%{version}.tar.bz2 Source1: pre_checkin.sh Source3: baselibs.conf -# Patches auto-generated by git-buildpackage: -Patch0: 0001-skip-rpaths.patch -Patch1: 0002-x86-64-biarch.patch -Patch2: 0003-unit-at-a-time.patch -Patch3: 0004-ld-dtags.patch -Patch4: 0005-ld-relro.patch -Patch5: 0006-testsuite.patch -Patch6: 0007-enable-targets-gold.patch -Patch7: 0008-use-hashtype-both-by-default.patch -Patch8: 0009-build-as-needed.patch -Patch9: 0010-fixup-testcase-perturb.patch -Patch10: 0011-gold-depend-on-opcodes.patch -Patch11: 0012-bso12451.patch %description C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib, @@ -110,31 +97,7 @@ binutils. %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." -%setup -q -n binutils-%{binutils_version} -# 0001-skip-rpaths.patch -%patch0 -p1 -# 0002-x86-64-biarch.patch -%patch1 -p1 -# 0003-unit-at-a-time.patch -%patch2 -p1 -# 0004-ld-dtags.patch -%patch3 -p1 -# 0005-ld-relro.patch -%patch4 -p1 -# 0006-testsuite.patch -%patch5 -p1 -# 0007-enable-targets-gold.patch -%patch6 -p1 -# 0008-use-hashtype-both-by-default.patch -%patch7 -p1 -# 0009-build-as-needed.patch -%patch8 -p1 -# 0010-fixup-testcase-perturb.patch -%patch9 -p1 -# 0011-gold-depend-on-opcodes.patch -%patch10 -p1 -# 0012-bso12451.patch -%patch11 -p1 +%setup -q sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build diff --git a/packaging/cross-x86_64-binutils.spec b/packaging/cross-x86_64-binutils.spec index efcd67d..d28e656 100644 --- a/packaging/cross-x86_64-binutils.spec +++ b/packaging/cross-x86_64-binutils.spec @@ -45,26 +45,13 @@ Release: 0 # # Url: http://www.gnu.org/software/binutils/ -%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') +#%define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') Summary: GNU Binutils License: GFDL-1.3 and GPL-3.0+ Group: Development/Tools/Building -Source: binutils-%{binutils_version}.tar.bz2 +Source: binutils-%{version}.tar.bz2 Source1: pre_checkin.sh Source3: baselibs.conf -# Patches auto-generated by git-buildpackage: -Patch0: 0001-skip-rpaths.patch -Patch1: 0002-x86-64-biarch.patch -Patch2: 0003-unit-at-a-time.patch -Patch3: 0004-ld-dtags.patch -Patch4: 0005-ld-relro.patch -Patch5: 0006-testsuite.patch -Patch6: 0007-enable-targets-gold.patch -Patch7: 0008-use-hashtype-both-by-default.patch -Patch8: 0009-build-as-needed.patch -Patch9: 0010-fixup-testcase-perturb.patch -Patch10: 0011-gold-depend-on-opcodes.patch -Patch11: 0012-bso12451.patch %description C compiler utilities: ar, as, gprof, ld, nm, objcopy, objdump, ranlib, @@ -110,31 +97,7 @@ binutils. %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." -%setup -q -n binutils-%{binutils_version} -# 0001-skip-rpaths.patch -%patch0 -p1 -# 0002-x86-64-biarch.patch -%patch1 -p1 -# 0003-unit-at-a-time.patch -%patch2 -p1 -# 0004-ld-dtags.patch -%patch3 -p1 -# 0005-ld-relro.patch -%patch4 -p1 -# 0006-testsuite.patch -%patch5 -p1 -# 0007-enable-targets-gold.patch -%patch6 -p1 -# 0008-use-hashtype-both-by-default.patch -%patch7 -p1 -# 0009-build-as-needed.patch -%patch8 -p1 -# 0010-fixup-testcase-perturb.patch -%patch9 -p1 -# 0011-gold-depend-on-opcodes.patch -%patch10 -p1 -# 0012-bso12451.patch -%patch11 -p1 +%setup -q sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build diff --git a/packaging/pre_checkin.sh b/packaging/pre_checkin.sh old mode 100644 new mode 100755 index bf75c91..efa09ab --- a/packaging/pre_checkin.sh +++ b/packaging/pre_checkin.sh @@ -10,8 +10,7 @@ for arch in arm i386 x86_64; do 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/;" \ - < binutils.spec > cross-$arch-binutils.spec - + binutils.spec | sed '/manifest/d' |sed '/1001/d' > cross-$arch-binutils.spec echo " done." done -- 2.7.4