From patchwork Thu Jul 27 10:37:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 794335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="t+Dora82"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xJ7hk33N0z9s5L for ; Thu, 27 Jul 2017 20:37:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D388589983; Thu, 27 Jul 2017 10:37:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dq-Rwwne5xpU; Thu, 27 Jul 2017 10:37:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 320428997B; Thu, 27 Jul 2017 10:37:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B5AC61C4116 for ; Thu, 27 Jul 2017 10:37:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B057F886E4 for ; Thu, 27 Jul 2017 10:37:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nsKOEZRNwHT8 for ; Thu, 27 Jul 2017 10:37:14 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 53869881A4 for ; Thu, 27 Jul 2017 10:37:14 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3xJ7hR0x8Tz108x for ; Thu, 27 Jul 2017 12:37:10 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1501151829; x=1501756630; bh=I0Ex7tLgftWDJPpV2n7wsS8/TcfCjU68sQylpzGKucg=; b=t+Dora82dMCh uM8okFR+MN6Wd+NpJM7aqp/bw45ZdiKOP32+BzsKbbF8MTDc/FdOsMFVBGUQN5yQ 7Rbto1S5Q38t4+a7reGicYaaHNMQNbo+Ex+lj1/0R8hH1U/lUmlBgMaiuhbXCIFR mqjGqNHfNfqGWpGPa2DzDn3IaK9n1/a9c8P/rWm59Jy7yU1nkD+H7IkWT3km/KuB m1j71CA6qANsIchESPspNIw1erobPhVB4vKZPd6Wc38Jbk6xqMkj81Dp+27FWU5H rj/MjWukdB/Wd9wNL7ZgIowsPIA7PDSZ6zmtG36dhTo0m8J4JPjkl6tjwgXqxV60 fMfgOzM6QA== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XXicnegQCboG; Thu, 27 Jul 2017 12:37:09 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-2-6.dynamic.qsc.de [92.195.2.6]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Thu, 27 Jul 2017 12:37:09 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Thu, 27 Jul 2017 12:37:06 +0200 Message-Id: <20170727103706.3580-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.13.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] swupdate: bump to version 2017.07 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" * Remove patch applied upstream * Update the default config file Signed-off-by: Jörg Krause --- ...1-suricata_hawkbit-depends-on-HAVE_JSON_C.patch | 39 ---------------------- package/swupdate/swupdate.config | 29 ++++++++++------ package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 4 files changed, 20 insertions(+), 52 deletions(-) delete mode 100644 package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch diff --git a/package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch b/package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch deleted file mode 100644 index e8cd790bd4..0000000000 --- a/package/swupdate/0001-suricata_hawkbit-depends-on-HAVE_JSON_C.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ae647879efad6ba2bb0b95ed7e70dee82c05b82a Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 2 Jun 2017 07:40:08 +0300 -Subject: [PATCH] suricata_hawkbit: depends on HAVE_JSON_C - -Unconditionally selecting JSON when !HAVE_JSON_C leads to a warning: - -warning: (SURICATTA_HAWKBIT) selects JSON which has unmet direct dependencies (HAVE_JSON_C) - -and eventually a build failure: - -In file included from corelib/artifacts_versions.c:34:0: -include/parselib.h:61:25: fatal error: json-c/json.h: No such file or directory - -Make SURICATTA_HAWKBIT depend on HAVE_JSON_C. - -Signed-off-by: Baruch Siach ---- -Upstream status: -https://groups.google.com/forum/?hl=en#!topic/swupdate/WmwNN_Hni0c - - suricatta/Config.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/suricatta/Config.in b/suricatta/Config.in -index 24bd5d1053f5..cfd96b83506a 100644 ---- a/suricatta/Config.in -+++ b/suricatta/Config.in -@@ -54,6 +54,7 @@ choice - config SURICATTA_HAWKBIT - bool "hawkBit support" - depends on HAVE_LIBCURL -+ depends on HAVE_JSON_C - select JSON - select SURICATTA - help --- -2.11.0 - diff --git a/package/swupdate/swupdate.config b/package/swupdate/swupdate.config index 51869bb9d9..328e49fdf0 100644 --- a/package/swupdate/swupdate.config +++ b/package/swupdate/swupdate.config @@ -14,14 +14,11 @@ CONFIG_HAVE_DOT_CONFIG=y CONFIG_SCRIPTS=y # CONFIG_HW_COMPATIBILITY is not set CONFIG_SW_VERSIONS_FILE="/etc/sw-versions" -# CONFIG_MTD is not set -# CONFIG_LUA is not set # CONFIG_FEATURE_SYSLOG is not set # # Build Options # -# CONFIG_STATIC is not set CONFIG_CROSS_COMPILE="" CONFIG_SYSROOT="" CONFIG_EXTRA_CFLAGS="" @@ -34,9 +31,23 @@ CONFIG_EXTRA_LDLIBS="" # CONFIG_DEBUG is not set # CONFIG_WERROR is not set # CONFIG_NOCLEANUP is not set -# CONFIG_DOWNLOAD is not set -# CONFIG_SIGNED_IMAGES is not set + +# +# Bootloader +# +# CONFIG_BOOTLOADER is not set +CONFIG_BOOTLOADER_NONE=y +# CONFIG_BOOTLOADER_GRUB is not set + +# +# Suricatta +# # CONFIG_SURICATTA is not set +CONFIG_SURICATTA_SERVER_NONE=y + +# +# Server +# CONFIG_WEBSERVER=y # @@ -48,19 +59,16 @@ CONFIG_MONGOOSE=y # Mongoose Feature # CONFIG_MONGOOSEIPV6=y -# CONFIG_MONGOOSESSL is not set # # Archival Features # -# CONFIG_GUNZIP is not set # # Parser Features # CONFIG_LIBCONFIG=y -CONFIG_LIBCONFIGROOT="" -# CONFIG_JSON is not set +CONFIG_PARSERROOT="" # CONFIG_SETSWDESCRIPTION is not set # @@ -68,5 +76,4 @@ CONFIG_LIBCONFIGROOT="" # CONFIG_RAW=y # CONFIG_SHELLSCRIPTHANDLER is not set -# CONFIG_ARCHIVE is not set -# CONFIG_UBOOT is not set \ No newline at end of file +# CONFIG_BOOTLOADERHANDLER is not set diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 5bdd9bf320..7acc249b80 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d5a4ff243bae865313b808aad57efa6400d41e83c49266a3a14a725d0c30d240 swupdate-2017.04.tar.gz +sha256 898a98b0c5a6bd09a4138fa98bb9883357db1ec6fe4dd5e8f4bcb11d092b9bf3 swupdate-2017.07.tar.gz diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 560a2d4300..ee92adddf0 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2017.04 +SWUPDATE_VERSION = 2017.07 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0+, MIT, Public Domain SWUPDATE_LICENSE_FILES = COPYING