mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-03 08:27:43 +00:00
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>
This commit is contained in:
parent
d1f325f554
commit
3e2d828c0a
@ -40,7 +40,12 @@ ifeq ($(DL_MODE),DOWNLOAD)
|
|||||||
fi
|
fi
|
||||||
endif
|
endif
|
||||||
$(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)))
|
$(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))
|
$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
|
||||||
ifeq ($(DL_MODE),DOWNLOAD)
|
ifeq ($(DL_MODE),DOWNLOAD)
|
||||||
$(Q)mkdir -p $(@D)
|
$(Q)mkdir -p $(@D)
|
||||||
@ -86,7 +91,7 @@ $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $($(PKG)_DIR_PREFIX)/$(RAWNAME)
|
|||||||
$(BUILD_DIR)/%/.stamp_patched:
|
$(BUILD_DIR)/%/.stamp_patched:
|
||||||
@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
|
@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
|
||||||
$(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep))
|
$(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)( \
|
$(Q)( \
|
||||||
for D in $(PATCH_BASE_DIRS); do \
|
for D in $(PATCH_BASE_DIRS); do \
|
||||||
if test -d $${D}; then \
|
if test -d $${D}; then \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user