Makefile.package.in: allow packages to override download step
PATCH 1/1 Makefile.package.in: allow packages to override download step
commit: http://git.buildroot.net/buildroot/commit/?id=48cf66f1a2e2c501abeee98b7a2268b0d6d2010d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
E.G. for checkout from version control instead.
--- package/Makefile.package.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/Makefile.package.in +1 -1
@@ -292,7 +292,7 @@ $(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built $(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured $(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted -$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded +$(2)_TARGET_SOURCE ?= $$($(2)_DIR)/.stamp_downloaded $(2)_TARGET_UNINSTALL = $$($(2)_DIR)/.stamp_uninstalled $(2)_TARGET_CLEAN = $$($(2)_DIR)/.stamp_cleaned $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
Signature · 1 line
1.7.1
PATCH 1/1 Makefile.package.in: allow packages to override download step
Hello,
Quoted 6 lines · On Thu, 1 Jul 2010 17:33:29 +0200 Peter Korsgaard <[email protected]> wrote:
package/Makefile.package.in +0
-0@@ -292,7 +292,7 @@ $(2)_TARGET_BUILD =$$($(2)_DIR)/.stamp_built $(2)_TARGET_CONFIGURE =
Quoted 8 lines
$$($(2)_DIR)/.stamp_configured $(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted -$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded +$(2)_TARGET_SOURCE ?= $$($(2)_DIR)/.stamp_downloaded $(2)_TARGET_UNINSTALL = $$($(2)_DIR)/.stamp_uninstalled $(2)_TARGET_CLEAN = $$($(2)_DIR)/.stamp_cleaned $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
As said on IRC, I'm sorry but I don't think I really like this.
We already have a mechanism to override steps in Makefile.autotools.in. I'd prefer to see if we can rely on a similar mechanism rather than doing this.
In the future, is it possible to discuss such infrastructure changes on the list beforehand ?
Thanks,
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 1/1 Makefile.package.in: allow packages to override download step
Thomas Petazzoni ha scritto:
Quoted 24 lines
Hello,
Quoted 6 lines · On Thu, 1 Jul 2010 17:33:29 +0200 Peter Korsgaard <[email protected]> wrote:
package/Makefile.package.in +0
-0@@ -292,7 +292,7 @@ $(2)_TARGET_BUILD =$$($(2)_DIR)/.stamp_built $(2)_TARGET_CONFIGURE =
Quoted 9 lines
$$($(2)_DIR)/.stamp_configured $(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted -$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded +$(2)_TARGET_SOURCE ?= $$($(2)_DIR)/.stamp_downloaded $(2)_TARGET_UNINSTALL = $$($(2)_DIR)/.stamp_uninstalled $(2)_TARGET_CLEAN = $$($(2)_DIR)/.stamp_cleaned $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
As said on IRC, I'm sorry but I don't think I really like this.
Quoted 4 lines
We already have a mechanism to override steps in Makefile.autotools.in. I'd prefer to see if we can rely on a similar mechanism rather than doing this.
It's a good feature to have, but I agree with Thomas about the way to implement it. As I proposed in the discussion about "Getting package sources from git/svn/bzr", I'd rather make the DOWNLOAD command overridable in package/Makefile.package.in, like this:
@@ -118,19 +118,19 @@
# Retrieve the archive
$(BUILD_DIR)/%/.stamp_downloaded:
# support make source-check/external-deps ifeq ($(SPIDER),) # Only show the download message if it isn't already downloaded $(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \ (test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \ $(call MESSAGE,"Downloading") endif - $(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)) + $($(PKG)_DOWNLOAD_CMDS) $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))
where of course $(PKG)_DOWNLOAD_CMDS would default to $(call DOWNLOAD,...).
Would such a patch be applied, if I wrote one?
Luca
PATCH 1/1 Makefile.package.in: allow packages to override download step
Quoted 22 lines · On Wed, 07 Jul 2010 22:21:59 +0200 Luca Ceresoli <[email protected]> wrote:
It's a good feature to have, but I agree with Thomas about the way to implement it. As I proposed in the discussion about "Getting package sources from git/svn/bzr", I'd rather make the DOWNLOAD command overridable in package/Makefile.package.in, like this:
(quoted diff) +1
-1@@ -118,19 +118,19 @@ # Retrieve the archive $(BUILD_DIR)/%/.stamp_downloaded: # support make source-check/external-deps ifeq ($(SPIDER),) # Only show the download message if it isn't already downloaded $(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \ (test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \ $(call MESSAGE,"Downloading") endif - $(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)) + $($(PKG)_DOWNLOAD_CMDS) $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH)))where of course $(PKG)_DOWNLOAD_CMDS would default to $(call DOWNLOAD,...).
Quoted 1 line
Would such a patch be applied, if I wrote one?
There's another approach currently being developed: integrate support for Git/SVN directly into the infrastructure. I hope to see the patch for this coming pretty soon.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com