diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-14 23:00:12 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-18 23:59:32 +0200 |
| commit | b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4 (patch) | |
| tree | 71760edb1ae1c3c1d704461e405d6fced0c4e206 /tools/mkimage/patches/210-link-libcrypto-static.patch | |
| parent | 68150d3125447a40cf103aeefd9bcb6c874e6769 (diff) | |
| download | upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.tar.gz upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.tar.bz2 upstream-b13e981d72c14ba4c39f85f0d24a8f7947a1b2c4.zip | |
tools/mkimage: update to version 2018.03
This activates support for fit images and some other new mkimage
features. Some of the patches were applied upstream and could be
removed.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'tools/mkimage/patches/210-link-libcrypto-static.patch')
| -rw-r--r-- | tools/mkimage/patches/210-link-libcrypto-static.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/mkimage/patches/210-link-libcrypto-static.patch b/tools/mkimage/patches/210-link-libcrypto-static.patch new file mode 100644 index 0000000000..66412ce43b --- /dev/null +++ b/tools/mkimage/patches/210-link-libcrypto-static.patch @@ -0,0 +1,14 @@ +OpenWrt links the libressl statically against mkimage, make sure all the +needed dependencies are added too. + +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -145,7 +145,7 @@ endif + # MXSImage needs LibSSL + ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),) + HOSTLOADLIBES_mkimage += \ +- $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") ++ $(shell pkg-config --libs --static libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") + + # OS X deprecate openssl in favour of CommonCrypto, supress deprecation + # warnings on those systems |