* [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github.
@ 2022-08-26 13:35 Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 2/3] u-boot: Add two new u-boot image targets Christian Melki
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Christian Melki @ 2022-08-26 13:35 UTC (permalink / raw)
To: ptxdist
* Make URL configurable. Also. This aids in pointing
ptxdist to various vendor specific releases.
* Make compression format .tar.gz. Default
github contains such releases for really old releases,
so it should be fine.
* Bump default version to something more recent.
Just cosmetics really.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
platforms/u-boot.in | 11 +++++++++--
rules/u-boot.make | 4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/platforms/u-boot.in b/platforms/u-boot.in
index 769237081..8c7931d13 100644
--- a/platforms/u-boot.in
+++ b/platforms/u-boot.in
@@ -9,13 +9,20 @@ menuconfig U_BOOT
if U_BOOT
+config U_BOOT_URL
+ string
+ default "https://github.com/u-boot/u-boot/releases/tag"
+ prompt "U-Boot URL"
+ help
+ Enter the U-Boot URL you want to use.
+
config U_BOOT_VERSION
string
- default "2019.01"
+ default "v2022.01"
prompt "U-Boot version"
help
Enter the U-Boot version you want to build. Usually something like
- "2019.01".
+ "v2022.01".
config U_BOOT_MD5
string
diff --git a/rules/u-boot.make b/rules/u-boot.make
index cadca4a6b..1ba6d47b0 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot
U_BOOT_VERSION := $(call ptx/config-version, PTXCONF_U_BOOT)
U_BOOT_MD5 := $(call ptx/config-md5, PTXCONF_U_BOOT)
U_BOOT := u-boot-$(U_BOOT_VERSION)
-U_BOOT_SUFFIX := tar.bz2
-U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
+U_BOOT_SUFFIX := tar.gz
+U_BOOT_URL := $(PTXCONF_U_BOOT_URL)/$(U_BOOT_VERSION).$(U_BOOT_SUFFIX)
U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,-build)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 2/3] u-boot: Add two new u-boot image targets.
2022-08-26 13:35 [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Christian Melki
@ 2022-08-26 13:35 ` Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install Christian Melki
2022-08-29 8:49 ` [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Alexander Dahl
2 siblings, 0 replies; 10+ messages in thread
From: Christian Melki @ 2022-08-26 13:35 UTC (permalink / raw)
To: ptxdist
YAUTI? Yet another u-boot target image.
These are needed. Because U-boot also has targets
that differentiate between oldschool u-boot.bin,
u-boot-dtb.bin (with dtb) and these two, when
dtbs are split out. u-boot.dtb and u-boot-nodtb.bin.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
platforms/u-boot.in | 12 ++++++++++++
rules/u-boot.make | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/platforms/u-boot.in b/platforms/u-boot.in
index 8c7931d13..1808283ca 100644
--- a/platforms/u-boot.in
+++ b/platforms/u-boot.in
@@ -185,6 +185,18 @@ config U_BOOT_INSTALL_U_BOOT_BIN
help
Installing the U-Boot default binary target.
+config U_BOOT_INSTALL_U_BOOT_NODTB
+ prompt "install u-boot-nodtb.bin"
+ bool
+ help
+ Installing the U-Boot default bin file without dtb.
+
+config U_BOOT_INSTALL_U_BOOT_ONLY_DTB
+ prompt "install u-boot.dtb"
+ bool
+ help
+ Installing the U-Boot default dtb file.
+
config U_BOOT_INSTALL_SREC
prompt "install u-boot.srec"
bool
diff --git a/rules/u-boot.make b/rules/u-boot.make
index 1ba6d47b0..0b632e8b2 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -145,6 +145,12 @@ $(STATEDIR)/u-boot.targetinstall:
ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_BIN
@$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.bin)
endif
+ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_ONLY_DTB
+ @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.dtb)
+endif
+ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_NODTB
+ @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot-nodtb.bin)
+endif
ifdef PTXCONF_U_BOOT_INSTALL_SREC
@$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.srec)
endif
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install.
2022-08-26 13:35 [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 2/3] u-boot: Add two new u-boot image targets Christian Melki
@ 2022-08-26 13:35 ` Christian Melki
2022-08-30 7:25 ` Michael Olbrich
2022-08-29 8:49 ` [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Alexander Dahl
2 siblings, 1 reply; 10+ messages in thread
From: Christian Melki @ 2022-08-26 13:35 UTC (permalink / raw)
To: ptxdist
This seems like a potential issue in several packages.
When signing u-boot images in tf-a, tf-a has u-boot as
a dependency. But u-boot doesn't install images to be processed
until targetinstall, which leads to problems.
Some things might be targetinstall. But resulting images destined
for the imagedir aren't really targetinstall unless
they are also copied to rootfs.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/u-boot.make | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/rules/u-boot.make b/rules/u-boot.make
index 0b632e8b2..bdbe03ffe 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -133,14 +133,7 @@ endif
$(STATEDIR)/u-boot.install:
@$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-$(STATEDIR)/u-boot.targetinstall:
- @$(call targetinfo)
@$(call world/image-clean, U_BOOT)
ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_BIN
@$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.bin)
@@ -194,6 +187,14 @@ ifndef PTXCONF_U_BOOT_ENV_IMAGE_NONE
@$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot-env.img)
endif
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/u-boot.targetinstall:
+ @$(call targetinfo)
ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
@$(call install_init, u-boot)
@$(call install_fixup, u-boot, PRIORITY, optional)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github.
2022-08-26 13:35 [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 2/3] u-boot: Add two new u-boot image targets Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install Christian Melki
@ 2022-08-29 8:49 ` Alexander Dahl
2022-08-29 16:57 ` Christian Melki
2 siblings, 1 reply; 10+ messages in thread
From: Alexander Dahl @ 2022-08-29 8:49 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl, Christian Melki
Hello Christian,
Am Freitag, 26. August 2022, 15:35:35 CEST schrieb Christian Melki:
> * Make URL configurable. Also. This aids in pointing
> ptxdist to various vendor specific releases.
> * Make compression format .tar.gz. Default
> github contains such releases for really old releases,
> so it should be fine.
> * Bump default version to something more recent.
> Just cosmetics really.
What's the motivation for moving this to a mirror of the official sources?
According to https://u-boot.readthedocs.io/en/latest/build/source.html the
main and official forge is https://source.denx.de/u-boot/u-boot and
additionally https://ftp.denx.de/pub/u-boot/ still contains all release
tarballs up to the most recent RCs. This is also mentioned in the README in
top level U-Boot source.
Greets
Alex
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> platforms/u-boot.in | 11 +++++++++--
> rules/u-boot.make | 4 ++--
> 2 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> index 769237081..8c7931d13 100644
> --- a/platforms/u-boot.in
> +++ b/platforms/u-boot.in
> @@ -9,13 +9,20 @@ menuconfig U_BOOT
>
> if U_BOOT
>
> +config U_BOOT_URL
> + string
> + default "https://github.com/u-boot/u-boot/releases/tag"
> + prompt "U-Boot URL"
> + help
> + Enter the U-Boot URL you want to use.
> +
> config U_BOOT_VERSION
> string
> - default "2019.01"
> + default "v2022.01"
> prompt "U-Boot version"
> help
> Enter the U-Boot version you want to build. Usually something like
> - "2019.01".
> + "v2022.01".
>
> config U_BOOT_MD5
> string
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index cadca4a6b..1ba6d47b0 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot
> U_BOOT_VERSION := $(call ptx/config-version, PTXCONF_U_BOOT)
> U_BOOT_MD5 := $(call ptx/config-md5, PTXCONF_U_BOOT)
> U_BOOT := u-boot-$(U_BOOT_VERSION)
> -U_BOOT_SUFFIX := tar.bz2
> -U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
> +U_BOOT_SUFFIX := tar.gz
> +U_BOOT_URL := $(PTXCONF_U_BOOT_URL)/$(U_BOOT_VERSION).$(U_BOOT_SUFFIX)
> U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
> U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
> U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef,
> PTXCONF_U_BOOT_BUILD_OOT,-build)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github.
2022-08-29 8:49 ` [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Alexander Dahl
@ 2022-08-29 16:57 ` Christian Melki
2022-08-30 7:23 ` Michael Olbrich
0 siblings, 1 reply; 10+ messages in thread
From: Christian Melki @ 2022-08-29 16:57 UTC (permalink / raw)
To: Alexander Dahl; +Cc: ptxdist
On 8/29/22 10:49, Alexander Dahl wrote:
> Hello Christian,
>
> Am Freitag, 26. August 2022, 15:35:35 CEST schrieb Christian Melki:
>> * Make URL configurable. Also. This aids in pointing
>> ptxdist to various vendor specific releases.
>> * Make compression format .tar.gz. Default
>> github contains such releases for really old releases,
>> so it should be fine.
>> * Bump default version to something more recent.
>> Just cosmetics really.
>
> What's the motivation for moving this to a mirror of the official sources?
> According to https://u-boot.readthedocs.io/en/latest/build/source.html the
> main and official forge is https://source.denx.de/u-boot/u-boot and
> additionally https://ftp.denx.de/pub/u-boot/ still contains all release
> tarballs up to the most recent RCs. This is also mentioned in the README in
> top level U-Boot source.
>
> Greets
> Alex
>
The point beeing similarity between various vendor releases and vanilla
u-boot releases. But since the URL is configurable.. whichever really.
Github API has the advantage of being able to tell you about new
releases, should such a tool ever be adapted to ptxdist.
I actually tried asking about github as an official source on irc, but
nobody cared to answer.
regards,
C
>>
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> platforms/u-boot.in | 11 +++++++++--
>> rules/u-boot.make | 4 ++--
>> 2 files changed, 11 insertions(+), 4 deletions(-)
>>
>> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
>> index 769237081..8c7931d13 100644
>> --- a/platforms/u-boot.in
>> +++ b/platforms/u-boot.in
>> @@ -9,13 +9,20 @@ menuconfig U_BOOT
>>
>> if U_BOOT
>>
>> +config U_BOOT_URL
>> + string
>> + default "https://github.com/u-boot/u-boot/releases/tag"
>> + prompt "U-Boot URL"
>> + help
>> + Enter the U-Boot URL you want to use.
>> +
>> config U_BOOT_VERSION
>> string
>> - default "2019.01"
>> + default "v2022.01"
>> prompt "U-Boot version"
>> help
>> Enter the U-Boot version you want to build. Usually something like
>> - "2019.01".
>> + "v2022.01".
>>
>> config U_BOOT_MD5
>> string
>> diff --git a/rules/u-boot.make b/rules/u-boot.make
>> index cadca4a6b..1ba6d47b0 100644
>> --- a/rules/u-boot.make
>> +++ b/rules/u-boot.make
>> @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot
>> U_BOOT_VERSION := $(call ptx/config-version, PTXCONF_U_BOOT)
>> U_BOOT_MD5 := $(call ptx/config-md5, PTXCONF_U_BOOT)
>> U_BOOT := u-boot-$(U_BOOT_VERSION)
>> -U_BOOT_SUFFIX := tar.bz2
>> -U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
>> +U_BOOT_SUFFIX := tar.gz
>> +U_BOOT_URL := $(PTXCONF_U_BOOT_URL)/$(U_BOOT_VERSION).$(U_BOOT_SUFFIX)
>> U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
>> U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
>> U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef,
>> PTXCONF_U_BOOT_BUILD_OOT,-build)
>
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github.
2022-08-29 16:57 ` Christian Melki
@ 2022-08-30 7:23 ` Michael Olbrich
2022-08-30 7:58 ` Christian Melki
2022-08-30 9:13 ` Alexander Dahl
0 siblings, 2 replies; 10+ messages in thread
From: Michael Olbrich @ 2022-08-30 7:23 UTC (permalink / raw)
To: Christian Melki; +Cc: Alexander Dahl, ptxdist
On Mon, Aug 29, 2022 at 06:57:03PM +0200, Christian Melki wrote:
> On 8/29/22 10:49, Alexander Dahl wrote:
> > Hello Christian,
> >
> > Am Freitag, 26. August 2022, 15:35:35 CEST schrieb Christian Melki:
> >> * Make URL configurable. Also. This aids in pointing
> >> ptxdist to various vendor specific releases.
> >> * Make compression format .tar.gz. Default
> >> github contains such releases for really old releases,
> >> so it should be fine.
> >> * Bump default version to something more recent.
> >> Just cosmetics really.
> >
> > What's the motivation for moving this to a mirror of the official sources?
> > According to https://u-boot.readthedocs.io/en/latest/build/source.html the
> > main and official forge is https://source.denx.de/u-boot/u-boot and
> > additionally https://ftp.denx.de/pub/u-boot/ still contains all release
> > tarballs up to the most recent RCs. This is also mentioned in the README in
> > top level U-Boot source.
> >
> > Greets
> > Alex
> >
>
> The point beeing similarity between various vendor releases and vanilla
> u-boot releases. But since the URL is configurable.. whichever really.
> Github API has the advantage of being able to tell you about new
> releases, should such a tool ever be adapted to ptxdist.
Nack. Our u-boot package is already complex enough. I don't want to support
whatever vendors do in their downstream repositories as well. Please create
a local new package for that. I would be happy to accept a patch for a
template to make this easier.
Michael
> I actually tried asking about github as an official source on irc, but
> nobody cared to answer.
>
> regards,
> C
>
> >>
> >> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> >> ---
> >> platforms/u-boot.in | 11 +++++++++--
> >> rules/u-boot.make | 4 ++--
> >> 2 files changed, 11 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> >> index 769237081..8c7931d13 100644
> >> --- a/platforms/u-boot.in
> >> +++ b/platforms/u-boot.in
> >> @@ -9,13 +9,20 @@ menuconfig U_BOOT
> >>
> >> if U_BOOT
> >>
> >> +config U_BOOT_URL
> >> + string
> >> + default "https://github.com/u-boot/u-boot/releases/tag"
> >> + prompt "U-Boot URL"
> >> + help
> >> + Enter the U-Boot URL you want to use.
> >> +
> >> config U_BOOT_VERSION
> >> string
> >> - default "2019.01"
> >> + default "v2022.01"
> >> prompt "U-Boot version"
> >> help
> >> Enter the U-Boot version you want to build. Usually something like
> >> - "2019.01".
> >> + "v2022.01".
> >>
> >> config U_BOOT_MD5
> >> string
> >> diff --git a/rules/u-boot.make b/rules/u-boot.make
> >> index cadca4a6b..1ba6d47b0 100644
> >> --- a/rules/u-boot.make
> >> +++ b/rules/u-boot.make
> >> @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot
> >> U_BOOT_VERSION := $(call ptx/config-version, PTXCONF_U_BOOT)
> >> U_BOOT_MD5 := $(call ptx/config-md5, PTXCONF_U_BOOT)
> >> U_BOOT := u-boot-$(U_BOOT_VERSION)
> >> -U_BOOT_SUFFIX := tar.bz2
> >> -U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
> >> +U_BOOT_SUFFIX := tar.gz
> >> +U_BOOT_URL := $(PTXCONF_U_BOOT_URL)/$(U_BOOT_VERSION).$(U_BOOT_SUFFIX)
> >> U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
> >> U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
> >> U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef,
> >> PTXCONF_U_BOOT_BUILD_OOT,-build)
> >
> >
> >
> >
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install.
2022-08-26 13:35 ` [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install Christian Melki
@ 2022-08-30 7:25 ` Michael Olbrich
2022-08-30 7:41 ` Christian Melki
0 siblings, 1 reply; 10+ messages in thread
From: Michael Olbrich @ 2022-08-30 7:25 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Fri, Aug 26, 2022 at 03:35:37PM +0200, Christian Melki wrote:
> This seems like a potential issue in several packages.
> When signing u-boot images in tf-a, tf-a has u-boot as
> a dependency. But u-boot doesn't install images to be processed
> until targetinstall, which leads to problems.
>
> Some things might be targetinstall. But resulting images destined
> for the imagedir aren't really targetinstall unless
> they are also copied to rootfs.
This is broken. 'ptxdist clean root' will remove the files from images/ and
then only targetinstall is executed. So the files won't be copied again.
If other packages need those files, then they must be copied to
$(U_BOOT_PKGDIR) in the install stage.
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> rules/u-boot.make | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index 0b632e8b2..bdbe03ffe 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -133,14 +133,7 @@ endif
>
> $(STATEDIR)/u-boot.install:
> @$(call targetinfo)
> - @$(call touch)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
>
> -$(STATEDIR)/u-boot.targetinstall:
> - @$(call targetinfo)
> @$(call world/image-clean, U_BOOT)
> ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_BIN
> @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.bin)
> @@ -194,6 +187,14 @@ ifndef PTXCONF_U_BOOT_ENV_IMAGE_NONE
> @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot-env.img)
> endif
>
> + @$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/u-boot.targetinstall:
> + @$(call targetinfo)
> ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
> @$(call install_init, u-boot)
> @$(call install_fixup, u-boot, PRIORITY, optional)
> --
> 2.34.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install.
2022-08-30 7:25 ` Michael Olbrich
@ 2022-08-30 7:41 ` Christian Melki
0 siblings, 0 replies; 10+ messages in thread
From: Christian Melki @ 2022-08-30 7:41 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
On 8/30/22 9:25 AM, Michael Olbrich wrote:
> On Fri, Aug 26, 2022 at 03:35:37PM +0200, Christian Melki wrote:
>> This seems like a potential issue in several packages.
>> When signing u-boot images in tf-a, tf-a has u-boot as
>> a dependency. But u-boot doesn't install images to be processed
>> until targetinstall, which leads to problems.
>>
>> Some things might be targetinstall. But resulting images destined
>> for the imagedir aren't really targetinstall unless
>> they are also copied to rootfs.
>
> This is broken. 'ptxdist clean root' will remove the files from images/ and
> then only targetinstall is executed. So the files won't be copied again.
>
> If other packages need those files, then they must be copied to
> $(U_BOOT_PKGDIR) in the install stage.
>
> Michael
>
Hmm. Not sure how that is supposed to work?
Do you mean that they need to be copied to pkgdir as well
as imagedir?
install:
-> pkgdir
-> imagedir
targetinstall:
pkgdir -> imagedir
?
/C
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> rules/u-boot.make | 15 ++++++++-------
>> 1 file changed, 8 insertions(+), 7 deletions(-)
>>
>> diff --git a/rules/u-boot.make b/rules/u-boot.make
>> index 0b632e8b2..bdbe03ffe 100644
>> --- a/rules/u-boot.make
>> +++ b/rules/u-boot.make
>> @@ -133,14 +133,7 @@ endif
>>
>> $(STATEDIR)/u-boot.install:
>> @$(call targetinfo)
>> - @$(call touch)
>> -
>> -# ----------------------------------------------------------------------------
>> -# Target-Install
>> -# ----------------------------------------------------------------------------
>>
>> -$(STATEDIR)/u-boot.targetinstall:
>> - @$(call targetinfo)
>> @$(call world/image-clean, U_BOOT)
>> ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_BIN
>> @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot.bin)
>> @@ -194,6 +187,14 @@ ifndef PTXCONF_U_BOOT_ENV_IMAGE_NONE
>> @$(call ptx/image-install, U_BOOT, $(U_BOOT_BUILD_DIR)/u-boot-env.img)
>> endif
>>
>> + @$(call touch)
>> +
>> +# ----------------------------------------------------------------------------
>> +# Target-Install
>> +# ----------------------------------------------------------------------------
>> +
>> +$(STATEDIR)/u-boot.targetinstall:
>> + @$(call targetinfo)
>> ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
>> @$(call install_init, u-boot)
>> @$(call install_fixup, u-boot, PRIORITY, optional)
>> --
>> 2.34.1
>>
>>
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github.
2022-08-30 7:23 ` Michael Olbrich
@ 2022-08-30 7:58 ` Christian Melki
2022-08-30 9:13 ` Alexander Dahl
1 sibling, 0 replies; 10+ messages in thread
From: Christian Melki @ 2022-08-30 7:58 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
On 8/30/22 9:23 AM, Michael Olbrich wrote:
> On Mon, Aug 29, 2022 at 06:57:03PM +0200, Christian Melki wrote:
>> On 8/29/22 10:49, Alexander Dahl wrote:
>>> Hello Christian,
>>>
>>> Am Freitag, 26. August 2022, 15:35:35 CEST schrieb Christian Melki:
>>>> * Make URL configurable. Also. This aids in pointing
>>>> ptxdist to various vendor specific releases.
>>>> * Make compression format .tar.gz. Default
>>>> github contains such releases for really old releases,
>>>> so it should be fine.
>>>> * Bump default version to something more recent.
>>>> Just cosmetics really.
>>>
>>> What's the motivation for moving this to a mirror of the official sources?
>>> According to https://u-boot.readthedocs.io/en/latest/build/source.html the
>>> main and official forge is https://source.denx.de/u-boot/u-boot and
>>> additionally https://ftp.denx.de/pub/u-boot/ still contains all release
>>> tarballs up to the most recent RCs. This is also mentioned in the README in
>>> top level U-Boot source.
>>>
>>> Greets
>>> Alex
>>>
>>
>> The point beeing similarity between various vendor releases and vanilla
>> u-boot releases. But since the URL is configurable.. whichever really.
>> Github API has the advantage of being able to tell you about new
>> releases, should such a tool ever be adapted to ptxdist.
>
> Nack. Our u-boot package is already complex enough. I don't want to support
> whatever vendors do in their downstream repositories as well. Please create
> a local new package for that. I would be happy to accept a patch for a
> template to make this easier.
>
> Michael
>
I understand, but don't agree.
Whatever board you take nowdays you'll almost always get pointers
to vendor repos for some or all of the platform bits.
So external repos is often the same usual suspects.
kernel, bootloaders, tf-a, op-tee etc. Platform bits.
80-90% of the time, the ptxdist handling is fine, but needs another url.
Not being able to point ptxdist there is a bit annoying.
Duplicating complex platform handling just for url changing is also annoying.
Yes. I can copy the tarball, name them as vanilla like, place them locally
and add even more confusion. But I prefer being able to tell that this is not a vanilla URL.
Rant mode off. :)
/C
>> I actually tried asking about github as an official source on irc, but
>> nobody cared to answer.
>>
>> regards,
>> C
>>
>>>>
>>>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>>>> ---
>>>> platforms/u-boot.in | 11 +++++++++--
>>>> rules/u-boot.make | 4 ++--
>>>> 2 files changed, 11 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
>>>> index 769237081..8c7931d13 100644
>>>> --- a/platforms/u-boot.in
>>>> +++ b/platforms/u-boot.in
>>>> @@ -9,13 +9,20 @@ menuconfig U_BOOT
>>>>
>>>> if U_BOOT
>>>>
>>>> +config U_BOOT_URL
>>>> + string
>>>> + default "https://github.com/u-boot/u-boot/releases/tag"
>>>> + prompt "U-Boot URL"
>>>> + help
>>>> + Enter the U-Boot URL you want to use.
>>>> +
>>>> config U_BOOT_VERSION
>>>> string
>>>> - default "2019.01"
>>>> + default "v2022.01"
>>>> prompt "U-Boot version"
>>>> help
>>>> Enter the U-Boot version you want to build. Usually something like
>>>> - "2019.01".
>>>> + "v2022.01".
>>>>
>>>> config U_BOOT_MD5
>>>> string
>>>> diff --git a/rules/u-boot.make b/rules/u-boot.make
>>>> index cadca4a6b..1ba6d47b0 100644
>>>> --- a/rules/u-boot.make
>>>> +++ b/rules/u-boot.make
>>>> @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot
>>>> U_BOOT_VERSION := $(call ptx/config-version, PTXCONF_U_BOOT)
>>>> U_BOOT_MD5 := $(call ptx/config-md5, PTXCONF_U_BOOT)
>>>> U_BOOT := u-boot-$(U_BOOT_VERSION)
>>>> -U_BOOT_SUFFIX := tar.bz2
>>>> -U_BOOT_URL := https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
>>>> +U_BOOT_SUFFIX := tar.gz
>>>> +U_BOOT_URL := $(PTXCONF_U_BOOT_URL)/$(U_BOOT_VERSION).$(U_BOOT_SUFFIX)
>>>> U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
>>>> U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
>>>> U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef,
>>>> PTXCONF_U_BOOT_BUILD_OOT,-build)
>>>
>>>
>>>
>>>
>>
>>
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github.
2022-08-30 7:23 ` Michael Olbrich
2022-08-30 7:58 ` Christian Melki
@ 2022-08-30 9:13 ` Alexander Dahl
1 sibling, 0 replies; 10+ messages in thread
From: Alexander Dahl @ 2022-08-30 9:13 UTC (permalink / raw)
To: Michael Olbrich; +Cc: Christian Melki, ptxdist
Hei hei,
Am Dienstag, 30. August 2022, 09:23:24 CEST schrieb Michael Olbrich:
> On Mon, Aug 29, 2022 at 06:57:03PM +0200, Christian Melki wrote:
> > On 8/29/22 10:49, Alexander Dahl wrote:
> > > Hello Christian,
> > >
> > > Am Freitag, 26. August 2022, 15:35:35 CEST schrieb Christian Melki:
> > >> * Make URL configurable. Also. This aids in pointing
> > >> ptxdist to various vendor specific releases.
> > >> * Make compression format .tar.gz. Default
> > >> github contains such releases for really old releases,
> > >> so it should be fine.
> > >> * Bump default version to something more recent.
> > >> Just cosmetics really.
> > >
> > > What's the motivation for moving this to a mirror of the official
> > > sources?
> > > According to https://u-boot.readthedocs.io/en/latest/build/source.html
> > > the
> > > main and official forge is https://source.denx.de/u-boot/u-boot and
> > > additionally https://ftp.denx.de/pub/u-boot/ still contains all release
> > > tarballs up to the most recent RCs. This is also mentioned in the README
> > > in
> > > top level U-Boot source.
> > >
> > > Greets
> > > Alex
> >
> > The point beeing similarity between various vendor releases and vanilla
> > u-boot releases. But since the URL is configurable.. whichever really.
> > Github API has the advantage of being able to tell you about new
> > releases, should such a tool ever be adapted to ptxdist.
>
> Nack. Our u-boot package is already complex enough. I don't want to support
> whatever vendors do in their downstream repositories as well. Please create
> a local new package for that. I would be happy to accept a patch for a
> template to make this easier.
You might want to have a look at this (not merged) patch series again as a
starting point:
https://lore.ptxdist.org/ptxdist/20210826084842.21421-1-ada@thorsis.com/
Greets
Alex
>
> Michael
>
> > I actually tried asking about github as an official source on irc, but
> > nobody cared to answer.
> >
> > regards,
> > C
> >
> > >> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> > >> ---
> > >>
> > >> platforms/u-boot.in | 11 +++++++++--
> > >> rules/u-boot.make | 4 ++--
> > >> 2 files changed, 11 insertions(+), 4 deletions(-)
> > >>
> > >> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> > >> index 769237081..8c7931d13 100644
> > >> --- a/platforms/u-boot.in
> > >> +++ b/platforms/u-boot.in
> > >> @@ -9,13 +9,20 @@ menuconfig U_BOOT
> > >>
> > >> if U_BOOT
> > >>
> > >> +config U_BOOT_URL
> > >> + string
> > >> + default "https://github.com/u-boot/u-boot/releases/tag"
> > >> + prompt "U-Boot URL"
> > >> + help
> > >> + Enter the U-Boot URL you want to use.
> > >> +
> > >>
> > >> config U_BOOT_VERSION
> > >>
> > >> string
> > >>
> > >> - default "2019.01"
> > >> + default "v2022.01"
> > >>
> > >> prompt "U-Boot version"
> > >> help
> > >>
> > >> Enter the U-Boot version you want to build. Usually something like
> > >>
> > >> - "2019.01".
> > >> + "v2022.01".
> > >>
> > >> config U_BOOT_MD5
> > >>
> > >> string
> > >>
> > >> diff --git a/rules/u-boot.make b/rules/u-boot.make
> > >> index cadca4a6b..1ba6d47b0 100644
> > >> --- a/rules/u-boot.make
> > >> +++ b/rules/u-boot.make
> > >> @@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_U_BOOT) += u-boot
> > >>
> > >> U_BOOT_VERSION := $(call ptx/config-version, PTXCONF_U_BOOT)
> > >> U_BOOT_MD5 := $(call ptx/config-md5, PTXCONF_U_BOOT)
> > >> U_BOOT := u-boot-$(U_BOOT_VERSION)
> > >>
> > >> -U_BOOT_SUFFIX := tar.bz2
> > >> -U_BOOT_URL :=
> > >> https://ftp.denx.de/pub/u-boot/$(U_BOOT).$(U_BOOT_SUFFIX)
> > >> +U_BOOT_SUFFIX := tar.gz
> > >> +U_BOOT_URL :=
> > >> $(PTXCONF_U_BOOT_URL)/$(U_BOOT_VERSION).$(U_BOOT_SUFFIX)
> > >>
> > >> U_BOOT_SOURCE := $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
> > >> U_BOOT_DIR := $(BUILDDIR)/$(U_BOOT)
> > >> U_BOOT_BUILD_DIR := $(U_BOOT_DIR)$(call ptx/ifdef,
> > >>
> > >> PTXCONF_U_BOOT_BUILD_OOT,-build)
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-08-30 9:13 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-26 13:35 [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 2/3] u-boot: Add two new u-boot image targets Christian Melki
2022-08-26 13:35 ` [ptxdist] [PATCH 3/3] u-boot: Move image copying from targetinstall to install Christian Melki
2022-08-30 7:25 ` Michael Olbrich
2022-08-30 7:41 ` Christian Melki
2022-08-29 8:49 ` [ptxdist] [PATCH 1/3] u-boot: Move u-boot URL to github Alexander Dahl
2022-08-29 16:57 ` Christian Melki
2022-08-30 7:23 ` Michael Olbrich
2022-08-30 7:58 ` Christian Melki
2022-08-30 9:13 ` Alexander Dahl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox