Message ID | 20181212142056.7722-1-jared.bents@rockwellcollins.com |
---|---|
State | Accepted |
Headers | show |
Series | [v2,1/1] package/swupdate: Update to version 2018.11 | expand |
Hello Jared, On Wed, 12 Dec 2018 08:20:56 -0600, Jared Bents wrote: > Update to version 2018.11 to resolve build errors due to the changes > in libcurl at version 7.62.0 Which build failure? I don't see any in the autobuilders. Why don't we see any failure in the autobuilders? Thanks, Thomas
Hi Thomas, On Thu, Dec 13, 2018 at 2:17 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > Hello Jared, > > On Wed, 12 Dec 2018 08:20:56 -0600, Jared Bents wrote: > > Update to version 2018.11 to resolve build errors due to the changes > > in libcurl at version 7.62.0 > > Which build failure? I don't see any in the autobuilders. Why don't we > see any failure in the autobuilders? libcurl in version 7.62.0 updated CURLE_SSL_CACERT to share the same value as CURLE_PEER_FAILED_VERIFICATION so if you build with the kconfig option CONFIG_DOWNLOAD turned on and it detects that libcurl is included in the build, the build will fail on versions of swupdate that don't account for the 7.62.0 version of libcurl. The default config used by swupdate does not have CONFIG_DOWNLOAD turned on. Here is the error: >>> swupdate 2018.03 Building PATH="/accts/jmbents/rclinux/target_build/qoriq_t1042_fomax_factory_defconfig/host/bin:/accts/jmbents/rclinux/target_build/qoriq_t1042_fomax_factory_defconfig/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin" HAVE_JSON_C=n HAVE_LIBARCHIVE=y HAVE_LIBCONFIG=y HAVE_LIBCURL=y HAVE_LUA=n HAVE_LIBMTD=y HAVE_LIBUBI=y HAVE_LIBSSL=y HAVE_LIBCRYPTO=y HAVE_LIBUBOOTENV=y HAVE_LIBZEROMQ=n HAVE_ZLIB=y /usr/bin/make -j13 -C /accts/jmbents/rclinux/target_build/qoriq_t1042_fomax_factory_defconfig/build/swupdate-2018.03 CC corelib/channel_curl.o CC corelib/installer.o CC corelib/mtd-interface.o CC corelib/network_thread.o CC corelib/parsing_library.o CC corelib/progress_thread.o CC corelib/stream_interface.o CC corelib/parsing_library_libconfig.o CC corelib/swupdate_dict.o CC corelib/swupdate_settings.o corelib/channel_curl.c: In function ‘channel_map_curl_error’: corelib/channel_curl.c:298:2: error: duplicate case value case CURLE_SSL_CACERT: ^~~~ corelib/channel_curl.c:297:2: error: previously used here case CURLE_PEER_FAILED_VERIFICATION: ^~~~ corelib/channel_curl.c: In function ‘channel_get_file’: corelib/channel_curl.c:864:16: warning: unused variable ‘md_len’ [-Wunused-variable] unsigned int md_len; ^~~~~~ scripts/Makefile.build:168: recipe for target 'corelib/channel_curl.o' failed make[3]: *** [corelib/channel_curl.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Makefile:437: recipe for target 'corelib' failed make[2]: *** [corelib] Error 2 package/pkg-generic.mk:230: recipe for target '/accts/jmbents/rclinux/target_build/qoriq_t1042_fomax_factory_defconfig/build/swupdate-2018.03/.stamp_built' failed make[1]: *** [/accts/jmbents/rclinux/target_build/qoriq_t1042_fomax_factory_defconfig/build/swupdate-2018.03/.stamp_built] Error 2 Makefile:23: recipe for target '_all' failed make: *** [_all] Error 2 > > Thanks, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Thank you, Jared
Hello, On Wed, 12 Dec 2018 08:20:56 -0600, Jared Bents wrote: > Update to version 2018.11 to resolve build errors due to the changes > in libcurl at version 7.62.0 > > Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com> > -- > [v1->v2]: Update to add COPYING to hash file > > --- > package/swupdate/swupdate.hash | 3 ++- > package/swupdate/swupdate.mk | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) Applied to master after extending the commit log to give more details about the build issue. Thanks, Thomas
>>>>> "Jared" == Jared Bents <jared.bents@rockwellcollins.com> writes: > Update to version 2018.11 to resolve build errors due to the changes > in libcurl at version 7.62.0 > Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com> > -- > [v1->v2]: Update to add COPYING to hash file Committed to 2018.02.x, 2018.08.x and 2018.11.x, thanks.
diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index efc637976a..339f40e1bb 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 19156bb30c3517a0ff9c918a38062df3cfa70f02f8162da4971a2f47d108688e swupdate-2018.03.tar.gz +sha256 a65884ca18523cde1b0744d952d6f91462dbd4ad07941305f5684c6d4ec833dc swupdate-2018.11.tar.gz +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index abf46c9256..6285437aaa 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2018.03 +SWUPDATE_VERSION = 2018.11 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0+, LGPL-2.1+, MIT SWUPDATE_LICENSE_FILES = COPYING
Update to version 2018.11 to resolve build errors due to the changes in libcurl at version 7.62.0 Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com> -- [v1->v2]: Update to add COPYING to hash file --- package/swupdate/swupdate.hash | 3 ++- package/swupdate/swupdate.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)