[Buildroot] [PATCH] board/xilinx: re-add hash file for xilinx-prebuilt

[Buildroot] [PATCH] board/xilinx: re-add hash file for xilinx-prebuilt

[Yann E. MORIN]

When xilinx pre-built was added in a6648ad8da (boot/xilinx-prebuilt:
new boot package), the hash file was initially a board-specific hash
file. However, that hash file, in commit a6648ad8da, really belonged
to the xilinx-prebuilt package, for two reasons: the package needs a
hash file for the version it installs, and no defconfig was using it
at that time. So the hash file was moved out of the boar directory,
and into the package directory when the patch was applied.

When the xilinx-related boards were changed to use xilinx-prebuilt,  in
551ba16a0f (configs/zynqmp_*: migrate to xilinx-prebuilt) and 8271323649
(configs/versal_vck190_defconfig: migrate to xilinx-prebuilt), they were
correctly made to use a custom, non-default version. But then, it meant
that those defconfig would no longer have a hash when we would bump the
default version in xilinx-prebuilt.

Re-add the initial board-specific hash file now that it is required.

Fixes: 551ba16a0f09fe550acb3ef6d12a1b2587d03292
Fixes: 8271323649c42420adaf4513b0472a7203f7784d

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Neal Frager <neal.frager@amd.com>
---
 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash

diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
new file mode 100644
index 0000000000..c955cd79f5
--- /dev/null
+++ b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f  xilinx-prebuilt-xilinx_v2024.1.tar.gz
-- 
2.45.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] board/xilinx: re-add hash file for xilinx-prebuilt

[Frager, Neal via buildroot]

> When xilinx pre-built was added in a6648ad8da (boot/xilinx-prebuilt:
> new boot package), the hash file was initially a board-specific hash
> file. However, that hash file, in commit a6648ad8da, really belonged
> to the xilinx-prebuilt package, for two reasons: the package needs a
> hash file for the version it installs, and no defconfig was using it
> at that time. So the hash file was moved out of the boar directory,
> and into the package directory when the patch was applied.

> When the xilinx-related boards were changed to use xilinx-prebuilt,  in
> 551ba16a0f (configs/zynqmp_*: migrate to xilinx-prebuilt) and 8271323649
> (configs/versal_vck190_defconfig: migrate to xilinx-prebuilt), they were
> correctly made to use a custom, non-default version. But then, it meant
> that those defconfig would no longer have a hash when we would bump the
> default version in xilinx-prebuilt.

Yes indeed.  In the future, I plan to bump both the xilinx-prebuilt package as
well as the board defconfigs.  It is important that the defconfigs configure
the xilinx-prebuilt version, so that we can bump either side independently.

Also, even though I will keep the defconfigs on the latest version, users may
want build with older versions, which is why it is important that the version
is configurable.

> Re-add the initial board-specific hash file now that it is required.

> Fixes: 551ba16a0f09fe550acb3ef6d12a1b2587d03292
> Fixes: 8271323649c42420adaf4513b0472a7203f7784d

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Neal Frager <neal.frager@amd.com>
Reviewed-by: Neal Frager <neal.frager@amd.com>
> ---
> board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash | 2 ++
> 1 file changed, 2 insertions(+)
> create mode 100644 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash

> diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> new file mode 100644
> index 0000000000..c955cd79f5
> --- /dev/null
> +++ b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f  xilinx-prebuilt-xilinx_v2024.1.tar.gz
> -- 
> 2.45.1

Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] board/xilinx: re-add hash file for xilinx-prebuilt

[Frager, Neal via buildroot]

> When xilinx pre-built was added in a6648ad8da (boot/xilinx-prebuilt:
> new boot package), the hash file was initially a board-specific hash
> file. However, that hash file, in commit a6648ad8da, really belonged
> to the xilinx-prebuilt package, for two reasons: the package needs a
> hash file for the version it installs, and no defconfig was using it
> at that time. So the hash file was moved out of the boar directory,
> and into the package directory when the patch was applied.

> When the xilinx-related boards were changed to use xilinx-prebuilt,  in
> 551ba16a0f (configs/zynqmp_*: migrate to xilinx-prebuilt) and 8271323649
> (configs/versal_vck190_defconfig: migrate to xilinx-prebuilt), they were
> correctly made to use a custom, non-default version. But then, it meant
> that those defconfig would no longer have a hash when we would bump the
> default version in xilinx-prebuilt.

> Yes indeed.  In the future, I plan to bump both the xilinx-prebuilt package as
> well as the board defconfigs.  It is important that the defconfigs configure
> the xilinx-prebuilt version, so that we can bump either side independently.

> Also, even though I will keep the defconfigs on the latest version, users may
> want build with older versions, which is why it is important that the version
> is configurable.

> Re-add the initial board-specific hash file now that it is required.

> Fixes: 551ba16a0f09fe550acb3ef6d12a1b2587d03292
> Fixes: 8271323649c42420adaf4513b0472a7203f7784d

> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Neal Frager <neal.frager@amd.com>
> Reviewed-by: Neal Frager <neal.frager@amd.com>
> ---
> board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash | 2 ++
> 1 file changed, 2 insertions(+)
> create mode 100644 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash

> diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> new file mode 100644
> index 0000000000..c955cd79f5
> --- /dev/null
> +++ b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f  xilinx-prebuilt-xilinx_v2024.1.tar.gz
> -- 
> 2.45.1

Actually, wouldn't this be better if this was just a link to the hash in the
/boot/xilinx-prebuilt directory?

Also, if you are the one who applies the xilinx-source patch set, could you
make sure to do the same thing with the hash file for the xilinx-source
package?

https://patchwork.ozlabs.org/project/buildroot/patch/20240618074922.3555070-1-neal.frager@amd.com/

Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] board/xilinx: re-add hash file for xilinx-prebuilt

[Yann E. MORIN]

Neal, All,

On 2024-06-20 13:42 +0000, Frager, Neal via buildroot spake thusly:
[--SNIP--]
> > diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> > new file mode 100644
> > index 0000000000..c955cd79f5
> > --- /dev/null
> > +++ b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> > @@ -0,0 +1,2 @@
> > +# Locally calculated
> > +sha256  7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f  xilinx-prebuilt-xilinx_v2024.1.tar.gz
> Actually, wouldn't this be better if this was just a link to the hash in the
> /boot/xilinx-prebuilt directory?

I don't think so: the purpose of the per-board hash files is so that the
package can be updated without forcing the boards to be updated.

We want that the versions of "critical" packages be pinned in the
defconfig files, so that an update of the version be explicit: updating
the version should be done by someone that can test on the actual
hardware.

If you do the symlink as you suggest, then we'd have to bump the boards
exactly whjen the packag eis updated, or the version used by the
defconfigs would no longer be present in the hash file.

Regards,
Yann E. MORIN.

> Also, if you are the one who applies the xilinx-source patch set, could you
> make sure to do the same thing with the hash file for the xilinx-source
> package?
> 
> https://patchwork.ozlabs.org/project/buildroot/patch/20240618074922.3555070-1-neal.frager@amd.com/
> 
> Best regards,
> Neal Frager
> AMD
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] board/xilinx: re-add hash file for xilinx-prebuilt

[Yann E. MORIN]

All,

On 2024-06-16 09:08 +0200, Yann E. MORIN spake thusly:
> When xilinx pre-built was added in a6648ad8da (boot/xilinx-prebuilt:
> new boot package), the hash file was initially a board-specific hash
> file. However, that hash file, in commit a6648ad8da, really belonged
> to the xilinx-prebuilt package, for two reasons: the package needs a
> hash file for the version it installs, and no defconfig was using it
> at that time. So the hash file was moved out of the boar directory,
> and into the package directory when the patch was applied.
> 
> When the xilinx-related boards were changed to use xilinx-prebuilt,  in
> 551ba16a0f (configs/zynqmp_*: migrate to xilinx-prebuilt) and 8271323649
> (configs/versal_vck190_defconfig: migrate to xilinx-prebuilt), they were
> correctly made to use a custom, non-default version. But then, it meant
> that those defconfig would no longer have a hash when we would bump the
> default version in xilinx-prebuilt.
> 
> Re-add the initial board-specific hash file now that it is required.
> 
> Fixes: 551ba16a0f09fe550acb3ef6d12a1b2587d03292
> Fixes: 8271323649c42420adaf4513b0472a7203f7784d
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Neal Frager <neal.frager@amd.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash | 2 ++
>  1 file changed, 2 insertions(+)
>  create mode 100644 board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> 
> diff --git a/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> new file mode 100644
> index 0000000000..c955cd79f5
> --- /dev/null
> +++ b/board/xilinx/patches/xilinx-prebuilt/xilinx-prebuilt.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f  xilinx-prebuilt-xilinx_v2024.1.tar.gz
> -- 
> 2.45.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot