developer | 23f9f0f | 2023-06-15 13:06:25 +0800 | [diff] [blame] | 1 | --- a/tools/libressl/Makefile |
| 2 | +++ b/tools/libressl/Makefile |
| 3 | @@ -8,8 +8,8 @@ |
| 4 | include $(TOPDIR)/rules.mk |
| 5 | |
| 6 | PKG_NAME:=libressl |
| 7 | -PKG_VERSION:=3.4.3 |
| 8 | -PKG_HASH:=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d |
| 9 | +PKG_VERSION:=3.5.3 |
| 10 | +PKG_HASH:=3ab5e5eaef69ce20c6b170ee64d785b42235f48f2e62b095fca5d7b6672b8b28 |
| 11 | PKG_RELEASE:=1 |
| 12 | |
| 13 | PKG_CPE_ID:=cpe:/a:openbsd:libressl |
| 14 | @@ -24,11 +24,14 @@ HOST_BUILD_PARALLEL:=1 |
| 15 | include $(INCLUDE_DIR)/host-build.mk |
| 16 | |
| 17 | HOSTCC := $(HOSTCC_NOCACHE) |
| 18 | -HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests |
| 19 | + |
| 20 | HOST_CFLAGS += $(HOST_FPIC) |
| 21 | |
| 22 | -ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32) |
| 23 | -HOST_CONFIGURE_ARGS += --disable-asm |
| 24 | -endif |
| 25 | +HOST_CONFIGURE_ARGS += \ |
| 26 | + --enable-static \ |
| 27 | + --disable-shared \ |
| 28 | + --disable-asm \ |
| 29 | + --with-pic \ |
| 30 | + --disable-tests |
| 31 | |
| 32 | $(eval $(call HostBuild)) |
| 33 | --- a/tools/Makefile |
| 34 | +++ b/tools/Makefile |
| 35 | @@ -59,7 +59,7 @@ $(curdir)/libtool/compile := $(curdir)/m |
| 36 | $(curdir)/lzma-old/compile := $(curdir)/zlib/compile |
| 37 | $(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile |
| 38 | $(curdir)/missing-macros/compile := $(curdir)/autoconf/compile |
| 39 | -$(curdir)/mkimage/compile += $(curdir)/libressl/compile |
| 40 | +$(curdir)/mkimage/compile += $(curdir)/bison/compile $(curdir)/libressl/compile |
| 41 | $(curdir)/mklibs/compile := $(curdir)/libtool/compile |
| 42 | $(curdir)/mm-macros/compile := $(curdir)/libtool/compile |
| 43 | $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile |
| 44 | --- a/tools/mkimage/Makefile |
| 45 | +++ b/tools/mkimage/Makefile |
| 46 | @@ -7,36 +7,36 @@ |
| 47 | include $(TOPDIR)/rules.mk |
| 48 | |
| 49 | PKG_NAME:=mkimage |
| 50 | -PKG_VERSION:=2021.01 |
| 51 | +PKG_VERSION:=2022.07 |
| 52 | |
| 53 | PKG_SOURCE:=u-boot-$(PKG_VERSION).tar.bz2 |
| 54 | PKG_SOURCE_URL:= \ |
| 55 | https://mirror.cyberbits.eu/u-boot \ |
| 56 | https://ftp.denx.de/pub/u-boot \ |
| 57 | ftp://ftp.denx.de/pub/u-boot |
| 58 | -PKG_HASH:=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 |
| 59 | +PKG_HASH:=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e |
| 60 | |
| 61 | HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/u-boot-$(PKG_VERSION) |
| 62 | |
| 63 | include $(INCLUDE_DIR)/host-build.mk |
| 64 | |
| 65 | -define Host/Prepare |
| 66 | - $(Host/Prepare/Default) |
| 67 | - mkdir -p $(HOST_BUILD_DIR)/include/config |
| 68 | - touch $(HOST_BUILD_DIR)/include/config/auto.conf |
| 69 | - mkdir -p $(HOST_BUILD_DIR)/include/generated/ |
| 70 | - touch $(HOST_BUILD_DIR)/include/generated/autoconf.h |
| 71 | +define Host/Configure |
| 72 | + $(MAKE) -C $(HOST_BUILD_DIR) \ |
| 73 | + HOSTCFLAGS="$(HOST_CFLAGS)" \ |
| 74 | + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ |
| 75 | + PKG_CONFIG_EXTRAARGS="--static" \ |
| 76 | + V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \ |
| 77 | + tools-only_config |
| 78 | + |
| 79 | + sed -i 's/CONFIG_TOOLS_MKEFICAPSULE=y/# CONFIG_TOOLS_MKEFICAPSULE is not set/' $(HOST_BUILD_DIR)/.config |
| 80 | endef |
| 81 | |
| 82 | define Host/Compile |
| 83 | $(MAKE) -C $(HOST_BUILD_DIR) \ |
| 84 | HOSTCFLAGS="$(HOST_CFLAGS)" \ |
| 85 | HOSTLDFLAGS="$(HOST_LDFLAGS)" \ |
| 86 | - no-dot-config-targets=tools-only \ |
| 87 | - CONFIG_MKIMAGE_DTC_PATH=dtc \ |
| 88 | - CONFIG_FIT=y \ |
| 89 | - CONFIG_FIT_SIGNATURE=y \ |
| 90 | - CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 \ |
| 91 | + PKG_CONFIG_EXTRAARGS="--static" \ |
| 92 | + V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) \ |
| 93 | tools-only |
| 94 | endef |
| 95 | |
| 96 | --- a/tools/mkimage/patches/030-allow-to-use-different-magic.patch |
| 97 | +++ b/tools/mkimage/patches/030-allow-to-use-different-magic.patch |
| 98 | @@ -2,7 +2,7 @@ This patch makes it possible to set a cu |
| 99 | |
| 100 | --- a/tools/mkimage.c |
| 101 | +++ b/tools/mkimage.c |
| 102 | -@@ -21,6 +21,7 @@ static struct image_tool_params params = |
| 103 | +@@ -25,6 +25,7 @@ static struct image_tool_params params = |
| 104 | .arch = IH_ARCH_PPC, |
| 105 | .type = IH_TYPE_KERNEL, |
| 106 | .comp = IH_COMP_GZIP, |
| 107 | @@ -10,8 +10,8 @@ This patch makes it possible to set a cu |
| 108 | .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, |
| 109 | .imagename = "", |
| 110 | .imagename2 = "", |
| 111 | -@@ -82,11 +83,12 @@ static void usage(const char *msg) |
| 112 | - " -l ==> list image header information\n", |
| 113 | +@@ -88,11 +89,12 @@ static void usage(const char *msg) |
| 114 | + " -q ==> quiet\n", |
| 115 | params.cmdname); |
| 116 | fprintf(stderr, |
| 117 | - " %s [-x] -A arch -O os -T type -C comp -a addr -e ep -n name -d data_file[:data_file...] image\n" |
| 118 | @@ -24,16 +24,16 @@ This patch makes it possible to set a cu |
| 119 | " -a ==> set load address to 'addr' (hex)\n" |
| 120 | " -e ==> set entry point to 'ep' (hex)\n" |
| 121 | " -n ==> set image name to 'name'\n" |
| 122 | -@@ -150,7 +152,7 @@ static void process_args(int argc, char |
| 123 | +@@ -163,7 +165,7 @@ static void process_args(int argc, char |
| 124 | int opt; |
| 125 | |
| 126 | while ((opt = getopt(argc, argv, |
| 127 | -- "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:ln:N:p:O:rR:qstT:vVx")) != -1) { |
| 128 | -+ "a:A:b:B:c:C:d:D:e:Ef:Fk:i:K:lM:n:N:p:O:rR:qstT:vVx")) != -1) { |
| 129 | +- "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:ln:N:p:o:O:rR:qstT:vVx")) != -1) { |
| 130 | ++ "a:A:b:B:c:C:d:D:e:Ef:FG:k:i:K:lM:n:N:p:o:O:rR:qstT:vVx")) != -1) { |
| 131 | switch (opt) { |
| 132 | case 'a': |
| 133 | params.addr = strtoull(optarg, &ptr, 16); |
| 134 | -@@ -237,6 +239,14 @@ static void process_args(int argc, char |
| 135 | +@@ -254,6 +256,14 @@ static void process_args(int argc, char |
| 136 | case 'l': |
| 137 | params.lflag = 1; |
| 138 | break; |
| 139 | @@ -61,7 +61,7 @@ This patch makes it possible to set a cu |
| 140 | image_set_load(hdr, addr); |
| 141 | --- a/tools/imagetool.h |
| 142 | +++ b/tools/imagetool.h |
| 143 | -@@ -56,6 +56,7 @@ struct image_tool_params { |
| 144 | +@@ -59,6 +59,7 @@ struct image_tool_params { |
| 145 | int arch; |
| 146 | int type; |
| 147 | int comp; |
| 148 | --- a/tools/mkimage/patches/050-Add-compatibility-with-non-Linux-hosts.patch |
| 149 | +++ b/tools/mkimage/patches/050-Add-compatibility-with-non-Linux-hosts.patch |
| 150 | @@ -15,11 +15,9 @@ __u64 is not available on FreeBSD, remov |
| 151 | Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
| 152 | --- |
| 153 | include/image.h | 2 ++ |
| 154 | - include/imx8image.h | 5 +++++ |
| 155 | include/linux/posix_types.h | 2 ++ |
| 156 | include/linux/types.h | 4 +++- |
| 157 | - lib/rsa/rsa-sign.c | 2 +- |
| 158 | - 5 files changed, 13 insertions(+), 2 deletions(-) |
| 159 | + 3 files changed, 7 insertions(+), 1 deletion(-) |
| 160 | |
| 161 | --- a/include/image.h |
| 162 | +++ b/include/image.h |
| 163 | --- a/tools/mkimage/patches/090-macos-arm64-builing-fix.patch |
| 164 | +++ /dev/null |
| 165 | @@ -1,47 +0,0 @@ |
| 166 | -This patch fixes compilation issues on MacOS arm64. |
| 167 | -Based on discussion |
| 168 | -https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0 |
| 169 | - |
| 170 | -diff --git a/Makefile b/Makefile |
| 171 | -index b4f1cbc..551041f 100644 |
| 172 | ---- a/Makefile |
| 173 | -+++ b/Makefile |
| 174 | -@@ -324,11 +324,6 @@ HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") |
| 175 | - KBUILD_HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") |
| 176 | - KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") |
| 177 | - |
| 178 | --# since Lion (10.7) ASLR is on by default, but we use linker generated lists |
| 179 | --# in some host tools which is a problem then ... so disable ASLR for these |
| 180 | --# tools |
| 181 | --KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie") |
| 182 | -- |
| 183 | - # macOS Mojave (10.14.X) |
| 184 | - # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" |
| 185 | - KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") |
| 186 | -diff --git a/tools/imagetool.h b/tools/imagetool.h |
| 187 | -index 8726792..d1b72ef 100644 |
| 188 | ---- a/tools/imagetool.h |
| 189 | -+++ b/tools/imagetool.h |
| 190 | -@@ -270,17 +270,20 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); |
| 191 | - * b) we need a API call to get the respective section symbols */ |
| 192 | - #if defined(__MACH__) |
| 193 | - #include <mach-o/getsect.h> |
| 194 | -+#include <mach-o/dyld.h> |
| 195 | - |
| 196 | - #define INIT_SECTION(name) do { \ |
| 197 | - unsigned long name ## _len; \ |
| 198 | -- char *__cat(pstart_, name) = getsectdata("__TEXT", \ |
| 199 | -+ char *__cat(pstart_, name) = getsectdata("__DATA", \ |
| 200 | - #name, &__cat(name, _len)); \ |
| 201 | -+ __cat(pstart_, name) += \ |
| 202 | -+ _dyld_get_image_vmaddr_slide(0); \ |
| 203 | - char *__cat(pstop_, name) = __cat(pstart_, name) + \ |
| 204 | - __cat(name, _len); \ |
| 205 | - __cat(__start_, name) = (void *)__cat(pstart_, name); \ |
| 206 | - __cat(__stop_, name) = (void *)__cat(pstop_, name); \ |
| 207 | - } while (0) |
| 208 | --#define SECTION(name) __attribute__((section("__TEXT, " #name))) |
| 209 | -+#define SECTION(name) __attribute__((section("__DATA, " #name))) |
| 210 | - |
| 211 | - struct image_type_params **__start_image_type, **__stop_image_type; |
| 212 | - #else |
| 213 | --- /dev/null |
| 214 | +++ b/tools/mkimage/patches/095-tools-disable-TOOLS_FIT_FULL_CHECK.patch |
| 215 | @@ -0,0 +1,24 @@ |
| 216 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 217 | +From: Huangbin Zhan <zhanhb88@gmail.com> |
| 218 | +Date: Fri, 18 Feb 2022 14:19:23 +0800 |
| 219 | +Subject: [PATCH] tools: disable TOOLS_FIT_FULL_CHECK |
| 220 | + |
| 221 | + U-Boot disallows unit addresses by default. Disable TOOLS_FIT_FULL_CHECK |
| 222 | + to allow at symbol in node names. |
| 223 | + |
| 224 | +https://github.com/openwrt/openwrt/commits/master/scripts/mkits.sh |
| 225 | +https://github.com/u-boot/u-boot/commit/3f04db891a353f4b127ed57279279f851c6b4917 |
| 226 | +--- |
| 227 | + tools/Kconfig | 2 +- |
| 228 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
| 229 | + |
| 230 | +--- a/tools/Kconfig |
| 231 | ++++ b/tools/Kconfig |
| 232 | +@@ -31,7 +31,7 @@ config TOOLS_FIT |
| 233 | + Enable FIT support in the tools builds. |
| 234 | + |
| 235 | + config TOOLS_FIT_FULL_CHECK |
| 236 | +- def_bool y |
| 237 | ++ bool "Do a full check of the FIT" |
| 238 | + help |
| 239 | + Do a full check of the FIT before using it in the tools builds |