binutils: Rename version to linaro-2.24

This lets users choice of chosing either linaro bintutils
or OE-Core defaults when linaro toolchain layer is included

Change-Id: I78b58e164f3d057c06c09d1326143e117f15bfe3
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>

24 files changed, 12 insertions, 215 deletions

diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc
deleted file mode 100644
index 708cddb8..00000000
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-inherit cross-canadian
-
-DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target"
-PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
-BPN = "binutils"
-
-DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext"
-EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
-                "
-
-# We have to point binutils at a sysroot but we don't need to rebuild if this changes
-# e.g. we switch between different machines with different tunes.
-EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
-
-do_install () {
-	autotools_do_install
-
-	# We're not interested in the libs or headers, these would come from the 
-	# nativesdk or target version of the binutils recipe
-	rm -rf ${D}${prefix}/${TARGET_SYS}
-	rm -f ${D}${libdir}/libbfd*
-	rm -f ${D}${libdir}/libiberty*
-	rm -f ${D}${libdir}/libopcodes*
-	rm -f ${D}${includedir}/*.h
-
-	cross_canadian_bindirlinks
-}
-
-BBCLASSEXTEND = ""
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb
deleted file mode 100644
index 5dbaa030..00000000
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require binutils.inc
-require binutils-${PV}.inc
-require binutils-cross-canadian.inc
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.24.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.24.bb
new file mode 100644
index 00000000..76b62771
--- /dev/null
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross-canadian_linaro-2.24.bb
@@ -0,0 +1,3 @@
+require recipes-devtools/binutils/binutils.inc
+require recipes-devtools/binutils/binutils-${PV}.inc
+require recipes-devtools/binutils/binutils-cross-canadian.inc
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross.inc
deleted file mode 100644
index 300a1d39..00000000
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-inherit cross
-PROVIDES = "virtual/${TARGET_PREFIX}binutils"
-
-INHIBIT_DEFAULT_DEPS = "1"
-INHIBIT_AUTOTOOLS_DEPS = "1"
-
-EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_TARGET} \
-                --disable-install-libbfd \
-                --enable-poison-system-directories \
-                "
-do_install () {
-	oe_runmake 'DESTDIR=${D}' install
-
-	# We don't really need these, so we'll remove them...
-	rm -rf ${D}${STAGING_DIR_NATIVE}${libdir_native}/libiberty.a
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale
-	rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
-	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
-}
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_2.24.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_2.24.bb
deleted file mode 100644
index fbd1f7d2..00000000
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_2.24.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require binutils.inc
-require binutils-${PV}.inc
-require binutils-cross.inc
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.24.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.24.bb
new file mode 100644
index 00000000..a8b918e1
--- /dev/null
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-cross_linaro-2.24.bb
@@ -0,0 +1,3 @@
+require recipes-devtools/binutils/binutils.inc
+require recipes-devtools/binutils/binutils-${PV}.inc
+require recipes-devtools/binutils/binutils-cross.inc
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_2.24.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_linaro-2.24.bb
index 8af407f6..489045f2 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_2.24.bb
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-crosssdk_linaro-2.24.bb
@@ -1,4 +1,4 @@
-require binutils-cross_${PV}.bb
+require recipes-devtools/binutils/binutils-cross_${PV}.bb
 
 inherit crosssdk
 
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24.inc
index 7144563e..a1d06a54 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24.inc
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24.inc
@@ -1,3 +1,4 @@
+BPV = "2.24"
 MMYY = "13.12"
 RELEASE = "20${MMYY}"
 PR = "r${RELEASE}"
@@ -16,7 +17,7 @@ LIC_FILES_CHKSUM="\
     "
 
 SRC_URI = "\
-     http://releases.linaro.org/${MMYY}/components/toolchain/binutils-linaro/binutils-linaro-${PV}-${RELEASE}.tar.xz \
+     http://releases.linaro.org/${MMYY}/components/toolchain/binutils-linaro/binutils-linaro-${BPV}-${RELEASE}.tar.xz \
      file://binutils-uclibc-100-uclibc-conf.patch \
      file://binutils-uclibc-300-001_ld_makefile_patch.patch \
      file://binutils-uclibc-300-006_better_file_error.patch \
@@ -35,4 +36,4 @@ SRC_URI = "\
 SRC_URI[md5sum] = "4f0fe947895a260b8386de63b09feb18"
 SRC_URI[sha256sum] = "bc9ab073f85d504e5c4601f878c45a0da791d419b4ebe85ac7d4cd77dcbf8a38"
 
-S = "${WORKDIR}/binutils-linaro-${PV}-${RELEASE}"
+S = "${WORKDIR}/binutils-${PV}-${RELEASE}"
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-armv5e.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-armv5e.patch
index 97ad6dff..97ad6dff 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-armv5e.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-armv5e.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-poison.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-poison.patch
index 996c0238..996c0238 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-poison.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-poison.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-100-uclibc-conf.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-100-uclibc-conf.patch
index b5a25c23..b5a25c23 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-100-uclibc-conf.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-100-uclibc-conf.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-300-001_ld_makefile_patch.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-300-001_ld_makefile_patch.patch
index c6e1efce..c6e1efce 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-300-001_ld_makefile_patch.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-300-001_ld_makefile_patch.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-300-006_better_file_error.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-300-006_better_file_error.patch
index 47bd8ff1..47bd8ff1 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-300-006_better_file_error.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-300-006_better_file_error.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-300-012_check_ldrunpath_length.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-300-012_check_ldrunpath_length.patch
index d31f80cd..d31f80cd 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-300-012_check_ldrunpath_length.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-300-012_check_ldrunpath_length.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-gas-needs-libm.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-gas-needs-libm.patch
index 3869faff..3869faff 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-uclibc-gas-needs-libm.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-uclibc-gas-needs-libm.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-xlp-support.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-xlp-support.patch
index a1999184..a1999184 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/binutils-xlp-support.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/binutils-xlp-support.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/fix-pr15815.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/fix-pr15815.patch
index 9f53f41c..9f53f41c 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/fix-pr15815.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/fix-pr15815.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/libiberty_path_fix.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/libiberty_path_fix.patch
index 6e732fbd..6e732fbd 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/libiberty_path_fix.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/libiberty_path_fix.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/libtool-2.4-update.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/libtool-2.4-update.patch
index 2e621f1a..2e621f1a 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/libtool-2.4-update.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/libtool-2.4-update.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/libtool-rpath-fix.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/libtool-rpath-fix.patch
index 4fcffa47..4fcffa47 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/libtool-rpath-fix.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/libtool-rpath-fix.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/mips64-default-ld-emulation.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/mips64-default-ld-emulation.patch
index 51eaf0bd..51eaf0bd 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/mips64-default-ld-emulation.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/mips64-default-ld-emulation.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/relocatable_sdk.patch b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/relocatable_sdk.patch
index 7408c31a..7408c31a 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils-2.24/relocatable_sdk.patch
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils-linaro-2.24/relocatable_sdk.patch
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils.inc b/meta-linaro-toolchain/recipes-devtools/binutils/binutils.inc
deleted file mode 100644
index cf13c4f1..00000000
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils.inc
+++ /dev/null
@@ -1,148 +0,0 @@
-SUMMARY = "A GNU collection of binary utilities"
-DESCRIPTION = "The GNU Binutils are a collection of binary tools. \
-The main ones are ld (GNU Linker), and as (GNU Assembler). This \
-package also includes addition tools such as addr2line (Converts \
-addresses into filenames and line numbers), ar (utility for creating, \
-modifying and extracting archives), nm (list symbols in object \
-files), objcopy (copy and translate object files), objdump (Display \
-object information), and other tools and related libraries."
-HOMEPAGE = "http://www.gnu.org/software/binutils/"
-BUGTRACKER = "http://sourceware.org/bugzilla/"
-SECTION = "devel"
-LICENSE = "GPLv3"
-
-DEPENDS = "flex-native bison-native zlib-native gnu-config-native"
-
-inherit autotools gettext multilib_header
-
-FILES_${PN} = " \
-	${bindir}/${TARGET_PREFIX}* \
-	${libdir}/lib*-*.so \
-	${prefix}/${TARGET_SYS}/bin/* \
-        ${bindir}/embedspu"
-
-RPROVIDES_${PN} += "${PN}-symlinks"
-
-FILES_${PN}-dev = " \
-	${includedir} \
-	${libdir}/*.la \
-	${libdir}/libbfd.so \
-	${libdir}/libopcodes.so"
-
-# Rather than duplicating multiple entries for these, make one
-# list and reuse it.
-
-USE_ALTERNATIVES_FOR = " \
-	addr2line \
-	ar \
-	as \
-	c++filt \
-	elfedit \
-	gprof \
-	ld \
-	${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld.gold', 'ld.bfd', d)} \
-	nm \
-	objcopy \
-	objdump \
-	ranlib \
-	readelf \
-	size \
-	strings \
-	strip \
-"
-
-python do_package_prepend() {
-    make_alts = d.getVar("USE_ALTERNATIVES_FOR", True) or ""
-    prefix = d.getVar("TARGET_PREFIX", True)
-    bindir = d.getVar("bindir", True)
-    for alt in make_alts.split():
-        d.setVarFlag('ALTERNATIVE_TARGET', alt, bindir + "/" + prefix + alt)
-        d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt)
-}
-
-# FILES_${PN}-dbg = "${prefix}/${TARGET_SYS}/bin/.debug ${prefix}/${libdir}/.debug"
-
-B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-
-EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
-                --disable-werror \
-		--enable-plugins \
-		${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)} \
-                ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
-
-# This is necessary due to a bug in the binutils Makefiles
-# EXTRA_OEMAKE = "configure-build-libiberty all"
-
-export AR = "${HOST_PREFIX}ar"
-export AS = "${HOST_PREFIX}as"
-export LD = "${HOST_PREFIX}ld"
-export NM = "${HOST_PREFIX}nm"
-export RANLIB = "${HOST_PREFIX}ranlib"
-export OBJCOPY = "${HOST_PREFIX}objcopy"
-export OBJDUMP = "${HOST_PREFIX}objdump"
-
-export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
-export AS_FOR_TARGET = "${TARGET_PREFIX}as"
-export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
-export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
-export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
-
-export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-
-# autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need
-# to unset LD_LIBRARY_PATH.
-export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
-
-MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}"
-do_configure[vardeps] += "MULTIARCH"
-do_configure () {
-	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
-	oe_runconf
-#
-# must prime config.cache to ensure the build of libiberty
-#
-	mkdir -p ${B}/build-${BUILD_SYS}
-	for i in ${CONFIG_SITE}; do
-		cat $i >> ${B}/build-${BUILD_SYS}/config.cache || true
-	done
-}
-
-do_install () {
-	autotools_do_install
-
-	# We don't really need these, so we'll remove them...
-	rm -rf ${D}${libdir}/ldscripts
-
-	# Fix the /usr/${TARGET_SYS}/bin/* links
-	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
-		rm -f $l
-		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
-			| tr -s / \
-			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
-	done
-
-	# Install the libiberty header
-	install -d ${D}${includedir}
-	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
-	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
-
-	cd ${D}${bindir}
-
-	# Symlinks for ease of running these on the native target
-	for p in ${TARGET_PREFIX}* ; do
-		ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
-	done
-
-	for alt in ${USE_ALTERNATIVES_FOR}; do
-		rm -f ${D}${bindir}/$alt
-	done
-
-	oe_multilib_header bfd.h
-}
-
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "100"
-
-ALTERNATIVE_${PN}_class-target = "${USE_ALTERNATIVES_FOR}"
diff --git a/meta-linaro-toolchain/recipes-devtools/binutils/binutils_2.24.bb b/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.24.bb
index 99b255a2..ef5b7c54 100644
--- a/meta-linaro-toolchain/recipes-devtools/binutils/binutils_2.24.bb
+++ b/meta-linaro-toolchain/recipes-devtools/binutils/binutils_linaro-2.24.bb
@@ -1,5 +1,5 @@
-require binutils.inc
-require binutils-${PV}.inc
+require recipes-devtools/binutils/binutils.inc
+require recipes-devtools/binutils/binutils-${PV}.inc
 
 DEPENDS += "flex bison zlib"