Merge branch 'next'
authorPeter Korsgaard <peter@korsgaard.com>
Thu, 1 Dec 2016 21:22:06 +0000 (22:22 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Thu, 1 Dec 2016 21:29:56 +0000 (22:29 +0100)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
12 files changed:
1  2 
DEVELOPERS
Makefile
configs/freescale_imx28evk_defconfig
configs/imx6ulpico_defconfig
fs/common.mk
package/efl/efl.mk
package/mesa3d/mesa3d.mk
package/moarvm/Config.in
package/qemu/Config.in
package/ser2net/ser2net.mk
package/xmlstarlet/xmlstarlet.mk
toolchain/toolchain-external/toolchain-external-musl-cross/Config.in

diff --cc DEVELOPERS
Simple merge
diff --cc Makefile
index 119839c3de738734f24e87149934a078e4adca7a,55d928de38c9b865f3670179823392c288909da1..00bcd0f49fc2f8f25cced846d6de16c0caeb0ceb
+++ 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)
Simple merge
Simple merge
diff --cc fs/common.mk
index 2b31e12934df9d0fd85eca675f1102a97a6f385a,981dcb1aa2458e1ffc085cf9ec8ee80b1219b7ff..7515fdc77067089d2fe8466428270e924b2d0b8d
@@@ -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),)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,5cffa2dad3bc2f4103bdb54e0c40419485139736..c72f9d73caac1616c3e57830f2b12a9d6abc1672
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,30 +1,30 @@@
 -      depends on !BR2_mips_interaptiv && !BR2_mips_m5100 && !BR2_mips_m5101
+ 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_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/