Author: nbd Date: 2015-03-24 11:06:55 +0100 (Tue, 24 Mar 2015) New Revision: 44960
Removed: trunk/toolchain/binutils/patches/2.20.1/ Modified: trunk/toolchain/binutils/Config.in trunk/toolchain/binutils/Makefile Log: binutils: remove version 2.20.1 (only used by avr32) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/toolchain/binutils/Config.in =================================================================== --- trunk/toolchain/binutils/Config.in 2015-03-24 10:06:40 UTC (rev 44959) +++ trunk/toolchain/binutils/Config.in 2015-03-24 10:06:55 UTC (rev 44960) @@ -2,17 +2,11 @@ choice prompt "Binutils Version" if TOOLCHAINOPTS - default BINUTILS_VERSION_2_20_1 if avr32 - default BINUTILS_VERSION_LINARO if !avr32 + default BINUTILS_VERSION_LINARO help Select the version of binutils you wish to use. - config BINUTILS_VERSION_2_20_1 - depends on avr32 - bool "binutils 2.20.1" - config BINUTILS_VERSION_LINARO - depends on !avr32 || (avr32 && BROKEN) bool "Linaro binutils 2.24" endchoice @@ -27,6 +21,5 @@ config BINUTILS_VERSION string prompt "Binutils Version" if (TOOLCHAINOPTS && NULL) - default "2.20.1" if BINUTILS_VERSION_2_20_1 || avr32 default "linaro" if BINUTILS_VERSION_LINARO default "linaro" Modified: trunk/toolchain/binutils/Makefile =================================================================== --- trunk/toolchain/binutils/Makefile 2015-03-24 10:06:40 UTC (rev 44959) +++ trunk/toolchain/binutils/Makefile 2015-03-24 10:06:55 UTC (rev 44960) @@ -10,22 +10,13 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) BIN_VERSION:=$(PKG_VERSION) -ifeq ($(findstring linaro, $(CONFIG_BINUTILS_VERSION)),linaro) - PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/ - PKG_REV:=2.24.0-2014.09 - PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz - PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353 - BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV) - HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR) -else - PKG_SOURCE_URL:=@GNU/binutils/ - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://releases.linaro.org/14.09/components/toolchain/binutils-linaro/ +PKG_REV:=2.24.0-2014.09 +PKG_SOURCE:=$(PKG_NAME)-linaro-$(PKG_REV).tar.xz +PKG_MD5SUM:=8f9b2b2e049d59b1b86ce9657802a353 +BINUTILS_DIR:=$(PKG_NAME)-linaro-$(PKG_REV) +HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(BINUTILS_DIR) - ifeq ($(PKG_VERSION),2.20.1) - PKG_MD5SUM:=9cdfb9d6ec0578c166d3beae5e15c4e5 - endif -endif - HOST_BUILD_PARALLEL:=1 PATCH_DIR:=./patches/$(PKG_VERSION) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
