diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-24 10:33:56 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-27 11:45:22 +0200 |
| commit | e5dc11ca3f2fb87f12a0ac9a3bd23e8721dd84b9 (patch) | |
| tree | 7b1eb4a438bb5ab20e733f283952dd5026004e96 | |
| parent | 0d089a53a9b959127d678fc15ef33b705100b451 (diff) | |
| download | OSELAS.Toolchain-e5dc11ca3f2fb87f12a0ac9a3bd23e8721dd84b9.tar.gz OSELAS.Toolchain-e5dc11ca3f2fb87f12a0ac9a3bd23e8721dd84b9.tar.xz | |
Revert "cross-binutils: add support for stable snapshots"
The snapshots break the version detection in ptxdist to build host tools
with the matching version. So stick with the release versions and
cherry-pick patches as needed.
This reverts commit aba0500f5cd4f3a7b0abdfc714b3a294248ae427.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/cross-binutils.in | 8 | ||||
| -rw-r--r-- | rules/cross-binutils.make | 22 |
2 files changed, 10 insertions, 20 deletions
diff --git a/rules/cross-binutils.in b/rules/cross-binutils.in index 50fe39a..d29c4e4 100644 --- a/rules/cross-binutils.in +++ b/rules/cross-binutils.in @@ -15,14 +15,6 @@ config CROSS_BINUTILS_VERSION help Specify the binutils version here. -config CROSS_BINUTILS_DL_VERSION - string - prompt "binutils download version" - default "${PTXCONF_CROSS_BINUTILS_VERSION}" - help - The version of the downloaded archive. Can be used for stable - branch snapshots. - config CROSS_BINUTILS_MD5 string prompt "binutils source md5sum" diff --git a/rules/cross-binutils.make b/rules/cross-binutils.make index 85aa5a0..be043f3 100644 --- a/rules/cross-binutils.make +++ b/rules/cross-binutils.make @@ -14,20 +14,18 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_BINUTILS) += cross-binutils # # Paths and names # -CROSS_BINUTILS_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_VERSION)) -CROSS_BINUTILS_DL_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_DL_VERSION)) -CROSS_BINUTILS_MD5 := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_MD5)) -CROSS_BINUTILS := binutils-$(CROSS_BINUTILS_DL_VERSION) -CROSS_BINUTILS_SUFFIX := tar.gz -CROSS_BINUTILS_SOURCE := $(SRCDIR)/$(CROSS_BINUTILS).$(CROSS_BINUTILS_SUFFIX) -CROSS_BINUTILS_DIR := $(CROSS_BUILDDIR)/$(CROSS_BINUTILS) -CROSS_BINUTILS_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_BINUTILS)-build -CROSS_BINUTILS_LICENSE := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_LICENSE)) -CROSS_BINUTILS_LICENSE_FILES := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_LICENSE_FILES)) +CROSS_BINUTILS_VERSION := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_VERSION)) +CROSS_BINUTILS_MD5 := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_MD5)) +CROSS_BINUTILS := binutils-$(CROSS_BINUTILS_VERSION) +CROSS_BINUTILS_SUFFIX := tar.bz2 +CROSS_BINUTILS_SOURCE := $(SRCDIR)/$(CROSS_BINUTILS).$(CROSS_BINUTILS_SUFFIX) +CROSS_BINUTILS_DIR := $(CROSS_BUILDDIR)/$(CROSS_BINUTILS) +CROSS_BINUTILS_BUILDDIR := $(CROSS_BUILDDIR)/$(CROSS_BINUTILS)-build +CROSS_BINUTILS_LICENSE := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_LICENSE)) +CROSS_BINUTILS_LICENSE_FILES := $(call remove_quotes,$(PTXCONF_CROSS_BINUTILS_LICENSE_FILES)) -CROSS_BINUTILS_URL := \ +CROSS_BINUTILS_URL := \ $(call ptx/mirror, GNU, binutils/$(CROSS_BINUTILS).$(CROSS_BINUTILS_SUFFIX)) \ - https://repo.or.cz/binutils-gdb.git/snapshot/$(CROSS_BINUTILS).$(CROSS_BINUTILS_SUFFIX) \ https://www.sourceware.org/pub/binutils/snapshots/$(CROSS_BINUTILS).$(CROSS_BINUTILS_SUFFIX) \ http://www.kernel.org/pub/linux/devel/binutils/$(CROSS_BINUTILS).$(CROSS_BINUTILS_SUFFIX) |