From: "Jérôme Pouiller" <jezz@sysmic.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] Add support for plain URL in $(PKG)_PATCH variable
Date: Wed, 30 Jan 2013 23:37:42 +0100 [thread overview]
Message-ID: <1359585462-1314-2-git-send-email-jezz@sysmic.org> (raw)
In-Reply-To: <1359585462-1314-1-git-send-email-jezz@sysmic.org>
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.
Downloaded patches are named $(PKG_NAME)-$(PKG_VERSION)-$(PKG_PATCH_FILENAME).patch
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/pkg-generic.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index b0eca0a..0afa72d 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),$($(PKG)_NAME)-$($(PKG)_VERSION)-$(basename $(notdir $(p)).patch)),\
+ $(call DOWNLOAD,$($(PKG)_SITE)/$(p))\
+ )\
+ $(sep))
$(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
ifeq ($(DL_MODE),DOWNLOAD)
$(Q)mkdir -p $(@D)
@@ -85,7 +90,7 @@ $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
$(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)( \
if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
--
1.7.9.5
next prev parent reply other threads:[~2013-01-30 22:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 21:30 [Buildroot] need help adding apache to buildroot Jenkins, Lee
2013-01-16 21:35 ` Gustavo Zacarias
2013-01-17 22:41 ` Jenkins, Lee
2013-01-18 9:25 ` Jérôme Pouiller
2013-01-18 15:31 ` Thomas Petazzoni
2013-01-18 16:11 ` [Buildroot] [PATCH] Add support for plain URL in $(PKG)_PATCH variable Jérôme Pouiller
2013-01-30 18:59 ` Yann E. MORIN
2013-01-30 19:23 ` Yann E. MORIN
2013-01-30 22:37 ` Jérôme Pouiller
2013-01-30 22:37 ` Jérôme Pouiller [this message]
2013-01-30 22:54 ` Yann E. MORIN
2013-01-30 23:11 ` Jérôme Pouiller
2013-01-31 8:18 ` [Buildroot] [PATCH 1/2] " Jérôme Pouiller
2013-01-31 8:18 ` [Buildroot] [PATCH 2/2] Add $(PKG_NAME) in name of downloaded patches Jérôme Pouiller
2013-04-26 6:18 ` Arnout Vandecappelle
2013-05-13 15:51 ` [Buildroot] [PATCH v2] Add support for plain URL in $(PKG)_PATCH variable Jérôme Pouiller
2013-05-13 20:59 ` Yann E. MORIN
2013-05-14 9:51 ` Markos Chandras
2013-09-07 6:12 ` Peter Korsgaard
2013-04-26 6:00 ` [Buildroot] [PATCH 1/2] " Arnout Vandecappelle
2013-01-31 8:20 ` [Buildroot] [PATCH] " Jérôme Pouiller
2013-01-30 22:50 ` Thomas Petazzoni
2013-01-30 22:57 ` Yann E. MORIN
2013-01-30 23:04 ` Jérôme Pouiller
2013-01-30 23:10 ` Yann E. MORIN
2013-01-16 21:54 ` [Buildroot] need help adding apache to buildroot Thomas Petazzoni
2013-07-07 14:16 ` Stephan Hoffmann
2013-07-18 16:46 ` Jenkins, Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1359585462-1314-2-git-send-email-jezz@sysmic.org \
--to=jezz@sysmic.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox