projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a8cc6ee)
package/swupdate: add patch to fix link error for CONFIG_UBOOT and missing libz
authorJörg Krause <joerg.krause@embedded.rocks>
Mon, 19 Oct 2015 20:45:27 +0000 (22:45 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 19 Oct 2015 21:02:56 +0000 (23:02 +0200)
CONFIG_UBOOT needs libz [1]. So CONFIG_UBOUT mustn't be available when
HAVE_ZLIB=n.

Add patch from upstream to fix a link error for CONFIG_UBOOT and missing libz.
Note, that this link error does not affect the default config provided by
Buildroot.

[1] https://github.com/sbabic/swupdate/commit/cf495e23ad117f4cae9c429e80714fe9c18f2d6a

[Thomas: use a single <pkg>_PATCH variable.]

Reported-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/swupdate/swupdate.hash patch | blob | history
package/swupdate/swupdate.mk patch | blob | history

diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash
index 057cf84c2234f7755d35a93f7f105dc24f18d303..96ebedf8294b6ef19b68055d855c37a388a22c52 100644 (file)
--- a/package/swupdate/swupdate.hash
+++ b/package/swupdate/swupdate.hash
@@ -1,3 +1,4 @@
 # Locally calculated
 sha256 1410f8967aad0f4d3b4561110dbfb2c1f8e337bdc332f6b120f4995762c8bf6b  swupdate-2015.07.tar.gz
 sha256 ec633171e6a893506fad6b96fb2b258d60a023c03be5520b968a1d5cc6bafe6e  c3467290925b2a833a68d9db12c198fdca752e32.patch
+sha256 6cffe115cad73c0d1095f7880b6d2b97fc12b7f7871f532e5b33717e863f03d7  5a5ef5909f5da5b2070d58ffaee924bb8e6a51e1.patch
diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index 8a201937dca6e5cef21f7ca41493fb9ea8eb2258..68f6e2cea6f0e2938000860c52421a99e429c7b2 100644 (file)
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -8,7 +8,9 @@ SWUPDATE_VERSION = 2015.07
 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
 SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain
 SWUPDATE_LICENSE_FILES = COPYING
-SWUPDATE_PATCH = https://github.com/sbabic/swupdate/commit/c3467290925b2a833a68d9db12c198fdca752e32.patch
+SWUPDATE_PATCH = \
+       https://github.com/sbabic/swupdate/commit/c3467290925b2a833a68d9db12c198fdca752e32.patch \
+       https://github.com/sbabic/swupdate/commit/5a5ef5909f5da5b2070d58ffaee924bb8e6a51e1.patch
 
 # swupdate bundles its own version of mongoose (version 3.8) and
 # lsqlite3 (version 0.8)