From: Daniel Golle Date: Sat, 29 Mar 2025 03:53:58 +0000 (+0000) Subject: uboot-tools: dumpimage: get rid of libopenssl dependency X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=51b0abae52343d91ab573db6f5cecabf0ecc5a74;p=openwrt%2Fstaging%2Fsvanheule.git uboot-tools: dumpimage: get rid of libopenssl dependency Get rid of of dependency on libopenssl and refresh patches. Signed-off-by: Daniel Golle --- diff --git a/package/boot/uboot-tools/Makefile b/package/boot/uboot-tools/Makefile index dd43c65e5c..6861a70d7a 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 4af6510c44..0000000000 --- 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/003-tools-dumpimage-fix-tools-compile.patch b/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch new file mode 100644 index 0000000000..a296fd234e --- /dev/null +++ b/package/boot/uboot-tools/patches/003-tools-dumpimage-fix-tools-compile.patch @@ -0,0 +1,81 @@ +From 1ceffec2523888b4701405b7cf1710489e17011a Mon Sep 17 00:00:00 2001 +From: Scott Mercer +Date: Wed, 19 Mar 2025 06:31:44 -0400 +Subject: [PATCH] ipq50xx: packages: dumpimage: fix compile patch + +This patch is to fix compilation for uboot-tool V2025.01 in openwrt. + +* same "compile for enviroment patch" to makefile, that is used + in uboot-envtools. + +* remove mkeficapsule from build to avoid gnulib dependencies + +* disable bmp_logo from build to allow compilation + +Signed-off-by: Scott Mercer +--- + tools/Makefile | 38 ++++++++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 12 deletions(-) + +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -22,6 +22,26 @@ + # That's as long as the features of those tools aren't modified. + # + ++override HOSTCC = $(CC) ++ ++ifneq ($(TARGET_CFLAGS),) ++KBUILD_HOSTCFLAGS = $(TARGET_CFLAGS) ++endif ++ifneq ($(TARGET_LDFLAGS),) ++KBUILD_HOSTLDFLAGS = $(TARGET_LDFLAGS) ++endif ++ ++# Compile for a hosted environment on the target ++HOST_EXTRACFLAGS = -I$(srctree)/tools \ ++ $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ ++ -idirafter $(srctree)/tools/env \ ++ -DUSE_HOSTCC \ ++ -DTEXT_BASE=$(TEXT_BASE) ++ ++ifeq ($(MTD_VERSION),old) ++HOST_EXTRACFLAGS += -DMTD_OLD ++endif ++ + # Enable all the config-independent tools + ifneq ($(HOST_TOOLS_ALL),) + CONFIG_ARCH_KIRKWOOD = y +@@ -244,15 +264,10 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs + hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler + HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include + +-HOSTCFLAGS_mkeficapsule.o += \ +- $(shell pkg-config --cflags gnutls 2> /dev/null || echo "") +-HOSTLDLIBS_mkeficapsule += \ +- $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls") +-mkeficapsule-objs := generated/lib/uuid.o \ +- generated/lib/sha1.o \ +- $(LIBFDT_OBJS) \ +- mkeficapsule.o +-hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule ++HOSTCFLAGS_mkeficapsule.o += ++HOSTLDLIBS_mkeficapsule += ++mkeficapsule-objs := ++hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += + + mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o + HOSTLDLIBS_mkfwumdata += -luuid +@@ -313,10 +328,9 @@ HOST_EXTRACFLAGS += -include $(srctree)/ + -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ +- -D__KERNEL_STRICT_NAMES \ +- -D_GNU_SOURCE ++ -D__KERNEL_STRICT_NAMES + +-__build: $(LOGO-y) ++__build: $(LOGO-n) + + $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) + $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ diff --git a/package/boot/uboot-tools/patches/004-tools-dumpimage-fix-tools-compile.patch b/package/boot/uboot-tools/patches/004-tools-dumpimage-fix-tools-compile.patch deleted file mode 100644 index ab2e817b57..0000000000 --- a/package/boot/uboot-tools/patches/004-tools-dumpimage-fix-tools-compile.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 1ceffec2523888b4701405b7cf1710489e17011a Mon Sep 17 00:00:00 2001 -From: Scott Mercer -Date: Wed, 19 Mar 2025 06:31:44 -0400 -Subject: [PATCH] ipq50xx: packages: dumpimage: fix compile patch - -This patch is to fix compilation for uboot-tool V2025.01 in openwrt. - -* same "compile for enviroment patch" to makefile, that is used - in uboot-envtools. - -* remove mkeficapsule from build to avoid gnulib dependencies - -* disable bmp_logo from build to allow compilation - -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 @@ - # That's as long as the features of those tools aren't modified. - # - -+override HOSTCC = $(CC) -+ -+ifneq ($(TARGET_CFLAGS),) -+KBUILD_HOSTCFLAGS = $(TARGET_CFLAGS) -+endif -+ifneq ($(TARGET_LDFLAGS),) -+KBUILD_HOSTLDFLAGS = $(TARGET_LDFLAGS) -+endif -+ -+# Compile for a hosted environment on the target -+HOST_EXTRACFLAGS = -I$(srctree)/tools \ -+ $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -+ -idirafter $(srctree)/tools/env \ -+ -DUSE_HOSTCC \ -+ -DTEXT_BASE=$(TEXT_BASE) -+ -+ifeq ($(MTD_VERSION),old) -+HOST_EXTRACFLAGS += -DMTD_OLD -+endif -+ - # Enable all the config-independent tools - ifneq ($(HOST_TOOLS_ALL),) - CONFIG_ARCH_KIRKWOOD = y -@@ -244,15 +264,10 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs - hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler - HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include - --HOSTCFLAGS_mkeficapsule.o += \ -- $(shell pkg-config --cflags gnutls 2> /dev/null || echo "") --HOSTLDLIBS_mkeficapsule += \ -- $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls") --mkeficapsule-objs := generated/lib/uuid.o \ -- generated/lib/sha1.o \ -- $(LIBFDT_OBJS) \ -- mkeficapsule.o --hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule -+HOSTCFLAGS_mkeficapsule.o += -+HOSTLDLIBS_mkeficapsule += -+mkeficapsule-objs := -+hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += - - mkfwumdata-objs := mkfwumdata.o generated/lib/crc32.o - HOSTLDLIBS_mkfwumdata += -luuid -@@ -313,10 +328,9 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ - -I$(srctree)/scripts/dtc/libfdt \ - -I$(srctree)/tools \ - -DUSE_HOSTCC \ -- -D__KERNEL_STRICT_NAMES \ -- -D_GNU_SOURCE -+ -D__KERNEL_STRICT_NAMES - --__build: $(LOGO-y) -+__build: $(LOGO-n) - - $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) - $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ -