summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Pouiller <jezz@sysmic.org>2013-05-13 15:51:52 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-06 21:54:18 (GMT)
commit3e2d828c0a5c69a4b2929f330426d93e47ec5d25 (patch)
tree1ad48d5804259afdc581efc1c06c74c97fe7f0c8
parentd1f325f554cab7912e9221e91aba5b8aa97b1e3c (diff)
downloadbuildroot-3e2d828c0a5c69a4b2929f330426d93e47ec5d25.tar.gz
buildroot-3e2d828c0a5c69a4b2929f330426d93e47ec5d25.tar.bz2
Add support for plain URL in $(PKG)_PATCH variable
Until now, $(PKG)_PATCH allow only to download patches from same URL than tarball. This patch allow to detect when plain URL are used in $(PKG)_PATCH and correctly handle them. Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Markos Chandras <markos.chandras@imgtec.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/pkg-generic.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 00f1cb3..4dd395b 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -40,7 +40,12 @@ ifeq ($(DL_MODE),DOWNLOAD)
fi
endif
$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))
- $(foreach p,$($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))$(sep))
+ $(foreach p,$($(PKG)_PATCH),\
+ $(if $(findstring ://,$(p)),\
+ $(call DOWNLOAD,$(p)),\
+ $(call DOWNLOAD,$($(PKG)_SITE:/=)/$(p))\
+ )\
+ $(sep))
$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
ifeq ($(DL_MODE),DOWNLOAD)
$(Q)mkdir -p $(@D)
@@ -86,7 +91,7 @@ $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME)
$(BUILD_DIR)/%/.stamp_patched:
@$(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) $(p)$(sep))
+ $(foreach p,$($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $(notdir $(p))$(sep))
$(Q)( \
for D in $(PATCH_BASE_DIRS); do \
if test -d $${D}; then \