diff options
| author | Robert Marko | 2025-03-23 09:29:28 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-03-24 17:43:44 +0000 |
| commit | 293d5f1366e099cc343a3fc8a6f936ab27bcad6a (patch) | |
| tree | b7c7f6484227ec7b35b156947db9502ee917972e | |
| parent | 755108ef43ebaf4f58de7ab55308bcd63145d876 (diff) | |
| download | openwrt-293d5f1366e099cc343a3fc8a6f936ab27bcad6a.tar.gz | |
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: 46e376c93514 ("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>
| -rw-r--r-- | package/boot/uboot-tools/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile index 54b4647d24..dd43c65e5c 100644 --- a/package/boot/uboot-tools/Makefile +++ b/package/boot/uboot-tools/Makefile @@ -59,8 +59,8 @@ define Package/uboot-envtools/conffiles endef define Build/Configure - $(MAKE) -C $(PKG_BUILD_DIR) tools-only_defconfig - $(MAKE) -C $(PKG_BUILD_DIR) syncconfig + $(call Build/Compile/Default,tools-only_defconfig) + $(call Build/Compile/Default,syncconfig) $(SED) 's/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/' $(PKG_BUILD_DIR)/.config endef @@ -71,8 +71,14 @@ MAKE_FLAGS += \ NO_PYTHON=1 define Build/Compile + +ifneq ($(CONFIG_PACKAGE_uboot-envtools),) $(call Build/Compile/Default,envtools) +endif +ifneq ($(CONFIG_PACKAGE_dumpimage),) $(call Build/Compile/Default,cross_tools) +endif + endef define Package/dumpimage/install |