Fix for top-level parallel make part 1
v4 cover Fix for top-level parallel make part 1
Hi all,
this is the first patch set for fixing top-level parallel make in buildroot, the common problem scattered in buildroot's top-level makefile 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 package building seems to work fine with top-level parallel make, example:
make clean toolchain
make BR2_JLEVEL= -j<n> <package-name list>
Before to try that you have to remove the ".NOTPARALLEL" line in the top-level Makefile.
The part that remain to fix for top-level parallel make is the toolchain
building and targets after building all the packages, also i'm preparing patch to add + prefix to every line that call a sub-make.
Best regards
Fabio Porcedda
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 (3):
package: add toolchain dependency to inner-generic-package
pkg-generic: fix rules for top-level parallel make package/Makefile.in: add a way to don't force jobs in sub-make
Makefile | 2 +- package/Makefile.in | 2 +- package/pkg-autotools.mk | 3 ++- package/pkg-generic.mk | 51 ++++++++++++++++++++++++------------------------ package/uclibc/uclibc.mk | 3 ++- 5 files changed, 32 insertions(+), 29 deletions(-)
Signature · 1 line
1.8.4
PATCH v4 1/3 package: add toolchain dependency to inner-generic-package
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:
make clean <package-name>
This is a step forward top-level parallel make.
--- Makefile | 2 +- package/pkg-autotools.mk | 3 ++- package/pkg-generic.mk | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-)
Makefile +1 -1
@@ -398,7 +398,7 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf toolchain: prepare dirs dependencies $(BASE_TARGETS) -world: toolchain $(TARGETS_ALL) +world: $(TARGETS_ALL) .PHONY: all world toolchain dirs clean distclean source outputmakefile \ legal-info legal-info-prepare legal-info-clean printvars \
package/pkg-autotools.mk +2 -1
@@ -202,7 +202,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-generic.mk +5 -1
@@ -307,7 +307,11 @@ endif $(2)_REDISTRIBUTE ?= YES -$(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)))) +ifeq ($$($(2)_TYPE),target) +$(2)_DEPENDENCIES += toolchain +endif $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO
Signature · 1 line
1.8.4
PATCH v4 2/3 pkg-generic: fix rules for top-level parallel make
In reply to Fabio PorceddaTo be able to use top-level parallel make we must don't depend in a rule on the order of evaluation of the prerequisites, so instead of reling on the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
So add explicit dependencies for the following stamp files:
%/.stamp_extracted
%/.stamp_patched
%/.stamp_configured
%/.stamp_built
%/.stamp_host_installed %/.stamp_staging_installed %/.stamp_images_installed %/.stamp_target_installed
Because the %-build target is not anymore part of the dependcy chain, add a new variable <pkgname>_BUILD_DEPENDENCIES to be used instead. This new variable is used only by the uclibc package for building the toolchain.
--- package/pkg-generic.mk | 45 +++++++++++++++++++++------------------------ package/uclibc/uclibc.mk | 3 ++- 2 files changed, 23 insertions(+), 25 deletions(-)
package/pkg-generic.mk +21 -24
@@ -53,7 +53,7 @@ ifeq ($(DL_MODE),DOWNLOAD) endif # Unpack the archive -$(BUILD_DIR)/%/.stamp_extracted: +$(BUILD_DIR)/%/.stamp_extracted: $(BUILD_DIR)/%/.stamp_downloaded @$(call MESSAGE,"Extracting") $(Q)mkdir -p $(@D) $($(PKG)_EXTRACT_CMDS)
@@ -88,7 +88,7 @@ endif # prefix of the patches $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION) $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME) -$(BUILD_DIR)/%/.stamp_patched: +$(BUILD_DIR)/%/.stamp_patched: $(BUILD_DIR)/%/.stamp_extracted @$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))
@@ -115,21 +115,21 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)touch $@ # Build -$(BUILD_DIR)/%/.stamp_built:: +$(BUILD_DIR)/%/.stamp_built: $(BUILD_DIR)/%/.stamp_configured @$(call MESSAGE,"Building") $($(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to host dir -$(BUILD_DIR)/%/.stamp_host_installed: +$(BUILD_DIR)/%/.stamp_host_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to host directory") $($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to staging dir -$(BUILD_DIR)/%/.stamp_staging_installed: +$(BUILD_DIR)/%/.stamp_staging_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to staging directory") $($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))
@@ -143,14 +143,14 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(Q)touch $@ # Install to images dir -$(BUILD_DIR)/%/.stamp_images_installed: +$(BUILD_DIR)/%/.stamp_images_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to images directory") $($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to target dir -$(BUILD_DIR)/%/.stamp_target_installed: +$(BUILD_DIR)/%/.stamp_target_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to target") $(if $(BR2_INIT_SYSTEMD),\ $($(PKG)_INSTALL_INIT_SYSTEMD))
@@ -312,6 +312,7 @@ $(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ ifeq ($$($(2)_TYPE),target) $(2)_DEPENDENCIES += toolchain endif +$(2)_BUILD_DEPENDENCIES ?= $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO
@@ -363,30 +364,29 @@ $(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_BUILD): | $$($(2)_BUILD_DEPENDENCIES) +$(1)-build: $$($(2)_TARGET_BUILD) + +$(1)-configure: $$($(2)_TARGET_CONFIGURE) ifeq ($$($(2)_OVERRIDE_SRCDIR),) # In the normal case (no package override), the sequence of steps is
@@ -395,13 +395,11 @@ ifeq ($$($(2)_OVERRIDE_SRCDIR),) # extract # patch # configure -$(1)-configure: $(1)-patch $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(2)_TARGET_PATCH) -$(1)-patch: $(1)-extract $$($(2)_TARGET_PATCH) +$(1)-patch: $$($(2)_TARGET_PATCH) -$(1)-extract: $(1)-source \ - $$($(2)_TARGET_EXTRACT) +$(1)-extract: $$($(2)_TARGET_EXTRACT) $(1)-depends: $$($(2)_DEPENDENCIES)
@@ -411,10 +409,9 @@ else # source, by rsyncing # depends # configure -$(1)-configure: $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(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 +2 -1
@@ -24,7 +24,8 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # Before uClibc is built, we must have the second stage # cross-compiler, for some gcc versions, and when NPTL is used. -uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) +UCLIBC_BUILD_DEPENDENCIES = \ + $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting.
Signature · 1 line
1.8.4
PATCH v4 2/3 pkg-generic: fix rules for top-level parallel make
Dear Fabio Porcedda,
Quoted 1 line · Fabio Porcedda
To be able to use top-level parallel make we must don't depend in a rule
must don't -> should not
Quoted 1 line
on the order of evaluation of the prerequisites, so instead of reling on
reling -> relying
Quoted 13 lines
the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
So add explicit dependencies for the following stamp files:
%/.stamp_extracted %/.stamp_patched %/.stamp_configured %/.stamp_built %/.stamp_host_installed %/.stamp_staging_installed %/.stamp_images_installed %/.stamp_target_installed
Quoted 1 line
Because the %-build target is not anymore part of the dependcy chain,
dependency
Quoted 122 lines
add a new variable <pkgname>_BUILD_DEPENDENCIES to be used instead. This new variable is used only by the uclibc package for building the toolchain.
Signed-off-by Fabio Porcedda <[email protected]>--- package/pkg-generic.mk | 45 +++++++++++++++++++++------------------------ package/uclibc/uclibc.mk | 3 ++- 2 files changed, 23 insertions(+), 25 deletions(-)package/pkg-generic.mk +16
-16@@ -53,7 +53,7 @@ ifeq ($(DL_MODE),DOWNLOAD) endif # Unpack the archive -$(BUILD_DIR)/%/.stamp_extracted: +$(BUILD_DIR)/%/.stamp_extracted: $(BUILD_DIR)/%/.stamp_downloaded @$(call MESSAGE,"Extracting") $(Q)mkdir -p $(@D) $($(PKG)_EXTRACT_CMDS)@@ -88,7 +88,7 @@ endif # prefix of the patches $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION) $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME) -$(BUILD_DIR)/%/.stamp_patched: +$(BUILD_DIR)/%/.stamp_patched: $(BUILD_DIR)/%/.stamp_extracted @$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))@@ -115,21 +115,21 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)touch $@ # Build -$(BUILD_DIR)/%/.stamp_built:: +$(BUILD_DIR)/%/.stamp_built: $(BUILD_DIR)/%/.stamp_configured @$(call MESSAGE,"Building") $($(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to host dir -$(BUILD_DIR)/%/.stamp_host_installed: +$(BUILD_DIR)/%/.stamp_host_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to host directory") $($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to staging dir -$(BUILD_DIR)/%/.stamp_staging_installed: +$(BUILD_DIR)/%/.stamp_staging_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to staging directory") $($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))@@ -143,14 +143,14 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(Q)touch $@ # Install to images dir -$(BUILD_DIR)/%/.stamp_images_installed: +$(BUILD_DIR)/%/.stamp_images_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to images directory") $($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to target dir -$(BUILD_DIR)/%/.stamp_target_installed: +$(BUILD_DIR)/%/.stamp_target_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to target") $(if $(BR2_INIT_SYSTEMD),\ $($(PKG)_INSTALL_INIT_SYSTEMD))@@ -312,6 +312,7 @@ $(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ ifeq ($$($(2)_TYPE),target) $(2)_DEPENDENCIES += toolchain endif +$(2)_BUILD_DEPENDENCIES ?= $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO@@ -363,30 +364,29 @@ $(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_BUILD): | $$($(2)_BUILD_DEPENDENCIES) +$(1)-build: $$($(2)_TARGET_BUILD) + +$(1)-configure: $$($(2)_TARGET_CONFIGURE) ifeq ($$($(2)_OVERRIDE_SRCDIR),) # In the normal case (no package override), the sequence of steps is
package/pkg-generic.mk ifeq ($$($(2)_OVERRIDE_SRCDIR),) · line 398
Quoted 6 lines
package/pkg-generic.mk +1
-2@@ -395,13 +395,11 @@ ifeq ($$($(2)_OVERRIDE_SRCDIR),) # extract # patch # configure -$(1)-configure: $(1)-patch $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(2)_TARGET_PATCH)
Why is $$($(2)_TARGET_PATCH) an order-only dependency? Why isn't the configure -> patch dependency handled like all the others, using stamp files dependencies?
Note that I do understand the order-only dependency of $(2)_TARGET_CONFIGURE on $(2)_DEPENDENCIES, but not on $(2)_TARGET_PATCH.
Quoted 27 lines
package/pkg-generic.mk +4
-6-$(1)-patch: $(1)-extract $$($(2)_TARGET_PATCH) +$(1)-patch: $$($(2)_TARGET_PATCH) -$(1)-extract: $(1)-source \ - $$($(2)_TARGET_EXTRACT) +$(1)-extract: $$($(2)_TARGET_EXTRACT) $(1)-depends: $$($(2)_DEPENDENCIES)@@ -411,10 +409,9 @@ else # source, by rsyncing # depends # configure -$(1)-configure: $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(2)_TARGET_RSYNC) -$(1)-depends: $(1)-rsync $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_DEPENDENCIES) $(1)-patch: $(1)-rsync $(1)-extract: $(1)-rsyncpackage/uclibc/uclibc.mk +0
-0
package/uclibc/uclibc.mk UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers · line 31
Quoted 9 lines
package/uclibc/uclibc.mk +2
-1@@ -24,7 +24,8 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # Before uClibc is built, we must have the second stage # cross-compiler, for some gcc versions, and when NPTL is used. -uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) +UCLIBC_BUILD_DEPENDENCIES = \ + $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting.
There is the same problem in package/glibc/glibc.mk.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v4 2/3 pkg-generic: fix rules for top-level parallel make
Hi Thomas,
thanks for reviewing.
Quoted 6 lines · Thomas Petazzoni
Dear Fabio Porcedda,
Quoted 1 line · Fabio Porcedda
To be able to use top-level parallel make we must don't depend in a rule
must don't -> should not
Maybe "must not" because is a requirement and not a suggestion?
Quoted 4 lines
Quoted 2 lines
on the order of evaluation of the prerequisites, so instead of reling on
reling -> relying
ok
Quoted 13 lines
Quoted 13 lines
the left to right ordering of evaluation of the prerequisites add an explicit rule to describe the dependencies.
So add explicit dependencies for the following stamp files:
%/.stamp_extracted %/.stamp_patched %/.stamp_configured %/.stamp_built %/.stamp_host_installed %/.stamp_staging_installed %/.stamp_images_installed %/.stamp_target_installed
Quoted 3 lines
Quoted 1 line
Because the %-build target is not anymore part of the dependcy chain,
dependency
ok
Quoted 119 lines
Quoted 119 lines
add a new variable <pkgname>_BUILD_DEPENDENCIES to be used instead. This new variable is used only by the uclibc package for building the toolchain.
Signed-off-by Fabio Porcedda <[email protected]>--- package/pkg-generic.mk | 45 +++++++++++++++++++++------------------------ package/uclibc/uclibc.mk | 3 ++- 2 files changed, 23 insertions(+), 25 deletions(-)package/pkg-generic.mk +16
-16@@ -53,7 +53,7 @@ ifeq ($(DL_MODE),DOWNLOAD) endif # Unpack the archive -$(BUILD_DIR)/%/.stamp_extracted: +$(BUILD_DIR)/%/.stamp_extracted: $(BUILD_DIR)/%/.stamp_downloaded @$(call MESSAGE,"Extracting") $(Q)mkdir -p $(@D) $($(PKG)_EXTRACT_CMDS)@@ -88,7 +88,7 @@ endif # prefix of the patches $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION) $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(call qstrip,$(BR2_GLOBAL_PATCH_DIR))/$(RAWNAME) -$(BUILD_DIR)/%/.stamp_patched: +$(BUILD_DIR)/%/.stamp_patched: $(BUILD_DIR)/%/.stamp_extracted @$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)") $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) $(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))@@ -115,21 +115,21 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)touch $@ # Build -$(BUILD_DIR)/%/.stamp_built:: +$(BUILD_DIR)/%/.stamp_built: $(BUILD_DIR)/%/.stamp_configured @$(call MESSAGE,"Building") $($(PKG)_BUILD_CMDS) $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to host dir -$(BUILD_DIR)/%/.stamp_host_installed: +$(BUILD_DIR)/%/.stamp_host_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to host directory") $($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to staging dir -$(BUILD_DIR)/%/.stamp_staging_installed: +$(BUILD_DIR)/%/.stamp_staging_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to staging directory") $($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep))@@ -143,14 +143,14 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(Q)touch $@ # Install to images dir -$(BUILD_DIR)/%/.stamp_images_installed: +$(BUILD_DIR)/%/.stamp_images_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to images directory") $($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) $(Q)touch $@ # Install to target dir -$(BUILD_DIR)/%/.stamp_target_installed: +$(BUILD_DIR)/%/.stamp_target_installed: $(BUILD_DIR)/%/.stamp_built @$(call MESSAGE,"Installing to target") $(if $(BR2_INIT_SYSTEMD),\ $($(PKG)_INSTALL_INIT_SYSTEMD))@@ -312,6 +312,7 @@ $(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ ifeq ($$($(2)_TYPE),target) $(2)_DEPENDENCIES += toolchain endif +$(2)_BUILD_DEPENDENCIES ?= $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO@@ -363,30 +364,29 @@ $(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_BUILD): | $$($(2)_BUILD_DEPENDENCIES) +$(1)-build: $$($(2)_TARGET_BUILD) + +$(1)-configure: $$($(2)_TARGET_CONFIGURE)
Quoted 13 lines
package/pkg-generic.mk ifeq ($$($(2)_OVERRIDE_SRCDIR),) · line 398
Quoted 9 lines
package/pkg-generic.mk +1
-2ifeq ($$($(2)_OVERRIDE_SRCDIR),) # In the normal case (no package override), the sequence of steps is@@ -395,13 +395,11 @@ ifeq ($$($(2)_OVERRIDE_SRCDIR),) # extract # patch # configure -$(1)-configure: $(1)-patch $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(2)_TARGET_PATCH)Why is $$($(2)_TARGET_PATCH) an order-only dependency? Why isn't the configure -> patch dependency handled like all the others, using stamp files dependencies?
I'm using an order-only dependency just to use a single line, i can splt both rules:
$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES)
ifeq
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH)
...
else
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC)
...
endif
Do you like it?
If instead are you asking the reason because i have not used a %-rule, is because that dependency is a conditional dependency that depends on the value of $$($(2)_OVERRIDE_SRCDIR) and i don't know i way to use that variable in a %-rule.
Do you have some suggestion about that?
Quoted 38 lines
Note that I do understand the order-only dependency of $(2)_TARGET_CONFIGURE on $(2)_DEPENDENCIES, but not on $(2)_TARGET_PATCH.
Quoted 34 lines
package/pkg-generic.mk +4
-6-$(1)-patch: $(1)-extract $$($(2)_TARGET_PATCH) +$(1)-patch: $$($(2)_TARGET_PATCH) -$(1)-extract: $(1)-source \ - $$($(2)_TARGET_EXTRACT) +$(1)-extract: $$($(2)_TARGET_EXTRACT) $(1)-depends: $$($(2)_DEPENDENCIES)@@ -411,10 +409,9 @@ else # source, by rsyncing # depends # configure -$(1)-configure: $(1)-depends \ - $$($(2)_TARGET_CONFIGURE) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) $$($(2)_TARGET_RSYNC) -$(1)-depends: $(1)-rsync $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_DEPENDENCIES) $(1)-patch: $(1)-rsync $(1)-extract: $(1)-rsyncpackage/uclibc/uclibc.mk +2
-1@@ -24,7 +24,8 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # Before uClibc is built, we must have the second stage # cross-compiler, for some gcc versions, and when NPTL is used. -uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) +UCLIBC_BUILD_DEPENDENCIES = \ + $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate)
Quoted 4 lines
package/uclibc/uclibc.mk UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers · line 31
Quoted 2 lines
package/uclibc/uclibc.mk +0
-0# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting.There is the same problem in
package/glibc/glibc.mk.
Ok i will add the glibc package too.
Thanks and best regards
Signature · 1 line
Fabio Porcedda
PATCH v4 2/3 pkg-generic: fix rules for top-level parallel make
Dear Fabio Porcedda,
Quoted 6 lines · Fabio Porcedda
Quoted 4 lines · Fabio Porcedda
Quoted 1 line
To be able to use top-level parallel make we must don't depend in a rule
must don't -> should not
Maybe "must not" because is a requirement and not a suggestion?
I am not a native english speaker, but my vague memories from my english lessons are that while "must" indicates an obligation, "must not" does not indicate an interdiction, while "should not" does. Well, a little bit of googling suggests I'm wrong. According to
http://www.englishpage.com/modals/must.html:
"""
"Must not" can be used to prohibit actions, but this sounds very severe; speakers prefer to use softer modal verbs such as "should not" or "ought not" to dissuade rather than prohibit.
"""
So I believe you're right, we can keep "must not" (but not "must don't"). Sorry for the noise.
Quoted 19 lines
Quoted 3 lines
Why is $$($(2)_TARGET_PATCH) an order-only dependency? Why isn't the configure -> patch dependency handled like all the others, using stamp files dependencies?
I'm using an order-only dependency just to use a single line, i can splt both rules:
$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES)
ifeq
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH)
...
else
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC)
...
endif
Quoted 1 line
Do you like it?
I think it would be clearer. Also, it should be same for the other dependencies between steps. Rather than putting them in the $(BUILD_DIR)/%/.stamp_<something> rules, you could put them in the $$($(2)_TARGET_<SOMETHING>) rules so that they are all at the same place, no?
Quoted 5 lines
If instead are you asking the reason because i have not used a %-rule, is because that dependency is a conditional dependency that depends on the value of $$($(2)_OVERRIDE_SRCDIR) and i don't know i way to use that variable in a %-rule.
Do you have some suggestion about that?
See my suggestion above (if it works, of course).
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v4 2/3 pkg-generic: fix rules for top-level parallel make
Quoted 17 lines · Thomas Petazzoni
Dear Fabio Porcedda,
Quoted 6 lines · Fabio Porcedda
Quoted 4 lines · Fabio Porcedda
Quoted 1 line
To be able to use top-level parallel make we must don't depend in a rule
must don't -> should not
Maybe "must not" because is a requirement and not a suggestion?
I am not a native english speaker, but my vague memories from my english lessons are that while "must" indicates an obligation, "must not" does not indicate an interdiction, while "should not" does. Well, a little bit of googling suggests I'm wrong. According to
http://www.englishpage.com/modals/must.html:
Quoted 8 lines
"""
"Must not" can be used to prohibit actions, but this sounds very severe; speakers prefer to use softer modal verbs such as "should not" or "ought not" to dissuade rather than prohibit.
"""So I believe you're right, we can keep "must not" (but not "must don't"). Sorry for the noise.
Ok
Quoted 19 lines
Quoted 19 lines
Quoted 3 lines
Why is $$($(2)_TARGET_PATCH) an order-only dependency? Why isn't the configure -> patch dependency handled like all the others, using stamp files dependencies?
I'm using an order-only dependency just to use a single line, i can splt both rules:
$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES)
ifeq
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH)
...
else
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC)
...
endif
Quoted 7 lines
Quoted 1 line
Do you like it?
I think it would be clearer. Also, it should be same for the other dependencies between steps. Rather than putting them in the $(BUILD_DIR)/%/.stamp_<something> rules, you could put them in the $$($(2)_TARGET_<SOMETHING>) rules so that they are all at the same place, no?
It's fine for me, in the previous version (v3) i was doing that, I hope is fine even for Arnout.
Quoted 7 lines
Quoted 5 lines
If instead are you asking the reason because i have not used a %-rule, is because that dependency is a conditional dependency that depends on the value of $$($(2)_OVERRIDE_SRCDIR) and i don't know i way to use that variable in a %-rule.
Do you have some suggestion about that?See my suggestion above (if it works, of course).
Ok
Thanks and best regards
Signature · 1 line
Fabio Porcedda
PATCH v4 2/3 pkg-generic: fix rules for top-level parallel make
Quoted 21 lines · Fabio Porcedda
Quoted 21 lines
Quoted 21 lines
Quoted 20 lines
Why is $$($(2)_TARGET_PATCH) an order-only dependency? Why isn't the
Quoted 19 lines
Quoted 2 lines
Quoted 2 lines
configure -> patch dependency handled like all the others, using stamp files dependencies?
I'm using an order-only dependency just to use a single line, i can splt both rules:
$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES)
ifeq
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH)
...
else
...
$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC)
...
endifDo you like it?
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
I think it would be clearer. Also, it should be same for the other dependencies between steps. Rather than putting them in the $(BUILD_DIR)/%/.stamp_<something> rules, you could put them in the $$($(2)_TARGET_<SOMETHING>) rules so that they are all at the same place, no?
It's fine for me, in the previous version (v3) i was doing that, I hope is fine even for Arnout.
Ah yes, I didn't consider the rsync thing. In fact you're right, by
putting the dependencies in the pattern rules you loose a lot of flexibility. So, back to the version you propose above!
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
In reply to Fabio PorceddaWhen the "BR2_JLEVEL" variable is empty use "make" without the "-j" option.
To be able to use top-level parallel make we must don't force the number of jobs in sub-make.
Example:
make BR2_JLEVEL= -j8
--- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/Makefile.in +1 -1
@@ -18,7 +18,7 @@ PARALLEL_JOBS:=$(BR2_JLEVEL) endif MAKE1:=$(HOSTMAKE) -j1 -MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS) +MAKE:=$(HOSTMAKE) $(if $(PARALLEL_JOBS),-j$(PARALLEL_JOBS)) # Compute GNU_TARGET_NAME GNU_TARGET_NAME=$(ARCH)-buildroot-$(TARGET_OS)-$(LIBC)$(ABI)
Signature · 1 line
1.8.4
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Dear Fabio Porcedda,
That's a minor nit, but "add a way to don't force jobs in sub-make" isn't really correct english I blieve. "add away to not force the number of jobs in sub-make" or something like that would be more appropriate.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Maybe "add a way to prevent forcing of [parallel?] jobs in sub-make"?
Quoted 7 lines · Thomas Petazzoni
Dear Fabio Porcedda,
That's a minor nit, but "add a way to don't force jobs in sub-make" isn't really correct english I blieve. "add away to not force the number of jobs in sub-make" or something like that would be more appropriate.
Quoted 11 lines
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130917/0027b62d/attachment.html>
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Hi Thomas and Clar?n,
thanks for reviewing.
Quoted 11 lines · Ciar?n Rehill
Maybe "add a way to prevent forcing of [parallel?] jobs in sub-make"?
Quoted 7 lines · Thomas Petazzoni
Dear Fabio Porcedda,
That's a minor nit, but "add a way to don't force jobs in sub-make" isn't really correct english I blieve. "add away to not force the number of jobs in sub-make" or something like that would be more appropriate.
What about a mix of both?
"add a way to prevent forcing the number of jobs in sub-make"
Thanks
Signature · 1 line
Fabio Porcedda
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Op 19-sep.-2013 08:35 schreef "Fabio Porcedda" <[email protected]> het volgende:
Quoted 12 lines
Hi Thomas and Clar?n,
thanks for reviewing.Quoted 7 lines · Ciar?n Rehill
Maybe "add a way to prevent forcing of [parallel?] jobs in sub-make"?
Quoted 3 lines · Thomas Petazzoni
Dear Fabio Porcedda,
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
That's a minor nit, but "add a way to don't force jobs in sub-make" isn't really correct english I blieve. "add away to not force the number of jobs in sub-make" or something like that would be more appropriate.
What about a mix of both?
"add a way to prevent forcing the number of jobs in sub-make"
In fact, we don't add a way, since the user cannot choose to force or not. So I'd suggest something like:
Don't force the number of jobs...
Or if you prefer:
Prevent forcing...
Best regards,
Thomas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130919/2b41a970/attachment.html>
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Hi Thomas,
thanks for reviewing.
Quoted 22 lines · Thomas De Schampheleire
Op 19-sep.-2013 08:35 schreef "Fabio Porcedda" <[email protected]> het volgende:
Quoted 17 lines
Hi Thomas and Clar?n,
thanks for reviewing.Quoted 11 lines · Ciar?n Rehill
Maybe "add a way to prevent forcing of [parallel?] jobs in sub-make"?
Quoted 7 lines · Thomas Petazzoni
Dear Fabio Porcedda,
That's a minor nit, but "add a way to don't force jobs in sub-make" isn't really correct english I blieve. "add away to not force the number of jobs in sub-make" or something like that would be more appropriate.
Quoted 5 lines
Quoted 3 lines
What about a mix of both?
"add a way to prevent forcing the number of jobs in sub-make"In fact, we don't add a way, since the user cannot choose to force or not.
IMHO the user can choose by means of the "BR2_JLEVEL" variable, if that variable contains a value buildroot will force the number of jobs, if that variable is empty buildroot will not force the number of jobs.
Quoted 4 lines
So I'd suggest something like:
Don't force the number of jobs...
Or if you prefer:
Prevent forcing...
Thanks and best regards
Signature · 1 line
Fabio Porcedda
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Hi Fabio,
On Thu, Sep 19, 2013 at 8:59 AM, Fabio Porcedda
<[email protected]> wrote:
[..]
Quoted 6 lines
Quoted 1 line
In fact, we don't add a way, since the user cannot choose to force or not.
IMHO the user can choose by means of the "
BR2_JLEVEL" variable, if that variable contains a value buildroot will force the number of jobs, if that variable is empty buildroot will not force the number of jobs.
True, but BR2_JLEVEL was already there before your patch. What your patch fixes is the situation where BR2_JLEVEL is empty, not 0, 1, 2, 3, ... as the original code expected. So, maybe a better title is:
package/Makefile.in: don't force parallel building when BR2_JLEVEL is empty
Best regards,
Thomas
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Quoted 12 lines · Thomas De Schampheleire
Hi Fabio,
On Thu, Sep 19, 2013 at 8:59 AM, Fabio Porcedda
<[email protected]> wrote:
[..]Quoted 6 lines
Quoted 1 line
In fact, we don't add a way, since the user cannot choose to force or not.
IMHO the user can choose by means of the "
BR2_JLEVEL" variable, if that variable contains a value buildroot will force the number of jobs, if that variable is empty buildroot will not force the number of jobs.
Quoted 5 lines
True, but
BR2_JLEVELwas already there before your patch. What your patch fixes is the situation whereBR2_JLEVELis empty, not 0, 1, 2, 3, ... as the original code expected. So, maybe a better title is:package/Makefile.in: don't force parallel building when
BR2_JLEVELis empty
Ok it's fine for me.
Thanks and best regards
Signature · 1 line
Fabio Porcedda
PATCH v4 3/3 package/Makefile.in: add a way to don't force jobs in sub-make
Quoted 14 lines · Fabio Porcedda
Quoted 12 lines · Thomas De Schampheleire
Hi Fabio,
On Thu, Sep 19, 2013 at 8:59 AM, Fabio Porcedda
<[email protected]> wrote:
[..]Quoted 6 lines
Quoted 1 line
In fact, we don't add a way, since the user cannot choose to force or not.
IMHO the user can choose by means of the "
BR2_JLEVEL" variable, if that variable contains a value buildroot will force the number of jobs, if that variable is empty buildroot will not force the number of jobs.
Quoted 7 lines
Quoted 5 lines
True, but
BR2_JLEVELwas already there before your patch. What your patch fixes is the situation whereBR2_JLEVELis empty, not 0, 1, 2, 3, ... as the original code expected. So, maybe a better title is:package/Makefile.in: don't force parallel building when
BR2_JLEVELis emptyOk it's fine for me.
Well the line it's too long (75 character), i will use:
package/Makefile.in: don't force jobs when BR2_JLEVEL is empty
Best regards
Signature · 1 line
Fabio Porcedda