Commit 3e2d828c authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Peter Korsgaard
Browse files

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: default avatarJérôme Pouiller <jezz@sysmic.org>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent d1f325f5

package/pkg-generic.mk

+7 −2
Original line number Diff line number Diff line
@@ -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 \