Add support for top-level parallel make
v11 cover Add support for top-level parallel make
Hi all,
this is a patch set for adding support for top-level parallel make in buildroot, the common problem scattered in buildroot's top-level makefiles is that in the rules it relies on the order of evaluation of the prerequisites, to be able to use top-level parallel make instead of reling on the left to right ordering of evaluation of the prerequisites we must add an explicit rule to describe the dependencies.
With this patch set the top-level parallel make seems to works fine, example:
make clean make BR2_JLEVEL= -j$((`getconf _NPROCESSORS_ONLN` + 1))
Before to try it remeber to remove the ".NOTPARALLEL" line.
On my quad core system the building time for the first 220 packages of the "allpackageyesconfig" is 43m vs 18m.
I've tested the qemu_x86_defconfig, uclibc/eglibc/glibc, ccache off/on, sstrip off/on.
I've finished to work on this patch set, Arnout has acked some patches so i hope that this patch set is going to be merged soon because is frustrating to rebase this patch set. In the latest Buildroot Developer Day in Edinburgh
(http://elinux.org/Buildroot:DeveloperDaysELCE2013) you agreed to accept this patch set, so what are you wating for?
Thank you for all reviews and in particular Arnout.
Best regards
Fabio Porcedda
v11:
- Rebased over master
- Added support for pythone framework in the second patch.
- Changed comment on the latest patch.
v10:
- Added Acked-by: Arnout Vandecappelle on the first two patches
- Improved descption and text of the last patch
- Rebased over master
v9:
- Added Acked-by: Arnout Vandecappelle on some patches.
- Changed the patches contents and descriptions following advices of Arnout
- 1th patch: fixed to support ccache & sstrip
- 2th patch: added pkg-cmake.mk
- 2th patch: splitted ifeq
- 3th patch: improved description
- 3th patch: does not use %_BUILD_DEPENDENCIES anymore
- 3th patch: added a comment about "|"
- 4th patch: added a comment
- 5th patch: added a comment
- 6th patch:
- 2th patch: fixed a comment
- 8th patch: now it change only the comment
v8:
- rebased over master
- added patche for for base dependency
- added patche for for glibc package
- added patche for for uclibc package
- removed patch already merged
- changed some descriptions
- modified the patch for toolchain dependency to prevent circular dependency
v7:
- add the latest patch
- add to the first patch the <pkgname>_TOOLCHAIN variable
- improve the fifth patch
v6:
- added the fifth patch
- updated the fourth patch adding the install targets
- updated the second patch to remove TARGETS_ALL
v5:
- added the fourth patch
- fixed some typos
- rewrited the second patch to use only $$($(2)_TARGET_*) in the rules
- add support for top-level parallel make for the glibc package
v4:
- rebased over master
- add Acked-by: Thomas Petazzoni on the third patch
- changed the orderd of the patches
v3:
- add back the patch "package: add toolchain dependency to inner-generic-package" because now is working fine.
- add Acked-by: Arnout Vandecappelle to the third patch.
- reworked the second patch following Arnout suggestions.
v2:
- remove patch "package: add toolchain dependency to inner-generic-package" because was not working fine against recent toolchain changes.
Fabio Porcedda (8):
package: add base dependency to every package
package: add toolchain dependency to every target package
package: add support for top-level parallel make
uclibc: add support for top-level parallel make
glibc: add support for top-level parallel make
Makefile: add support for top-level parallel make
package: enable jobserver for recursive make
Makefile: update comment about top-level parallel Makefile
Makefile | 34 ++++++----- fs/common.mk | 4 +- package/glibc/glibc.mk | 12 +++- package/linux-headers/linux-headers.mk | 3 + package/pkg-autotools.mk | 3 +- package/pkg-cmake.mk | 2 +- package/pkg-generic.mk | 67 ++++++++++++++-------- package/pkg-python.mk | 2 +- package/uclibc/uclibc.mk | 12 +++- .../toolchain-buildroot/toolchain-buildroot.mk | 2 + toolchain/toolchain-external/toolchain-external.mk | 2 + toolchain/toolchain/toolchain.mk | 5 +- 12 files changed, 99 insertions(+), 49 deletions(-)
Signature · 1 line
1.8.5.2
PATCH v11 1/8 package: add base dependency to every package
Move "dependencies" "dirs" "prepare" dependencies from "toolchain" to every package.
This way we can build correctly every package right after the clean stage.
As example with this commit we can build successfully the glibc right after the clean stage:
make clean glibc
This is also a step forward supporting top-level parallel make.
--- package/pkg-generic.mk | 5 +++++ toolchain/toolchain/toolchain.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
package/pkg-generic.mk +5 -0
@@ -429,6 +429,11 @@ $(1)-install-host: $(1)-build $$($(2)_TARGET_INSTALL_HOST) $(1)-build: $(1)-configure \ $$($(2)_TARGET_BUILD) +$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare +ifeq ($(filter $(1),$(DEPENDENCIES_HOST_PREREQ)),) +$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dependencies +endif + ifeq ($$($(2)_OVERRIDE_SRCDIR),) # In the normal case (no package override), the sequence of steps is # source, by downloading
toolchain/toolchain/toolchain.mk +2 -1
@@ -14,4 +14,5 @@ endif $(eval $(generic-package)) -toolchain-source: prepare dirs dependencies $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake +toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake +
Signature · 1 line
1.8.5.2
PATCH v11 2/8 package: add toolchain dependency to every target package
In reply to Fabio PorceddaThis commit makes the dependency from the target toolchain explicit. This way we can buid from command line a package that use innger-generic-package right after the configuration phase, example:
make clean <package-name>
Also remove TARGETS_ALL because the only purpose was to add toolchain dependency so it's superseded by this commit.
To prevent circular dependency add the new variable <pkgname>_ADD_TOOLCHAIN_DEPENDENCY to avoid adding the toolchain dependency for toolchain packages.
This is also a step forward supporting top-level parallel make.
--- Makefile | 8 ++------ package/glibc/glibc.mk | 3 +++ package/linux-headers/linux-headers.mk | 3 +++ package/pkg-autotools.mk | 3 ++- package/pkg-cmake.mk | 2 +- package/pkg-generic.mk | 14 ++++++++++++-- package/pkg-python.mk | 2 +- package/uclibc/uclibc.mk | 3 +++ toolchain/toolchain-buildroot/toolchain-buildroot.mk | 2 ++ toolchain/toolchain-external/toolchain-external.mk | 2 ++ toolchain/toolchain/toolchain.mk | 2 ++ 11 files changed, 33 insertions(+), 11 deletions(-)
Makefile +2 -6
@@ -391,7 +391,6 @@ TARGETS+=target-post-image TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS)) TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS)) -TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS)) # host-* dependencies have to be handled specially, as those aren't # visible in Kconfig and hence not added to a variable like TARGETS.
@@ -414,9 +413,6 @@ HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS))) TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\ $(TARGETS) $(BASE_TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS)))) -# all targets depend on the crosscompiler and it's prerequisites -$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % - dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
@@ -425,11 +421,11 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG) prepare: $(BUILD_DIR)/buildroot-config/auto.conf -world: $(BASE_TARGETS) $(TARGETS_ALL) +world: $(TARGETS) .PHONY: all world toolchain dirs clean distclean source outputmakefile \ legal-info legal-info-prepare legal-info-clean printvars \ - $(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \ + $(BASE_TARGETS) $(TARGETS) \ $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \ $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
package/glibc/glibc.mk +3 -0
@@ -31,6 +31,9 @@ endif GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library) GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES) +# glibc is part of the toolchain so disable the toolchain dependency +GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO + # Before (e)glibc is configured, we must have the first stage # cross-compiler and the kernel headers GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk
package/linux-headers/linux-headers.mk +3 -0
@@ -17,6 +17,9 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz LINUX_HEADERS_INSTALL_STAGING = YES +# linux-headers is part of the toolchain so disable the toolchain dependency +LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO + define LINUX_HEADERS_INSTALL_STAGING_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(MAKE) \
package/pkg-autotools.mk +2 -1
@@ -206,7 +206,8 @@ endef # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF # away from the non-host rule -$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool $(1),\ +$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool \ + host-toolchain $(1),\ $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
package/pkg-cmake.mk +1 -1
@@ -88,7 +88,7 @@ endif # This must be repeated from inner-generic-package, otherwise we only get # host-cmake in _DEPENDENCIES because of the following line -$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) $(2)_DEPENDENCIES += host-cmake
package/pkg-generic.mk +12 -2
@@ -352,8 +352,18 @@ endif $(2)_REDISTRIBUTE ?= YES - -$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +# When a target package is a toolchain dependency set this variable to +# 'NO' so the 'toolchain' dependency is not added to prevent a circular +# dependency +$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES + +$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ + $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +ifeq ($(5),target) +ifeq ($$($(2)_ADD_TOOLCHAIN_DEPENDENCY),YES) +$(2)_DEPENDENCIES += toolchain +endif +endif $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO
package/pkg-python.mk +1 -1
@@ -143,7 +143,7 @@ endif # be derived automatically from the dependencies of the corresponding # target package. For example, target packages need # host-python-distutilscross, but not host packages. -$(2)_DEPENDENCIES ?= $(filter-out host-python host-python-setuptools host-python-distutilscross $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +$(2)_DEPENDENCIES ?= $(filter-out host-python host-python-setuptools host-python-distutilscross host-toolchain $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) # Target packages need both the python interpreter on the target (for # runtime) and the python interpreter on the host (for
package/uclibc/uclibc.mk +3 -0
@@ -22,6 +22,9 @@ endif UCLIBC_INSTALL_STAGING = YES +# uclibc is part of the toolchain so disable the toolchain dependency +UCLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO + # Before uClibc is configured, we must have the first stage # cross-compiler and the kernel headers UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers
toolchain/toolchain-buildroot/toolchain-buildroot.mk +2 -0
@@ -14,4 +14,6 @@ BUILDROOT_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC)) TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final +TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO + $(eval $(generic-package))
toolchain/toolchain-external/toolchain-external.mk +2 -0
@@ -366,6 +366,8 @@ TOOLCHAIN_EXTERNAL_SITE = TOOLCHAIN_EXTERNAL_SOURCE = endif +TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO + TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2)$(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)
toolchain/toolchain/toolchain.mk +2 -0
@@ -12,6 +12,8 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) TOOLCHAIN_DEPENDENCIES += toolchain-external endif +TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO + $(eval $(generic-package)) toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
Signature · 1 line
1.8.5.2
PATCH v11 2/8 package: add toolchain dependency to every target package
Hi Fabio, all,
2014/1/10 Fabio Porcedda <[email protected]>
Quoted 4 lines
This commit makes the dependency from the target toolchain explicit. This way we can buid from command line a package that use innger-generic-package right after the configuration phase, example:
s/innger-generic-package/inner-generic-package/
(just nitpicking ;-))
Quoted 5 lines
make clean <package-name>
Also remove
TARGETS_ALLbecause the only purpose was to add toolchain dependency so it's superseded by this commit.
Quoted 9 lines
To prevent circular dependency add the new variable <pkgname>_ADD_TOOLCHAIN_DEPENDENCY to avoid adding the toolchain dependency for toolchain packages.
This is also a step forward supporting top-level parallel make.
Signed-off-by Fabio Porcedda <[email protected]>
Regards,
Signature · 4 lines
Samuel -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140110/8386bd22/attachment.html>
PATCH v11 2/8 package: add toolchain dependency to every target package
Quoted 11 lines · Samuel Martin
Hi Fabio, all,
2014/1/10 Fabio Porcedda <[email protected]>
Quoted 4 lines
This commit makes the dependency from the target toolchain explicit. This way we can buid from command line a package that use innger-generic-package right after the configuration phase, example:
s/innger-generic-package/inner-generic-package/
(just nitpicking ;-))
Thanks for fixing the typo.
<snip>
Regards
Signature · 1 line
Fabio Porcedda
PATCH v11 2/8 package: add toolchain dependency to every target package
In reply to Fabio PorceddaOn Fri, Jan 10, 2014 at 11:06 AM, Fabio Porcedda
<[email protected]> wrote:
<snip>
package/pkg-generic.mk endif
Quoted 10 lines
package/pkg-generic.mk +7
-2- -$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +# When a target package is a toolchain dependency set this variable to +# 'NO' so the 'toolchain' dependency is not added to prevent a circular +# dependency +$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES +$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ + $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +ifeq ($(5),target)
This line should be changed to:
ifeq ($(4),target)
After the recently merged commit 26aef889f1df32d5a15cd70f6b1e316ebb830cb7 (infra: remove unused 4th parameter to package infrastructures (pkgparentdir)) the $(4) must be used instead of $(5).
Do you prefer that i send a fixed patch series or i send a new commit to fix that?
Which solution do you prefer?
If you prefer i can send a new version today.
I just don't want to delay anymore the merge of this patch series.
Best regards
Fabio Porcedda
PATCH v11 2/8 package: add toolchain dependency to every target package
Dear Fabio Porcedda,
Quoted 8 lines · Fabio Porcedda
This line should be changed to:
ifeq ($(4),target)
After the recently merged commit
26aef889f1df32d5a15cd70f6b1e316ebb830cb7(infra: remove unused 4th parameter to package infrastructures (pkgparentdir)) the $(4) must be used instead of $(5).
Quoted 5 lines
Do you prefer that i send a fixed patch series or i send a new commit to fix that?
Which solution do you prefer?
If you prefer i can send a new version today.
I just don't want to delay anymore the merge of this patch series.
I'd say: wait for 2014.02-rc1 to be released, and send a new version. This way, Peter can apply it to the next branch.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v11 2/8 package: add toolchain dependency to every target package
Quoted 12 lines · Thomas Petazzoni
Dear Fabio Porcedda,
Quoted 8 lines · Fabio Porcedda
This line should be changed to:
ifeq ($(4),target)
After the recently merged commit
26aef889f1df32d5a15cd70f6b1e316ebb830cb7(infra: remove unused 4th parameter to package infrastructures (pkgparentdir)) the $(4) must be used instead of $(5).
Quoted 8 lines
Quoted 5 lines
Do you prefer that i send a fixed patch series or i send a new commit to fix that?
Which solution do you prefer?
If you prefer i can send a new version today.
I just don't want to delay anymore the merge of this patch series.I'd say: wait for 2014.02-rc1 to be released, and send a new version. This way, Peter can apply it to the next branch.
Ok i will do that.
Best regards
Signature · 1 line
Fabio Porcedda
PATCH v11 3/8 package: add support for top-level parallel make
In reply to Fabio PorceddaTo be able to use top-level parallel make we must not depend in a rule on the order of evaluation of the prerequisites, so instead of relying on the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
We cannot use the pattern rules because they must have the same dependency for every package, but we need to change the dependencies depending on $(2)_OVERRIDE_SRCDIR variable value, so we must use a more flexible way like $(2)_TARGET_% variables.
So add explicit dependencies for the following stamp files:
$(2)_TARGET_EXTRACT
$(2)_TARGET_PATCH
$(2)_TARGET_CONFIGURE
$(2)_TARGET_BUILD
$(2)_TARGET_INSTALL_STAGING $(2)_TARGET_INSTALL_TARGET $(2)_TARGET_INSTALL_IMAGES $(2)_TARGET_INSTALL_HOST
--- package/glibc/glibc.mk | 6 +++--- package/pkg-generic.mk | 40 +++++++++++++++++++++++----------------- package/uclibc/uclibc.mk | 6 +++--- 3 files changed, 29 insertions(+), 23 deletions(-)
package/glibc/glibc.mk +3 -3
@@ -38,9 +38,6 @@ GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO # cross-compiler and the kernel headers GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk -# Before (e)glibc is built, we must have the second stage cross-compiler -glibc-build: host-gcc-intermediate - GLIBC_SUBDIR = build GLIBC_INSTALL_STAGING = YES
@@ -142,3 +139,6 @@ define GLIBC_INSTALL_TARGET_CMDS endef $(eval $(autotools-package)) + +# Before (e)glibc is built, we must have the second stage cross-compiler +$(GLIBC_TARGET_BUILD): | host-gcc-intermediate
package/pkg-generic.mk +23 -17
@@ -414,30 +414,37 @@ $(1)-install: $(1)-install-staging $(1)-install-target $(1)-install-images endif ifeq ($$($(2)_INSTALL_TARGET),YES) -$(1)-install-target: $(1)-build \ - $$($(2)_TARGET_INSTALL_TARGET) +$(1)-install-target: $$($(2)_TARGET_INSTALL_TARGET) else $(1)-install-target: endif ifeq ($$($(2)_INSTALL_STAGING),YES) -$(1)-install-staging: $(1)-build \ - $$($(2)_TARGET_INSTALL_STAGING) +$(1)-install-staging: $$($(2)_TARGET_INSTALL_STAGING) else $(1)-install-staging: endif ifeq ($$($(2)_INSTALL_IMAGES),YES) -$(1)-install-images: $(1)-build \ - $$($(2)_TARGET_INSTALL_IMAGES) +$(1)-install-images: $$($(2)_TARGET_INSTALL_IMAGES) else $(1)-install-images: endif -$(1)-install-host: $(1)-build $$($(2)_TARGET_INSTALL_HOST) +$(1)-install-host: $$($(2)_TARGET_INSTALL_HOST) -$(1)-build: $(1)-configure \ - $$($(2)_TARGET_BUILD) +$$($(2)_TARGET_INSTALL_TARGET) $$($(2)_TARGET_INSTALL_STAGING) \ +$$($(2)_TARGET_INSTALL_IMAGES) $$($(2)_TARGET_INSTALL_HOST): \ + $$($(2)_TARGET_BUILD) + +$(1)-build: $$($(2)_TARGET_BUILD) +$$($(2)_TARGET_BUILD): $$($(2)_TARGET_CONFIGURE) + +# The symbol "|" specify a order-only-prerequisite, this is needed for +# phony requisites to avoid rebuilding every time the target. + +$(1)-configure: $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare ifeq ($(filter $(1),$(DEPENDENCIES_HOST_PREREQ)),)
@@ -451,13 +458,13 @@ ifeq ($$($(2)_OVERRIDE_SRCDIR),) # extract # patch # configure -$(1)-configure: $(1)-patch $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH) -$(1)-patch: $(1)-extract $$($(2)_TARGET_PATCH) +$(1)-patch: $$($(2)_TARGET_PATCH) +$$($(2)_TARGET_PATCH): $$($(2)_TARGET_EXTRACT) -$(1)-extract: $(1)-source \ - $$($(2)_TARGET_EXTRACT) +$(1)-extract: $$($(2)_TARGET_EXTRACT) +$$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) $(1)-depends: $$($(2)_DEPENDENCIES)
@@ -467,10 +474,9 @@ else # source, by rsyncing # depends # configure -$(1)-configure: $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC) -$(1)-depends: $(1)-rsync $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_DEPENDENCIES) $(1)-patch: $(1)-rsync $(1)-extract: $(1)-rsync
package/uclibc/uclibc.mk +3 -3
@@ -29,9 +29,6 @@ UCLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO # cross-compiler and the kernel headers UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers -# Before uClibc is built, we must have the second stage cross-compiler -uclibc-build: host-gcc-intermediate - # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. ifndef UCLIBC_CONFIG_FILE
@@ -554,3 +551,6 @@ uclibc-menuconfig: dirs uclibc-patch rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed} $(eval $(generic-package)) + +# Before uClibc is built, we must have the second stage cross-compiler +$(UCLIBC_TARGET_BUILD): | host-gcc-intermediate
Signature · 1 line
1.8.5.2
PATCH v11 4/8 uclibc: add support for top-level parallel make
In reply to Fabio PorceddaTo be able to use top-level parallel make we must not depend in a rule on the order of evaluation of the prerequisites, so instead of relyng on the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
The uclibc-install-target depends on uclibc-install-staging so add a rule for it.
--- package/uclibc/uclibc.mk | 3 +++ 1 file changed, 3 insertions(+)
package/uclibc/uclibc.mk +3 -0
@@ -554,3 +554,6 @@ $(eval $(generic-package)) # Before uClibc is built, we must have the second stage cross-compiler $(UCLIBC_TARGET_BUILD): | host-gcc-intermediate + +# The uclibc-install-target use files from uclibc-install-staging +$(UCLIBC_TARGET_INSTALL_TARGET): $(UCLIBC_TARGET_INSTALL_STAGING)
Signature · 1 line
1.8.5.2
PATCH v11 5/8 glibc: add support for top-level parallel make
In reply to Fabio PorceddaTo be able to use top-level parallel make we must not depend in a rule on the order of evaluation of the prerequisites, so instead of relyng on the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
The glibc-install-target depends on glibc-install-staging so add a rule for it.
--- package/glibc/glibc.mk | 3 +++ 1 file changed, 3 insertions(+)
package/glibc/glibc.mk +3 -0
@@ -142,3 +142,6 @@ $(eval $(autotools-package)) # Before (e)glibc is built, we must have the second stage cross-compiler $(GLIBC_TARGET_BUILD): | host-gcc-intermediate + +# The glic-install-target use files from glibc-install-staging +$(GLIBC_TARGET_INSTALL_TARGET): $(GLIBC_TARGET_INSTALL_STAGING)
Signature · 1 line
1.8.5.2
PATCH v11 6/8 Makefile: add support for top-level parallel make
In reply to Fabio PorceddaTo be able to use top-level parallel make we must not depend in a rule on the order of evaluation of the prerequisites, so instead of relyng on the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
Add explicit rules to describe the following dependency chain:
$(TARGETS) -> target-finalize -> rootfs-* -> target-post-image
--- Makefile | 15 ++++++--------- fs/common.mk | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-)
Makefile +6 -9
@@ -369,8 +369,6 @@ include system/system.mk include $(BR2_EXTERNAL)/external.mk -TARGETS+=target-finalize - ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) TARGETS+=target-purgelocales endif
@@ -387,8 +385,6 @@ endif include fs/common.mk -TARGETS+=target-post-image - TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS)) TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
@@ -421,11 +417,12 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BUILDROOT_CONFIG) prepare: $(BUILD_DIR)/buildroot-config/auto.conf -world: $(TARGETS) +world: target-post-image .PHONY: all world toolchain dirs clean distclean source outputmakefile \ legal-info legal-info-prepare legal-info-clean printvars \ - $(BASE_TARGETS) $(TARGETS) \ + target-finalize target-post-image \ + $(BASE_TARGETS) $(TARGETS) $(TARGETS_ROOTFS) \ $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \ $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)
@@ -485,7 +482,7 @@ endif STRIP_FIND_CMD += -type f -perm /111 STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print -target-finalize: +target-finalize: $(TARGETS) rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake
@@ -591,7 +588,7 @@ target-generatelocales: host-localedef done endif -target-post-image: +target-post-image: target-finalize $(TARGETS_ROOTFS) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ $(USER_HOOKS_EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
@@ -628,7 +625,7 @@ legal-info: dirs legal-info-clean legal-info-prepare $(TARGETS_LEGAL_INFO) \ @rm -f $(LEGAL_WARNINGS) show-targets: - @echo $(TARGETS) + @echo $(TARGETS) $(TARGETS_ROOTFS) graph-build: $(O)/build/build-time.log @install -d $(O)/graphs
fs/common.mk +2 -2
@@ -63,7 +63,7 @@ ROOTFS_$(2)_COMPRESS_EXT = .xz ROOTFS_$(2)_COMPRESS_CMD = $$(XZ) -9 -C crc32 -c endif -$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) +$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep)) rm -f $$(FAKEROOT_SCRIPT)
@@ -94,7 +94,7 @@ rootfs-$(1)-show-depends: rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS) ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) -TARGETS += rootfs-$(1) +TARGETS_ROOTFS += rootfs-$(1) endif endef
Signature · 1 line
1.8.5.2
PATCH v11 7/8 package: enable jobserver for recursive make
In reply to Fabio PorceddaAdd '+' prefix to the $($(PKG)_BUILD_CMDS) and $($(PKG)_INSTALL*_CMDS) commands to enable jobserver for the sub-make.
Without the '+' prefix GNU make does not detect the sub-make so it disable the jobserver for the sub-make.
From GNU make documentation:
Using the MAKE variable has the same effect as using a ?+? character at the beginning of the recipe line. This special feature is only enabled if the MAKE variable appears directly in the recipe: it does not apply if the MAKE variable is referenced through expansion of another variable. In the latter case you must use the ?+? token to get these special effects.
--- package/pkg-generic.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
package/pkg-generic.mk +5 -5
@@ -173,7 +173,7 @@ $(BUILD_DIR)/%/.stamp_configured: $(BUILD_DIR)/%/.stamp_built:: @$(call step_start,build) @$(call MESSAGE,"Building") - $($(PKG)_BUILD_CMDS) + +$($(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ @$(call step_end,build)
@@ -182,7 +182,7 @@ $(BUILD_DIR)/%/.stamp_built:: $(BUILD_DIR)/%/.stamp_host_installed: @$(call step_start,install-host) @$(call MESSAGE,"Installing to host directory") - $($(PKG)_INSTALL_CMDS) + +$($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ @$(call step_end,install-host)
@@ -191,7 +191,7 @@ $(BUILD_DIR)/%/.stamp_host_installed: $(BUILD_DIR)/%/.stamp_staging_installed: @$(call step_start,install-staging) @$(call MESSAGE,"Installing to staging directory") - $($(PKG)_INSTALL_STAGING_CMDS) + +$($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ $(call MESSAGE,"Fixing package configuration files") ;\
@@ -207,7 +207,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(BUILD_DIR)/%/.stamp_images_installed: @$(call step_start,install-image) @$(call MESSAGE,"Installing to images directory") - $($(PKG)_INSTALL_IMAGES_CMDS) + +$($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ @$(call step_end,install-image)
@@ -220,7 +220,7 @@ $(BUILD_DIR)/%/.stamp_target_installed: $($(PKG)_INSTALL_INIT_SYSTEMD)) $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\ $($(PKG)_INSTALL_INIT_SYSV)) - $($(PKG)_INSTALL_TARGET_CMDS) + +$($(PKG)_INSTALL_TARGET_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
Signature · 1 line
1.8.5.2
PATCH v11 8/8 Makefile: update comment about top-level parallel Makefile
In reply to Fabio PorceddaAfter the latest patches top-level parallel Makefile is working but there is still an issue when a package has an unspecified optional dependency so change the comment to explain that.
--- Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
Makefile +14 -1
@@ -42,7 +42,20 @@ export HOSTARCH := $(shell uname -m | \ -e s/macppc/powerpc/\ -e s/sh.*/sh/) -# This top-level Makefile can *not* be executed in parallel +# Parallel execution of this Makefile is disabled because it changes +# the packages building order, that can be a problem for two reasons: +# - If a package has an unspecified optional dependency and that +# dependency is present when the package is built, it is used, +# otherwise it isn't (but compilation happily proceeds) so the end +# result will differ if the order is swapped due to parallel +# building. +# - Also changing the building order can be a problem if two packages +# manipulate the same file in the target directory. +# +# Taking into account the above considerations, if you still want to execute +# this top-level Makefile in parallel comment the ".NOTPARALLEL" line and +# build using the following command: +# make BR2_JLEVEL= -j$((`getconf _NPROCESSORS_ONLN`+1)) .NOTPARALLEL: # absolute path
Signature · 1 line
1.8.5.2
v11 cover Add support for top-level parallel make
In reply to Fabio PorceddaQuoted 114 lines · Fabio Porcedda
Hi all,
this is a patch set for adding support for top-level parallel make in buildroot, the common problem scattered in buildroot's top-level makefiles is that in the rules it relies on the order of evaluation of the prerequisites, to be able to use top-level parallel make instead of reling on the left to right ordering of evaluation of the prerequisites we must add an explicit rule to describe the dependencies.With this patch set the top-level parallel make seems to works fine, example:
make clean make BR2_JLEVEL= -j$((`getconf _NPROCESSORS_ONLN` + 1))Before to try it remeber to remove the ".NOTPARALLEL" line.
On my quad core system the building time for the first 220 packages of the "allpackageyesconfig" is 43m vs 18m.
I've tested the
qemu_x86_defconfig, uclibc/eglibc/glibc, ccache off/on, sstrip off/on.I've finished to work on this patch set, Arnout has acked some patches so i hope that this patch set is going to be merged soon because is frustrating to rebase this patch set. In the latest Buildroot Developer Day in Edinburgh
(http://elinux.org/Buildroot:DeveloperDaysELCE2013) you agreed to accept this patch set, so what are you wating for?Thank you for all reviews and in particular Arnout.
Best regards
Fabio Porceddav11:
- Rebased over master
- Added support for pythone framework in the second patch.
- Changed comment on the latest patch.
v10:
- Added Acked-by: Arnout Vandecappelle on the first two patches
- Improved descption and text of the last patch
- Rebased over master
v9:
- Added Acked-by: Arnout Vandecappelle on some patches.
- Changed the patches contents and descriptions following advices of Arnout
- 1th patch: fixed to support ccache & sstrip
- 2th patch: added pkg-cmake.mk
- 2th patch: splitted ifeq
- 3th patch: improved description
- 3th patch: does not use %_BUILD_DEPENDENCIES anymore
- 3th patch: added a comment about "|"
- 4th patch: added a comment
- 5th patch: added a comment
- 6th patch:
- 2th patch: fixed a comment
- 8th patch: now it change only the comment
v8:
- rebased over master
- added patche for for base dependency
- added patche for for glibc package
- added patche for for uclibc package
- removed patch already merged
- changed some descriptions
- modified the patch for toolchain dependency to prevent circular dependency
v7:
- add the latest patch
- add to the first patch the <pkgname>_TOOLCHAIN variable
- improve the fifth patch
v6:
- added the fifth patch
- updated the fourth patch adding the install targets
- updated the second patch to removeTARGETS_ALL
v5:
- added the fourth patch
- fixed some typos
- rewrited the second patch to use only $$($(2)_TARGET_*) in the rules
- add support for top-level parallel make for the glibc package
v4:
- rebased over master
- add Acked-by: Thomas Petazzoni on the third patch
- changed the orderd of the patches
v3:
- add back the patch "package: add toolchain dependency to inner-generic-package" because now is working fine.
- add Acked-by: Arnout Vandecappelle to the third patch.
- reworked the second patch following Arnout suggestions.
v2:
- remove patch "package: add toolchain dependency to inner-generic-package" because was not working fine against recent toolchain changes.Fabio Porcedda (8):
package: add base dependency to every package
package: add toolchain dependency to every target package
package: add support for top-level parallel make
uclibc: add support for top-level parallel make
glibc: add support for top-level parallel make
Makefile: add support for top-level parallel make
package: enable jobserver for recursive make
Makefile: update comment about top-level parallelMakefileMakefile | 34 ++++++----- fs/common.mk | 4 +- package/glibc/glibc.mk | 12 +++- package/linux-headers/linux-headers.mk | 3 + package/pkg-autotools.mk | 3 +- package/pkg-cmake.mk | 2 +- package/pkg-generic.mk | 67 ++++++++++++++-------- package/pkg-python.mk | 2 +- package/uclibc/uclibc.mk | 12 +++- .../toolchain-buildroot/toolchain-buildroot.mk | 2 + toolchain/toolchain-external/toolchain-external.mk | 2 + toolchain/toolchain/toolchain.mk | 5 +- 12 files changed, 99 insertions(+), 49 deletions(-)
Quoted 3 lines
--
1.8.5.2
ping?
Regards
Signature · 1 line
Fabio Porcedda
v11 cover Add support for top-level parallel make
In reply to Fabio PorceddaDear Fabio Porcedda,
Quoted 7 lines · Fabio Porcedda
this is a patch set for adding support for top-level parallel make in buildroot, the common problem scattered in buildroot's top-level makefiles is that in the rules it relies on the order of evaluation of the prerequisites, to be able to use top-level parallel make instead of reling on the left to right ordering of evaluation of the prerequisites we must add an explicit rule to describe the dependencies.
We have discussed your patch series today at the Buildroot meeting, Peter and I had a look at it. Our plan is to merge it right after 2014.02-rc1 is released, into the -next branch, which means that it will be part of the 2014.05 release.
That said, there are two changes that we would like to be made, but they can be made as follow-up patches:
* Guarantee that the staging installation is always done before the target installation. Specifically for the uclibc and glibc package, you've added something like:
+# The uclibc-install-target use files from uclibc-install-staging +$(UCLIBC_TARGET_INSTALL_TARGET): $(UCLIBC_TARGET_INSTALL_STAGING)
The problem is that uclibc and glibc are by far not the only packages to make this assumption. There are many packages who install everything to staging, and then pick whatever they need from the staging directory to install things to the target directory. The qt and qt5 packages come to mind, but there are many more. Therefore, we would like these steps to be serialized for each
package: first staging installation, then target installation.
* Also, in glibc and uClibc, you're doing:
-# Before uClibc is built, we must have the second stage cross-compiler -uclibc-build: host-gcc-intermediate
+# Before uClibc is built, we must have the second stage cross-compiler +$(UCLIBC_TARGET_BUILD): | host-gcc-intermediate
But I believe there are a few other tricky cases where the dependencies are "non-standard". I'm thinking of at least:
- linux/linux-ext-rtai.mk, which does not depends on rtai, but rtai-patch. Not sure that's problematic in this case, but I was wondering.
- The linux/linux.mk mechanism to rebuild the kernel image after the initramfs image has been produced.
Can you cook follow-up patches for the first issue, and maybe review/investigate the second issue if applicable?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
v11 cover Add support for top-level parallel make
Quoted 12 lines · Thomas Petazzoni
Dear Fabio Porcedda,
Quoted 7 lines · Fabio Porcedda
this is a patch set for adding support for top-level parallel make in buildroot, the common problem scattered in buildroot's top-level makefiles is that in the rules it relies on the order of evaluation of the prerequisites, to be able to use top-level parallel make instead of reling on the left to right ordering of evaluation of the prerequisites we must add an explicit rule to describe the dependencies.
Quoted 4 lines
We have discussed your patch series today at the Buildroot meeting, Peter and I had a look at it. Our plan is to merge it right after 2014.02-rc1 is released, into the -next branch, which means that it will be part of the 2014.05 release.
That's great.
Quoted 10 lines
That said, there are two changes that we would like to be made, but they can be made as follow-up patches:
* Guarantee that the staging installation is always done before the target installation. Specifically for the uclibc and glibc package, you've added something like:
+# The uclibc-install-target use files from uclibc-install-staging +$(UCLIBC_TARGET_INSTALL_TARGET): $(UCLIBC_TARGET_INSTALL_STAGING)
Quoted 7 lines
The problem is that uclibc and glibc are by far not the only packages to make this assumption. There are many packages who install everything to staging, and then pick whatever they need from the staging directory to install things to the target directory. The qt and qt5 packages come to mind, but there are many more. Therefore, we would like these steps to be serialized for each
package: first staging installation, then target installation.
Ok, i will send a patch to do that.
Quoted 18 lines
* Also, in glibc and uClibc, you're doing:
(quoted diff) +2
-2-# Before uClibc is built, we must have the second stage cross-compiler -uclibc-build: host-gcc-intermediate +# Before uClibc is built, we must have the second stage cross-compiler +$(UCLIBC_TARGET_BUILD): | host-gcc-intermediate But I believe there are a few other tricky cases where the dependencies are "non-standard". I'm thinking of at least: - linux/linux-ext-rtai.mk, which does not depends on rtai, but rtai-patch. Not sure that's problematic in this case, but I was wondering. - The linux/linux.mk mechanism to rebuild the kernel image after the initramfs image has been produced.
Quoted 2 lines
Can you cook follow-up patches for the first issue, and maybe review/investigate the second issue if applicable?
Ok, i will send a patch for the first issue and i will investigate the second issue.
Thanks and best regards
Signature · 1 line
Fabio Porcedda