* [Buildroot] [git commit] pkg-download: VERIFY_HASH: use same hash file for host and target downloads
@ 2014-12-08 7:52 Peter Korsgaard
2014-12-08 18:00 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2014-12-08 7:52 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=cf902845e7c23da7acddd82dc591255e4657d730
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes (or atleast stops the build with a saner description):
http://autobuild.buildroot.net/results/1a9/1a9643f8633db038d4fe5ca4a32e4d52e70a3a1a/
We're using the same sources for host and target downloads, so it makes
sense to use the same <pkg>.hash file as well to ensure the host version
gets verified without us having to maintain a seperate host-<pkg>.hash file.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/pkg-download.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index f3409bd..190b5b7 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -174,7 +174,7 @@ define DOWNLOAD_SCP
$(EXTRA_ENV) support/download/wrapper scp \
$(DL_DIR)/$(2) \
'$(call stripurischeme,$(call qstrip,$(1)))' && \
- $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
+ $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_RAWNAME).hash,$(DL_DIR)/$(2))
endef
define SOURCE_CHECK_SCP
@@ -211,7 +211,7 @@ define DOWNLOAD_WGET
$(EXTRA_ENV) support/download/wrapper wget \
$(DL_DIR)/$(2) \
'$(call qstrip,$(1))' && \
- $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
+ $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_RAWNAME).hash,$(DL_DIR)/$(2))
endef
define SOURCE_CHECK_WGET
@@ -227,7 +227,7 @@ define DOWNLOAD_LOCALFILES
$(EXTRA_ENV) support/download/wrapper cp \
$(DL_DIR)/$(2) \
$(call stripurischeme,$(call qstrip,$(1))) && \
- $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
+ $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_RAWNAME).hash,$(DL_DIR)/$(2))
endef
define SOURCE_CHECK_LOCALFILES
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [git commit] pkg-download: VERIFY_HASH: use same hash file for host and target downloads
2014-12-08 7:52 [Buildroot] [git commit] pkg-download: VERIFY_HASH: use same hash file for host and target downloads Peter Korsgaard
@ 2014-12-08 18:00 ` Yann E. MORIN
2014-12-08 20:00 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2014-12-08 18:00 UTC (permalink / raw)
To: buildroot
Peter, All,
On 2014-12-08 08:52 +0100, Peter Korsgaard spake thusly:
> commit: http://git.buildroot.net/buildroot/commit/?id=cf902845e7c23da7acddd82dc591255e4657d730
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Fixes (or atleast stops the build with a saner description):
> http://autobuild.buildroot.net/results/1a9/1a9643f8633db038d4fe5ca4a32e4d52e70a3a1a/
>
> We're using the same sources for host and target downloads, so it makes
> sense to use the same <pkg>.hash file as well to ensure the host version
> gets verified without us having to maintain a seperate host-<pkg>.hash file.
Damn, I had this in my download-hash series:
http://lists.busybox.net/pipermail/buildroot/2014-December/114493.html
I'll have to rebase it now... Hehe! ;-p
Regards,
Yann E. MORIN.
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
> package/pkg-download.mk | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index f3409bd..190b5b7 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -174,7 +174,7 @@ define DOWNLOAD_SCP
> $(EXTRA_ENV) support/download/wrapper scp \
> $(DL_DIR)/$(2) \
> '$(call stripurischeme,$(call qstrip,$(1)))' && \
> - $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
> + $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_RAWNAME).hash,$(DL_DIR)/$(2))
> endef
>
> define SOURCE_CHECK_SCP
> @@ -211,7 +211,7 @@ define DOWNLOAD_WGET
> $(EXTRA_ENV) support/download/wrapper wget \
> $(DL_DIR)/$(2) \
> '$(call qstrip,$(1))' && \
> - $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
> + $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_RAWNAME).hash,$(DL_DIR)/$(2))
> endef
>
> define SOURCE_CHECK_WGET
> @@ -227,7 +227,7 @@ define DOWNLOAD_LOCALFILES
> $(EXTRA_ENV) support/download/wrapper cp \
> $(DL_DIR)/$(2) \
> $(call stripurischeme,$(call qstrip,$(1))) && \
> - $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
> + $(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_RAWNAME).hash,$(DL_DIR)/$(2))
> endef
>
> define SOURCE_CHECK_LOCALFILES
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-08 20:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-08 7:52 [Buildroot] [git commit] pkg-download: VERIFY_HASH: use same hash file for host and target downloads Peter Korsgaard
2014-12-08 18:00 ` Yann E. MORIN
2014-12-08 20:00 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox