[Astlinux-commits] SF.net SVN: astlinux:[7403] branches/1.0

[<abe...@us...>]

Revision: 7403
          http://sourceforge.net/p/astlinux/code/7403
Author:   abelbeck
Date:     2015-12-13 23:03:15 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
build system, fix build reproducibility in Make 3.82 (upstream Buildroot)
Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.

This patch sort results of wildcards to ensure reproducibility.

Additionally, in fs/common.mk remove any pre-existing rootfs images for build reproducibility

Modified Paths:
--------------
    branches/1.0/Makefile
    branches/1.0/boot/common.mk
    branches/1.0/fs/common.mk
    branches/1.0/package/games/games.mk
    branches/1.0/package/java/java.mk
    branches/1.0/package/matchbox/matchbox.mk
    branches/1.0/package/multimedia/multimedia.mk

Modified: branches/1.0/Makefile
===================================================================
--- branches/1.0/Makefile	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/Makefile	2015-12-13 23:03:15 UTC (rev 7403)
@@ -309,7 +309,7 @@
 include toolchain/toolchain-crosstool-ng.mk
 endif
 
-include package/*/*.mk
+include $(sort $(wildcard package/*/*.mk))
 
 include boot/common.mk
 include target/Makefile.in

Modified: branches/1.0/boot/common.mk
===================================================================
--- branches/1.0/boot/common.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/boot/common.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include boot/*/*.mk
\ No newline at end of file
+include $(sort $(wildcard boot/*/*.mk))

Modified: branches/1.0/fs/common.mk
===================================================================
--- branches/1.0/fs/common.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/fs/common.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -44,6 +44,7 @@
 $(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
 	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
+	rm -f $$@
 	rm -f $(FAKEROOT_SCRIPT)
 	touch $(BUILD_DIR)/.fakeroot.00000
 	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
@@ -81,4 +82,4 @@
 $(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
 endef
 
-include fs/*/*.mk
+include $(sort $(wildcard fs/*/*.mk))

Modified: branches/1.0/package/games/games.mk
===================================================================
--- branches/1.0/package/games/games.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/games/games.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/games/*/*.mk
+include $(sort $(wildcard package/games/*/*.mk))

Modified: branches/1.0/package/java/java.mk
===================================================================
--- branches/1.0/package/java/java.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/java/java.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/java/*/*.mk
+include $(sort $(wildcard package/java/*/*.mk))

Modified: branches/1.0/package/matchbox/matchbox.mk
===================================================================
--- branches/1.0/package/matchbox/matchbox.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/matchbox/matchbox.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1,4 +1,4 @@
 ifeq ($(BR2_PACKAGE_MATCHBOX),y)
-include package/matchbox/*/*.mk
+include $(sort $(wildcard package/matchbox/*/*.mk))
 TARGETS+=matchbox-lib matchbox-wm
 endif

Modified: branches/1.0/package/multimedia/multimedia.mk
===================================================================
--- branches/1.0/package/multimedia/multimedia.mk	2015-12-13 17:09:41 UTC (rev 7402)
+++ branches/1.0/package/multimedia/multimedia.mk	2015-12-13 23:03:15 UTC (rev 7403)
@@ -1 +1 @@
-include package/multimedia/*/*.mk
+include $(sort $(wildcard package/multimedia/*/*.mk))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.