From 51b0abae52343d91ab573db6f5cecabf0ecc5a74 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 29 Mar 2025 03:53:58 +0000 Subject: [PATCH] uboot-tools: dumpimage: get rid of libopenssl dependency Get rid of of dependency on libopenssl and refresh patches. Signed-off-by: Daniel Golle --- package/boot/uboot-tools/Makefile | 4 +-- ...003-tools-dumpimage-disable-kwbimage.patch | 32 ------------------- ...3-tools-dumpimage-fix-tools-compile.patch} | 5 +-- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/boot/uboot-tools/patches/003-tools-dumpimage-disable-kwbimage.patch rename package/boot/uboot-tools/patches/{004-tools-dumpimage-fix-tools-compile.patch => 003-tools-dumpimage-fix-tools-compile.patch} (93%) diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile index dd43c65e5cd..6861a70d7a9 100644 --- a/package/boot/uboot-tools/Makefile +++ b/package/boot/uboot-tools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_DISTNAME:=u-boot PKG_VERSION:=2025.01 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -26,7 +26,6 @@ define Package/dumpimage SECTION:=utils CATEGORY:=Utilities SUBMENU:=Boot Loaders - DEPENDS := +libopenssl TITLE:=dumpimage lists and extracts data from U-Boot images. URL:=http://www.denx.de/wiki/U-Boot endef @@ -62,6 +61,7 @@ define Build/Configure $(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 + $(SED) 's/CONFIG_TOOLS_KWBIMAGE=y/# CONFIG_TOOLS_KWBIMAGE is not set/' $(PKG_BUILD_DIR)/.config endef MAKE_FLAGS += \ diff --git a/package/boot/uboot-tools/patches/003-tools-dumpimage-disable-kwbimage.patch b/package/boot/uboot-tools/patches/003-tools-dumpimage-disable-kwbimage.patch deleted file mode 100644 index 4af6510c44b..00000000000 --- a/package/boot/uboot-tools/patches/003-tools-dumpimage-disable-kwbimage.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/package/boot/u-boot-tools/patches/0001-tools-disable-kwbimage.patch b/package/boot/u-boot-tools/patches/0001-tools-disable-kwbimage.patch -new file mode 100644 -index 0000000000..69a42ec383 ---- /dev/null -+++ b/package/boot/u-boot-tools/patches/0001-tools-disable-kwbimage.patch -@@ -0,0 +1,25 @@ -+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -+Date: Tue, 30 Nov 2021 11:29:19 +0100 -+Subject: [PATCH] tools: disable kwbimage -+MIME-Version: 1.0 -+Content-Type: text/plain; charset=UTF-8 -+Content-Transfer-Encoding: 8bit -+ -+Without CONFIG_TOOLS_LIBCRYPTO kwbimage doesn't compile because of -+multiple "undefined reference"s to SSL functions. -+ -+Signed-off-by: Rafał Miłecki -+--- -+ tools/Makefile | 1 - -+ 1 file changed, 1 deletion(-) -+ -+--- a/tools/Makefile -++++ b/tools/Makefile -+@@ -117,7 +117,6 @@ dumpimage-mkimage-objs := aisimage.o \ -+ imximage.o \ -+ imx8image.o \ -+ imx8mimage.o \ -+- kwbimage.o \ -+ lib/md5.o \ -+ lpc32xximage.o \ -+ mxsimage.o \ - diff --git a/package/boot/uboot-tools/patches/004-tools-dumpimage-fix-tools-compile.patch b/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch similarity index 93% rename from package/boot/uboot-tools/patches/004-tools-dumpimage-fix-tools-compile.patch rename to package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch index ab2e817b57c..a296fd234e8 100644 --- a/package/boot/uboot-tools/patches/004-tools-dumpimage-fix-tools-compile.patch +++ b/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch @@ -17,8 +17,6 @@ Signed-off-by: Scott Mercer tools/Makefile | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) -diff --git a/tools/Makefile b/tools/Makefile -index ee08a9675df8..a72b7909a066 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -22,6 +22,26 @@ @@ -68,7 +66,7 @@ index ee08a9675df8..a72b7909a066 100644 mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o HOSTLDLIBS_mkfwumdata += -luuid -@@ -313,10 +328,9 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ +@@ -313,10 +328,9 @@ HOST_EXTRACFLAGS += -include $(srctree)/ -I$(srctree)/scripts/dtc/libfdt \ -I$(srctree)/tools \ -DUSE_HOSTCC \ @@ -81,4 +79,3 @@ index ee08a9675df8..a72b7909a066 100644 $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ -