From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] Add $(PKG_NAME) in name of downloaded patches
Date: Fri, 26 Apr 2013 08:18:37 +0200 [thread overview]
Message-ID: <517A1C3D.1010009@mind.be> (raw)
In-Reply-To: <1359620310-13640-2-git-send-email-jezz@sysmic.org>
On 31/01/13 09:18, J?r?me Pouiller wrote:
> Until now, patch was downloaded without be renamed. $(DL_DIR) quickly become a
> mess.
Not really... There is just a chance that the patch isn't named
according to the package name, which could lead to conflicts between
patch names. But currently there is not a single patch for which the
patch name differs from the archive name.
> Downloaded patches are now named
> $(PKG_NAME)-$(PKG_VERSION)-$(PKG_PATCH_FILENAME).
How about adding a new function, CLEAN_DOWNLOAD_NAME, that does
$($(PKG)_NAME)-$($(PKG)_VERSION)-$(patsubst \
$($(PKG)_VERSION)-%,%,$(patsubst $($(PKG)_NAME)-%,%,$(1)))
so that the names don't get too long in the usual case?
The same could also be applied to the package archives.
But really I think it's making things more complex without being
necessary in practice. I don't expect this situation of conflicting names
is likely to occur.
Regards,
Arnout
>
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/pkg-generic.mk | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index fbc2bb9..f2bf40a 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -42,8 +42,8 @@ endif
> $(if $($(PKG)_SOURCE),$(call DOWNLOAD,$($(PKG)_SITE)/$($(PKG)_SOURCE)))
> $(foreach p,$($(PKG)_PATCH),\
> $(if $(findstring ://,$(p)),\
> - $(call DOWNLOAD,$(p)),\
> - $(call DOWNLOAD,$($(PKG)_SITE)/$(p))\
> + $(call DOWNLOAD,$(p),$($(PKG)_NAME)-$($(PKG)_VERSION)-$(notdir $(p))),\
> + $(call DOWNLOAD,$($(PKG)_SITE)/$(p),$($(PKG)_NAME)-$($(PKG)_VERSION)-$(notdir $(p)))\
> )\
> $(sep))
> $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep))
> @@ -90,7 +90,8 @@ $(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) $(notdir $(p))$(sep))
> + $(foreach p,$($(PKG)_PATCH),\
> + support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_NAME)-$($(PKG)_VERSION)-$(notdir $(p))$(sep))
> $(Q)( \
> if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
> if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
next prev parent reply other threads:[~2013-04-26 6:18 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
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 [this message]
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=517A1C3D.1010009@mind.be \
--to=arnout@mind.be \
--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