From: Peter Korsgaard Date: Thu, 1 Dec 2016 21:22:06 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8852f08eeda3c9ff4c5f9cc90a169338bda1bff9;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 diff --cc Makefile index 119839c3de,55d928de38..00bcd0f49f --- a/Makefile +++ b/Makefile @@@ -83,7 -86,9 +86,9 @@@ else # umask / $(CURDIR) / $(O all: # Set and export the version string -export BR2_VERSION := 2016.11-rc1 +export BR2_VERSION := 2017.02-git + # Actual time the release is cut (for reproducible builds) + BR2_VERSION_EPOCH = 1478206447 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --cc fs/common.mk index 2b31e12934,981dcb1aa2..7515fdc770 --- a/fs/common.mk +++ b/fs/common.mk @@@ -95,9 -95,12 +95,12 @@@ endi $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) + ifeq ($$(BR2_REPRODUCIBLE),y) + echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT) + endif $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) - PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo -- $$(FAKEROOT_SCRIPT) + PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) diff --cc toolchain/toolchain-external/toolchain-external-musl-cross/Config.in index 0000000000,5cffa2dad3..c72f9d73ca mode 000000,100644..100644 --- a/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in +++ b/toolchain/toolchain-external/toolchain-external-musl-cross/Config.in @@@ -1,0 -1,30 +1,30 @@@ + config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS + bool "Musl 1.1.12 toolchain" + depends on (BR2_arm && BR2_ARM_EABI && BR2_USE_MMU) || \ + (BR2_arm && BR2_ARM_EABIHF && !BR2_ARM_CPU_ARMV4 && BR2_USE_MMU) || \ + (BR2_armeb && BR2_ARM_EABI && !BR2_ARM_CPU_ARMV7A && BR2_USE_MMU) || \ + BR2_i386 || (BR2_mips && !BR2_SOFT_FLOAT) || \ + BR2_mipsel || (BR2_powerpc && BR2_powerpc_CLASSIC) || \ + BR2_sh4 || BR2_sh4eb || \ + BR2_x86_64 + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101 ++ depends on !BR2_mips_interaptiv && !BR2_mips_m5150 + # Unsupported for MIPS R6 + depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 + select BR2_TOOLCHAIN_EXTERNAL_MUSL + select BR2_TOOLCHAIN_HAS_SSP + select BR2_INSTALL_LIBSTDCPP + select BR2_HOSTARCH_NEEDS_IA32_LIBS + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 + select BR2_TOOLCHAIN_GCC_AT_LEAST_5 + help + Toolchain based on the Musl C library, provided by the + musl-cross project. It uses gcc 5.3, binutils 2.25.1 and + musl 1.1.12. It does not have a cross debugger included. + + The ARM soft-float toolchain is built for ARMv4t, while the + ARM hard-float toolchain is built for ARMv5t. + The x86 toolchain is built for i486. + + http://musl.codu.org/