* [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version
@ 2020-02-06 18:19 Peter Korsgaard
2020-03-19 13:32 ` Yegor Yefremov
0 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2020-02-06 18:19 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=2ffaaea70c43dde30039c6469233ba8ca7a5dbe0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
We can only know the details of the license files for known versions. For
custom, older or newer versions, the license files may change, or may be
moved around.
So, do for Barebox as was done for ATF, linux, and linux-headers, and
only define the list of license files for the latest version.
Add the hash for that license file, and align hashes to the new spacing
convention.
Reported-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
boot/barebox/barebox.hash | 7 +++++--
boot/barebox/barebox.mk | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash
index 42561ea571..64fec919b8 100644
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@@ -1,5 +1,8 @@
# From https://www.barebox.org/download/barebox-2019.12.0.tar.bz2.md5
-md5 2d25158ccffaa843c9e4943bbe820ce2 barebox-2019.12.0.tar.bz2
+md5 2d25158ccffaa843c9e4943bbe820ce2 barebox-2019.12.0.tar.bz2
# Locally calculated
-sha256 fb77afc5c1a9783b8e1a9bb6c617973f5c0ed4c6f8e079f96cb7e7e0818a7a90 barebox-2019.12.0.tar.bz2
+sha256 fb77afc5c1a9783b8e1a9bb6c617973f5c0ed4c6f8e079f96cb7e7e0818a7a90 barebox-2019.12.0.tar.bz2
+
+# License files, locally computed
+sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 52178d89c8..f11f9950d1 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -33,7 +33,9 @@ endif
$(1)_DEPENDENCIES = host-lzop
$(1)_LICENSE = GPL-2.0 with exceptions
+ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
$(1)_LICENSE_FILES = COPYING
+endif
$(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version
2020-02-06 18:19 [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version Peter Korsgaard
@ 2020-03-19 13:32 ` Yegor Yefremov
2020-03-19 18:04 ` Yann E. MORIN
0 siblings, 1 reply; 6+ messages in thread
From: Yegor Yefremov @ 2020-03-19 13:32 UTC (permalink / raw)
To: buildroot
Hi Yann, Peter,
On Thu, Feb 6, 2020 at 8:44 PM Peter Korsgaard <peter@korsgaard.com> wrote:
>
> commit: https://git.buildroot.net/buildroot/commit/?id=2ffaaea70c43dde30039c6469233ba8ca7a5dbe0
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> We can only know the details of the license files for known versions. For
> custom, older or newer versions, the license files may change, or may be
> moved around.
>
> So, do for Barebox as was done for ATF, linux, and linux-headers, and
> only define the list of license files for the latest version.
>
> Add the hash for that license file, and align hashes to the new spacing
> convention.
>
> Reported-by: Peter Korsgaard <peter@korsgaard.com>
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Markus Mayer <mmayer@broadcom.com>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
> boot/barebox/barebox.hash | 7 +++++--
> boot/barebox/barebox.mk | 2 ++
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash
> index 42561ea571..64fec919b8 100644
> --- a/boot/barebox/barebox.hash
> +++ b/boot/barebox/barebox.hash
> @@ -1,5 +1,8 @@
> # From https://www.barebox.org/download/barebox-2019.12.0.tar.bz2.md5
> -md5 2d25158ccffaa843c9e4943bbe820ce2 barebox-2019.12.0.tar.bz2
> +md5 2d25158ccffaa843c9e4943bbe820ce2 barebox-2019.12.0.tar.bz2
>
> # Locally calculated
> -sha256 fb77afc5c1a9783b8e1a9bb6c617973f5c0ed4c6f8e079f96cb7e7e0818a7a90 barebox-2019.12.0.tar.bz2
> +sha256 fb77afc5c1a9783b8e1a9bb6c617973f5c0ed4c6f8e079f96cb7e7e0818a7a90 barebox-2019.12.0.tar.bz2
> +
> +# License files, locally computed
> +sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING
> diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
> index 52178d89c8..f11f9950d1 100644
> --- a/boot/barebox/barebox.mk
> +++ b/boot/barebox/barebox.mk
> @@ -33,7 +33,9 @@ endif
>
> $(1)_DEPENDENCIES = host-lzop
> $(1)_LICENSE = GPL-2.0 with exceptions
> +ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
> $(1)_LICENSE_FILES = COPYING
> +endif
>
> $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
This approach works with barebox. But when I also use barebox-aux from
git (for am335x), I get the following error:
ERROR: No hash found for
barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz
package/pkg-generic.mk:167: recipe for target
'/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded'
failed
make[1]: *** [/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded]
Error 1
Makefile:84: recipe for target '_all' failed
make: *** [_all] Error 2
Any idea how to fix this?
Yegor
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version
2020-03-19 13:32 ` Yegor Yefremov
@ 2020-03-19 18:04 ` Yann E. MORIN
2020-03-19 20:41 ` Yegor Yefremov
0 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2020-03-19 18:04 UTC (permalink / raw)
To: buildroot
Yegor, All,
On 2020-03-19 14:32 +0100, Yegor Yefremov spake thusly:
> On Thu, Feb 6, 2020 at 8:44 PM Peter Korsgaard <peter@korsgaard.com> wrote:
> > We can only know the details of the license files for known versions. For
> > custom, older or newer versions, the license files may change, or may be
> > moved around.
> >
> > So, do for Barebox as was done for ATF, linux, and linux-headers, and
> > only define the list of license files for the latest version.
[--SNIP--]
> > diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
> > index 52178d89c8..f11f9950d1 100644
> > --- a/boot/barebox/barebox.mk
> > +++ b/boot/barebox/barebox.mk
> > @@ -33,7 +33,9 @@ endif
> >
> > $(1)_DEPENDENCIES = host-lzop
> > $(1)_LICENSE = GPL-2.0 with exceptions
> > +ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
> > $(1)_LICENSE_FILES = COPYING
> > +endif
> >
> > $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
>
> This approach works with barebox. But when I also use barebox-aux from
> git (for am335x), I get the following error:
>
> ERROR: No hash found for barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz
This error is not about the hash files, but about the actual downloaded
tarball, while the patch you are replying to is about the hash of the
license file.
Care to provide a defconfig, or even just the URL to that git repo,
please?
Regards,
Yann E. MORIN.
> package/pkg-generic.mk:167: recipe for target
> '/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded'
> failed
> make[1]: *** [/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded]
> Error 1
> Makefile:84: recipe for target '_all' failed
> make: *** [_all] Error 2
>
> Any idea how to fix this?
>
> Yegor
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version
2020-03-19 18:04 ` Yann E. MORIN
@ 2020-03-19 20:41 ` Yegor Yefremov
2020-03-19 21:59 ` Yann E. MORIN
0 siblings, 1 reply; 6+ messages in thread
From: Yegor Yefremov @ 2020-03-19 20:41 UTC (permalink / raw)
To: buildroot
On Thu, Mar 19, 2020 at 7:04 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Yegor, All,
>
> On 2020-03-19 14:32 +0100, Yegor Yefremov spake thusly:
> > On Thu, Feb 6, 2020 at 8:44 PM Peter Korsgaard <peter@korsgaard.com> wrote:
> > > We can only know the details of the license files for known versions. For
> > > custom, older or newer versions, the license files may change, or may be
> > > moved around.
> > >
> > > So, do for Barebox as was done for ATF, linux, and linux-headers, and
> > > only define the list of license files for the latest version.
> [--SNIP--]
> > > diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
> > > index 52178d89c8..f11f9950d1 100644
> > > --- a/boot/barebox/barebox.mk
> > > +++ b/boot/barebox/barebox.mk
> > > @@ -33,7 +33,9 @@ endif
> > >
> > > $(1)_DEPENDENCIES = host-lzop
> > > $(1)_LICENSE = GPL-2.0 with exceptions
> > > +ifeq ($(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
> > > $(1)_LICENSE_FILES = COPYING
> > > +endif
> > >
> > > $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
> >
> > This approach works with barebox. But when I also use barebox-aux from
> > git (for am335x), I get the following error:
> >
> > ERROR: No hash found for barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz
>
> This error is not about the hash files, but about the actual downloaded
> tarball, while the patch you are replying to is about the hash of the
> license file.
>
> Care to provide a defconfig, or even just the URL to that git repo,
> please?
You can take our BSP [1] and this defconfig [2] to reproduce this
issue. Just replace barebox version to the official barebox git and
use the latest commit ID.
am335x requires two images MLO and barebox.bin so it has to use both
barebox and barebox-aux.
[1] https://github.com/visionsystemsgmbh/onrisc_br_bsp
[2] https://github.com/visionsystemsgmbh/onrisc_br_bsp/blob/master/configs/baltos_experimental_defconfig
Thanks.
Yegor
> Regards,
> Yann E. MORIN.
>
> > package/pkg-generic.mk:167: recipe for target
> > '/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded'
> > failed
> > make[1]: *** [/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded]
> > Error 1
> > Makefile:84: recipe for target '_all' failed
> > make: *** [_all] Error 2
> >
> > Any idea how to fix this?
> >
> > Yegor
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version
2020-03-19 20:41 ` Yegor Yefremov
@ 2020-03-19 21:59 ` Yann E. MORIN
2020-03-20 7:50 ` Yegor Yefremov
0 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2020-03-19 21:59 UTC (permalink / raw)
To: buildroot
Yegor, All,
On 2020-03-19 21:41 +0100, Yegor Yefremov spake thusly:
> On Thu, Mar 19, 2020 at 7:04 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > On 2020-03-19 14:32 +0100, Yegor Yefremov spake thusly:
[--SNIP--]
> > > This approach works with barebox. But when I also use barebox-aux from
> > > git (for am335x), I get the following error:
> > >
> > > ERROR: No hash found for barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz
[--SNIP--]
> > Care to provide a defconfig, or even just the URL to that git repo,
> > please?
>
> You can take our BSP [1] and this defconfig [2] to reproduce this
> issue. Just replace barebox version to the official barebox git and
> use the latest commit ID.
> am335x requires two images MLO and barebox.bin so it has to use both
> barebox and barebox-aux.
>
> [1] https://github.com/visionsystemsgmbh/onrisc_br_bsp
> [2] https://github.com/visionsystemsgmbh/onrisc_br_bsp/blob/master/configs/baltos_experimental_defconfig
This is not really a minimal defconfig, and does not use stock
Buildroot, so I came up with one by myself:
BR2_arm=y
BR2_cortex_a7=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_BAREBOX=y
BR2_TARGET_BAREBOX_CUSTOM_GIT=y
BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL="https://git.pengutronix.de/git/barebox"
BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION="v2020.03.0"
BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="foo"
BR2_TARGET_BAREBOX_AUX=y
BR2_TARGET_BAREBOX_AUX_BOARD_DEFCONFIG="bar"
And ran 'make source', to indeed get the same problem.
I've sent two related patches to fix the issue:
https://patchwork.ozlabs.org/patch/1258482/
https://patchwork.ozlabs.org/patch/1258485/
Only the second is required to fix the issue. The first one is a bonus
to avoid downloading twice.
Care to test them, please?
Regards,
Yann E. MORIN.
> Thanks.
>
> Yegor
>
> > Regards,
> > Yann E. MORIN.
> >
> > > package/pkg-generic.mk:167: recipe for target
> > > '/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded'
> > > failed
> > > make[1]: *** [/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded]
> > > Error 1
> > > Makefile:84: recipe for target '_all' failed
> > > make: *** [_all] Error 2
> > >
> > > Any idea how to fix this?
> > >
> > > Yegor
> >
> > --
> > .-----------------.--------------------.------------------.--------------------.
> > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> > '------------------------------^-------^------------------^--------------------'
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version
2020-03-19 21:59 ` Yann E. MORIN
@ 2020-03-20 7:50 ` Yegor Yefremov
0 siblings, 0 replies; 6+ messages in thread
From: Yegor Yefremov @ 2020-03-20 7:50 UTC (permalink / raw)
To: buildroot
On Thu, Mar 19, 2020 at 11:00 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Yegor, All,
>
> On 2020-03-19 21:41 +0100, Yegor Yefremov spake thusly:
> > On Thu, Mar 19, 2020 at 7:04 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > > On 2020-03-19 14:32 +0100, Yegor Yefremov spake thusly:
> [--SNIP--]
> > > > This approach works with barebox. But when I also use barebox-aux from
> > > > git (for am335x), I get the following error:
> > > >
> > > > ERROR: No hash found for barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e.tar.gz
> [--SNIP--]
> > > Care to provide a defconfig, or even just the URL to that git repo,
> > > please?
> >
> > You can take our BSP [1] and this defconfig [2] to reproduce this
> > issue. Just replace barebox version to the official barebox git and
> > use the latest commit ID.
> > am335x requires two images MLO and barebox.bin so it has to use both
> > barebox and barebox-aux.
> >
> > [1] https://github.com/visionsystemsgmbh/onrisc_br_bsp
> > [2] https://github.com/visionsystemsgmbh/onrisc_br_bsp/blob/master/configs/baltos_experimental_defconfig
>
> This is not really a minimal defconfig, and does not use stock
> Buildroot, so I came up with one by myself:
>
> BR2_arm=y
> BR2_cortex_a7=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_TARGET_BAREBOX=y
> BR2_TARGET_BAREBOX_CUSTOM_GIT=y
> BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL="https://git.pengutronix.de/git/barebox"
> BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION="v2020.03.0"
> BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="foo"
> BR2_TARGET_BAREBOX_AUX=y
> BR2_TARGET_BAREBOX_AUX_BOARD_DEFCONFIG="bar"
>
> And ran 'make source', to indeed get the same problem.
>
> I've sent two related patches to fix the issue:
>
> https://patchwork.ozlabs.org/patch/1258482/
> https://patchwork.ozlabs.org/patch/1258485/
>
> Only the second is required to fix the issue. The first one is a bonus
> to avoid downloading twice.
>
> Care to test them, please?
Working like a charm. Thanks for a quick fix.
Yegor
> > > > package/pkg-generic.mk:167: recipe for target
> > > > '/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded'
> > > > failed
> > > > make[1]: *** [/home/user/buildroot/bsp-experimental/build/barebox-aux-1e23cf5c7b71c29cc8dd7b0c5b80929d286b554e/.stamp_downloaded]
> > > > Error 1
> > > > Makefile:84: recipe for target '_all' failed
> > > > make: *** [_all] Error 2
> > > >
> > > > Any idea how to fix this?
> > > >
> > > > Yegor
> > >
> > > --
> > > .-----------------.--------------------.------------------.--------------------.
> > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> > > '------------------------------^-------^------------------^--------------------'
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-20 7:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-06 18:19 [Buildroot] [git commit] boot/barebox: license files hashes only valid for latest version Peter Korsgaard
2020-03-19 13:32 ` Yegor Yefremov
2020-03-19 18:04 ` Yann E. MORIN
2020-03-19 20:41 ` Yegor Yefremov
2020-03-19 21:59 ` Yann E. MORIN
2020-03-20 7:50 ` Yegor Yefremov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.