diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-07 12:37:28 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 11:34:00 +0200 |
| commit | 9db8827ad133198abb73d2091eaede4c5a578ed5 (patch) | |
| tree | 7143e5b0d57c6ed60de7efd0e5bfef6d1ba9e0f7 | |
| parent | d8b057ddc713265cd66b632b7992cb61363aaecc (diff) | |
| download | OSELAS.Toolchain-9db8827ad133198abb73d2091eaede4c5a578ed5.tar.gz OSELAS.Toolchain-9db8827ad133198abb73d2091eaede4c5a578ed5.tar.xz | |
glibc: add support for stable snapshots
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/glibc-crt.make | 4 | ||||
| -rw-r--r-- | rules/glibc-first.make | 4 | ||||
| -rw-r--r-- | rules/glibc-headers.make | 4 | ||||
| -rw-r--r-- | rules/glibc.in | 8 | ||||
| -rw-r--r-- | rules/glibc.make | 22 |
5 files changed, 26 insertions, 16 deletions
diff --git a/rules/glibc-crt.make b/rules/glibc-crt.make index 8664f41..56038c4 100644 --- a/rules/glibc-crt.make +++ b/rules/glibc-crt.make @@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_GLIBC_CRT) += glibc-crt # # Paths and names # -GLIBC_CRT_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) +GLIBC_CRT_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_DL_VERSION)) GLIBC_CRT_MD5 := $(call remove_quotes,$(PTXCONF_GLIBC_MD5)) GLIBC_CRT := glibc-$(GLIBC_CRT_VERSION) -GLIBC_CRT_SUFFIX := tar.bz2 +GLIBC_CRT_SUFFIX := tar.gz GLIBC_CRT_SOURCE := $(SRCDIR)/$(GLIBC_CRT).$(GLIBC_CRT_SUFFIX) GLIBC_CRT_DIR := $(BUILDDIR)/glibc-crt-$(GLIBC_CRT_VERSION) GLIBC_CRT_BUILDDIR := $(GLIBC_CRT_DIR)-build diff --git a/rules/glibc-first.make b/rules/glibc-first.make index 26bd149..3d6ad54 100644 --- a/rules/glibc-first.make +++ b/rules/glibc-first.make @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_GLIBC_FIRST) += glibc-first # # Paths and names # -GLIBC_FIRST_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) +GLIBC_FIRST_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_DL_VERSION)) GLIBC_FIRST_MD5 := $(call remove_quotes,$(PTXCONF_GLIBC_MD5)) GLIBC_FIRST := glibc-$(GLIBC_FIRST_VERSION) -GLIBC_FIRST_SUFFIX := tar.bz2 +GLIBC_FIRST_SUFFIX := tar.gz GLIBC_FIRST_SOURCE := $(SRCDIR)/$(GLIBC_FIRST).$(GLIBC_FIRST_SUFFIX) GLIBC_FIRST_DIR := $(BUILDDIR)/glibc-first-$(GLIBC_FIRST_VERSION) GLIBC_FIRST_PKGDIR := $(PKGDIR)/glibc-first-$(GLIBC_FIRST_VERSION) diff --git a/rules/glibc-headers.make b/rules/glibc-headers.make index b6a57ea..e3a702a 100644 --- a/rules/glibc-headers.make +++ b/rules/glibc-headers.make @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_GLIBC_HEADERS) += glibc-headers # # Paths and names # -GLIBC_HEADERS_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) +GLIBC_HEADERS_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_DL_VERSION)) GLIBC_HEADERS_MD5 := $(call remove_quotes,$(PTXCONF_GLIBC_MD5)) GLIBC_HEADERS := glibc-$(GLIBC_HEADERS_VERSION) -GLIBC_HEADERS_SUFFIX := tar.bz2 +GLIBC_HEADERS_SUFFIX := tar.gz GLIBC_HEADERS_SOURCE := $(SRCDIR)/$(GLIBC_HEADERS).$(GLIBC_HEADERS_SUFFIX) GLIBC_HEADERS_DIR := $(BUILDDIR)/glibc-headers-$(GLIBC_HEADERS_VERSION) GLIBC_HEADERS_PKGDIR := $(PKGDIR)/glibc-headers-$(GLIBC_HEADERS_VERSION) diff --git a/rules/glibc.in b/rules/glibc.in index 4d92949..4031fba 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -40,6 +40,14 @@ config GLIBC_VERSION Specify the glibc version here. Leave empty for glibc trunk snapshots and enter a timestamp below. +config GLIBC_DL_VERSION + string + prompt "glibc download version" + default "${PTXCONF_GLIBC_VERSION}" + help + The version of the downloaded archive. Can be used for stable + branch snapshots. + config GLIBC_MD5 string prompt "glibc source md5sum" diff --git a/rules/glibc.make b/rules/glibc.make index 3528233..ae55b18 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -16,18 +16,20 @@ PACKAGES-$(PTXCONF_GLIBC) += glibc # # Paths and names # -GLIBC_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) -GLIBC_MD5 := $(call remove_quotes,$(PTXCONF_GLIBC_MD5)) -GLIBC := glibc-$(GLIBC_VERSION) -GLIBC_SUFFIX := tar.bz2 -GLIBC_SOURCE := $(SRCDIR)/$(GLIBC).$(GLIBC_SUFFIX) -GLIBC_DIR := $(BUILDDIR_DEBUG)/$(GLIBC) -GLIBC_BUILDDIR := $(BUILDDIR)/$(GLIBC)-build -GLIBC_URL := \ +GLIBC_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_VERSION)) +GLIBC_DL_VERSION := $(call remove_quotes,$(PTXCONF_GLIBC_DL_VERSION)) +GLIBC_MD5 := $(call remove_quotes,$(PTXCONF_GLIBC_MD5)) +GLIBC := glibc-$(GLIBC_DL_VERSION) +GLIBC_SUFFIX := tar.gz +GLIBC_SOURCE := $(SRCDIR)/$(GLIBC).$(GLIBC_SUFFIX) +GLIBC_DIR := $(BUILDDIR_DEBUG)/$(GLIBC) +GLIBC_BUILDDIR := $(BUILDDIR)/$(GLIBC)-build +GLIBC_URL := \ $(call ptx/mirror, GNU, glibc/$(GLIBC).$(GLIBC_SUFFIX)) \ + https://repo.or.cz/glibc.git/snapshot/$(GLIBC).$(GLIBC_SUFFIX) \ http://www.pengutronix.de/software/ptxdist/temporary-src/glibc/$(GLIBC).$(GLIBC_SUFFIX) -GLIBC_LICENSE := $(call remove_quotes,$(PTXCONF_GLIBC_LICENSE)) -GLIBC_LICENSE_FILES := $(call remove_quotes,$(PTXCONF_GLIBC_LICENSE_FILES)) +GLIBC_LICENSE := $(call remove_quotes,$(PTXCONF_GLIBC_LICENSE)) +GLIBC_LICENSE_FILES := $(call remove_quotes,$(PTXCONF_GLIBC_LICENSE_FILES)) # ---------------------------------------------------------------------------- # Prepare |