uclibc: add a special Xtensa version

Currently, the Xtensa architecture uses the "snapshot" version of
uClibc. This means that the build is not reproducible, since it will
pick whatever latest version of uClibc is available at the moment of
the build.

This commit replaces that by adding a special Xtensa version, which
points to a well-known Git commit. This is something we should
hopefully be able to remove once the uClibc people realize that doing
a 0.9.34 release would be useful.

Should probably fix:

  http://autobuild.buildroot.org/results/5d6/5d6072a038acf894d832704e36c1d43f0254abf5/build-end.log

at least I wasn't able to reproduce the build problem.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[baruch: use a more recent uClibc version]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2013-12-29 13:26:26 +02:00
parent 6d65d8ba13
commit cecaf09cd6
2 changed files with 9 additions and 0 deletions

View File

@ -20,6 +20,10 @@ choice
bool "uClibc 0.9.33.x" bool "uClibc 0.9.33.x"
depends on !(BR2_arc || BR2_avr32 || BR2_xtensa) depends on !(BR2_arc || BR2_avr32 || BR2_xtensa)
config BR2_UCLIBC_VERSION_XTENSA_GIT
bool "uClibc Git Xtensa"
depends on BR2_xtensa
config BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_VERSION_SNAPSHOT
bool "daily snapshot" bool "daily snapshot"
depends on !(BR2_arc) depends on !(BR2_arc)
@ -39,6 +43,7 @@ config BR2_UCLIBC_VERSION_STRING
default 0.9.32.1 if BR2_UCLIBC_VERSION_0_9_32 default 0.9.32.1 if BR2_UCLIBC_VERSION_0_9_32
default 0.9.33.2 if BR2_UCLIBC_VERSION_0_9_33 default 0.9.33.2 if BR2_UCLIBC_VERSION_0_9_33
default "9f0f466d3b17181ce88be36ce24a775774fe686c" if BR2_arc default "9f0f466d3b17181ce88be36ce24a775774fe686c" if BR2_arc
default "3a3ad3dfc10876b3648369f22df8fc06661ddef0" if BR2_UCLIBC_VERSION_XTENSA_GIT
default BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT default BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT
config BR2_UCLIBC_CONFIG config BR2_UCLIBC_CONFIG
@ -48,6 +53,7 @@ config BR2_UCLIBC_CONFIG
default "package/uclibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33 default "package/uclibc/uClibc-0.9.33.config" if BR2_UCLIBC_VERSION_0_9_33
default "package/uclibc/uClibc-snapshot.config" if BR2_arc default "package/uclibc/uClibc-snapshot.config" if BR2_arc
default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_XTENSA_GIT
help help
Some people may wish to use their own modified uClibc configuration Some people may wish to use their own modified uClibc configuration
file and will specify their config file location with this option. file and will specify their config file location with this option.

View File

@ -12,6 +12,9 @@ UCLIBC_SITE = http://www.uclibc.org/downloads/snapshots
else ifeq ($(BR2_arc),y) else ifeq ($(BR2_arc),y)
UCLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,uClibc,$(UCLIBC_VERSION)) UCLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,uClibc,$(UCLIBC_VERSION))
UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.gz UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.gz
else ifeq ($(BR2_UCLIBC_VERSION_XTENSA_GIT),y)
UCLIBC_SITE = git://git.busybox.net/uClibc
UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.gz
else else
UCLIBC_SITE = http://www.uclibc.org/downloads UCLIBC_SITE = http://www.uclibc.org/downloads
UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.xz UCLIBC_SOURCE = uClibc-$(UCLIBC_VERSION).tar.xz