Commit graph

13 commits

Author SHA1 Message Date
Shiji Yang
9dc4128e03 uboot-tools: update to v2025.07
Update to the latest version.

Remove upstreamed patches:
  010-image-fit-sig-skip-in-tools-build-if-key-is-missing.patch[1]
  011-tools-fit_check_sign-make-key-optional.patch[2]
  012-tools-fit_check_sign-no-libcrypto.patch[2]

[1] 40dcd5088b
[2] 9c79c8fe70

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19342
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2025-07-12 16:37:49 +02:00
Mario Andrés Pérez
dc80e69801 uboot-envtools: set nonshared flag correctly per-subpackage
Currently, uboot-envtools is being built for a (shared) instruction
set (phase2 in buildbots) instead of target-specific (phase1 in builbots).
So the package does not contain the uci-defaults file specific for each
target_subtarget. (Only the fortunate target with coincidentally the same
instruction set and target as the SDK chosen by the buildbot will have the
uci-defaults file.)

This commit sets the nonshared flag correctly in the Makefile so that
uboot-envtools is built for the target-specific (phase 1).

This is done by using the PKGFLAGS variable which is intended for
per-binary flags (instead of PKG_FLAGS which has a global scope), as
stated in some old commits 349e7b635e[1], 2d7eaf2e15[2], 064e7c8f00[3] and
2cb75cd8b9[4].

While at here, use PKG_URL, instead of URL, which is intended for global
scope. As stated in commit e32edf712b[5].

[1] 349e7b635e
[2] 2d7eaf2e15
[3] 064e7c8f00
[4] 2cb75cd8b9
[5] e32edf712b

Fixes: #19040
Fixes: 46e376c ("uboot-tools: migrate uboot-envtools to uboot-tools")

Signed-off-by: Mario Andrés Pérez <mapb_@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19180
Signed-off-by: Robert Marko <robimarko@gmail.com>
2025-06-25 20:51:47 +02:00
Daniel Golle
27adf03f70 uboot-tools: validate all uImage.FIT sub-images
uImage.FIT validation was restricted to certain sub-image types
which is problematic as it then won't validate eg. 'filesystem' type
subimages. Also prevent decompressing sub-images into a arbitrary
sized buffer just to then free that buffer -- there is not need to
do this and creating malicious compressed payloads which overflow the
buffer is too easy.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2025-04-24 06:43:59 +01:00
Robert Marko
ffaaae4320 uboot-tools: remove uneeded syncconfig
During envtools conversion to the generic uboot-tools package, a syncconfig
call was added to the configure step which was previously not there.

We received multiple spourious reports that now envtools were failing to
build [1], but it was not reproducible.

However, it seems that this could easily be reproduced on MacOS 15 and
somehow that syncconfig call is breaking build by Makefile.autoconf not
being executed and thus no "include/config.h" is generated.

So, since this call was not previously there and U-Boot will actually do
syncconfig on its own when needed lets drop it.

[1] 293d5f1366 (commitcomment-154347516)

Link: https://github.com/openwrt/openwrt/pull/18515
Signed-off-by: Robert Marko <robimarko@gmail.com>
2025-04-18 13:22:12 +02:00
Robert Marko
e6c6351976 uboot-tools: Honor the global verbose flag
Look for OPENWRT_VERBOSE and pass it down to the U-Boot so we actually
get verbose build info when needed for debugging.

Link: https://github.com/openwrt/openwrt/pull/18515
Signed-off-by: Robert Marko <robimarko@gmail.com>
2025-04-18 13:22:12 +02:00
Daniel Golle
390e00355e uboot-tools: add fit-check-sign package
Add fit-check-sign package which allows validating a uImage.FIT.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2025-03-30 16:47:37 +01:00
Daniel Golle
51b0abae52 uboot-tools: dumpimage: get rid of libopenssl dependency
Get rid of of dependency on libopenssl and refresh patches.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2025-03-30 16:47:37 +01:00
Robert Marko
293d5f1366 uboot-tools: dont build tools unconditionally
Currently, both envtools and the rest of U-Boot tools are being built
regardless if the dumpimage package has been selected.

This will fail if only envtools are selected since the rest of tools
require OpenSSL while envtools do not require them.

So, only build tools if dumpimage is selected.

Fixes: 46e376c935 ("uboot-tools: migrate uboot-envtools to uboot-tools")
Fixes: #18327
Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://github.com/openwrt/openwrt/pull/18329
Signed-off-by: Robert Marko <robimarko@gmail.com>
2025-03-24 18:43:44 +01:00
Robert Marko
755108ef43 uboot-tools: remove uboot-tools definition
This is completely unused and not even registered, so drop it.

Link: https://github.com/openwrt/openwrt/pull/18329
Signed-off-by: Robert Marko <robimarko@gmail.com>
2025-03-24 18:43:44 +01:00
Felix Fietkau
f482f6d98e uboot-tools: disable python build to fix build error
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2025-03-24 12:05:16 +01:00
Scott Mercer
635be2a329 uboot-tools: create dumpimage package
Ddd dumpimage package to uboot-tools.
Add patches to fix compile for uboot versions >= 2024.01

Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
2025-03-22 13:19:14 +00:00
Scott Mercer
46e376c935 uboot-tools: migrate uboot-envtools to uboot-tools
Generalize and merge uboot-envtools package into uboot-tools package.
Remove existing uboot-envtools package.

Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
2025-03-22 13:18:09 +00:00
Scott Mercer
96cb1c8840 uboot-tools: add stub package skeleton
Add uboot-tools stub package skeleton which will replace uboot-envtools
and also provide target-builds for other U-Boot tools.

Signed-off-by: Scott Mercer <TheRootEd24@gmail.com>
2025-03-22 13:17:26 +00:00