From patchwork Tue Jan 23 15:56:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 864884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::23e; helo=mail-lf0-x23e.google.com; envelope-from=swupdate+bncbcxploxj6ikrbpvwtxjqkgqedpoakrq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="sUUB8FYU"; dkim-atps=neutral Received: from mail-lf0-x23e.google.com (mail-lf0-x23e.google.com [IPv6:2a00:1450:4010:c07::23e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQtGC5bkNz9s7n for ; Wed, 24 Jan 2018 02:56:50 +1100 (AEDT) Received: by mail-lf0-x23e.google.com with SMTP id m200sf266056lfg.2 for ; Tue, 23 Jan 2018 07:56:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1516723007; cv=pass; d=google.com; s=arc-20160816; b=ncyd61Dy3bKW/KrX1Ta3QXJJDWE1n2CMVAKtwVFi3XGKFEwQnPJ14+l0FSk6W+agY3 Hkmyvxc+Zn5QxAZ2+AX9UPqGAvjnd+FrySz0xsSjjOr1kwkmqADuf+jRwuQOIx/Hln7W v83gZNxeqseHVxQl86LRuUgCg/h1IjjuVhXGVLV4VXYaiR+jOPi+UEQMRiI1h2ekENem int9DsjP5dVsBu0W8YwuAZdh8yaksMOAstXxq2Q6c5YFYbDiuC8IAFYoiv/3YEh82ydw fcITZR9JscfZmn8GNg2juhLi9M+V7EfquoErjAXyqBqi8JY9xNHn9jR/QL3wbExWVOk/ SxHg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:sender :dkim-signature:arc-authentication-results; bh=vkyx7TrwSkXO0QAMi0KEAcxuBr7r/uF+EMeXieG51J4=; b=gs6f062xiUXD1lZ38fPCUIK+bkkztDAuCewxsYh84JHhhjNFXy7LGLgf2ARdbZMFsS x/2qfdxVonMFYkYBPkrIWR7Y68FPytegIY3OvxCYWF1gUfBNhIA6QVm2jop7MebghoGx HpB8EBqRjlHs7hGxFWzTbm+DE/mrNvueEQREkugUNsPI7YLEBzJGcPrGXHt+lDuGd8Ay bRREGeeQq2VZs2BOceuH7DJKXh5pZlD1eIvW3lKO89QaTGUiS4u1B3QwVzArPQJCpfCh SB6H3zcYzlQF1VKrclA/LSG/fzRVWr81ih/ZqTFcThNGbRhynnpXQN02alC1Cp0XOiA6 HEFw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=vkyx7TrwSkXO0QAMi0KEAcxuBr7r/uF+EMeXieG51J4=; b=sUUB8FYUe7575Dp9mownCSaMVNKGB0GhTFyoli01Y+MUrziVf6p/6UkPwGLKYsDTjo gYqCoV6KHkwLQDqTM/eazTRQEh6zsfacCxOZ9NXIAqABge3fK4m7hsz11zgyT9uzD9bP g/V8O+Aoozj27DC+3nBOvr3o0dEPpzO+it6fcmYXNXctfbhhTingonM1SejU9IysFYyO T4StOrlQCvPxGz1ndrzehWUHq9rhH12qbY7y5UwMvRtv2x/zpDzGZZ9r7TXw64riVuQC NOzL9Vqo1o4Q76Xg7+ciLDnmmDH2+j4XW701FlJc0JZsy09AIjvjF5uYv/CUMPawMPpk CYxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=vkyx7TrwSkXO0QAMi0KEAcxuBr7r/uF+EMeXieG51J4=; b=KDhjPNTnYDZGzrMdL7xK+h8jDL2K3SDsiIACWuNnIs/QMOysuqytbEqRGtPvb9pFFm q2L0n1CQPv4h98NQ7T9BGgKncda70yxMne2tjNRICWX8OzHTVVfdn2poZ4gjVFz2Eoi5 svhyBku7ihWlOYYi+oZxR3iAg3OiSe3r5bhd61B8P6q6Bmvp7IPimQXbHwAh7CNPuHdE gR4LzAXw/ruNoul8VgQQv7qzJpJn2EG+mUD/r38H3MGLgPiO1QpjOf0k/9C2r92H5PMS oxgp1B9ivN1IEB5GA7/VMQiYxKakbWijZharK73qY+AhAyPpkql/eHjajN3q1Ne6+KZj pCSg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AKwxytc+lWUYRZjCG1oKhADyYugrBDhliy8F2CJIzMeUsrPH5oogmWjm h9ozQB+nsjHiV14OrzPfE5U= X-Google-Smtp-Source: AH8x224gkY/mi6mqXiZYSDjokVarvR5FSlUCs4A+WUE5f67loDwrox8xbX+DlrE3mkQVVvXBcE4Lrw== X-Received: by 10.46.53.25 with SMTP id z25mr9068ljz.6.1516723007180; Tue, 23 Jan 2018 07:56:47 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 10.25.141.139 with SMTP id p133ls861207lfd.8.gmail; Tue, 23 Jan 2018 07:56:46 -0800 (PST) X-Received: by 10.25.233.24 with SMTP id g24mr276773lfh.29.1516723006201; Tue, 23 Jan 2018 07:56:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516723006; cv=none; d=google.com; s=arc-20160816; b=dVPMX7hS4skSce8eHCyc7bmxvaoXxQIPxnAB5vvtLyC0LWuSobDyjlWvhArp2N41ot eCZxA6Yb/uPrZxC4peP2TNcWU+vEIJkIT1nWgdvlVD085MzzKjHPBPBGBRGkawp41CaB 5xXdUXlNbo+bwWfvdBA9zBhruIyH80illwRvYUMnmYpS4nII2lieRqse8JxYgW7wLeBB TaOuapVaDercgot3PHqtMyR/8b26EEghf0vTnG5akFiUKlCrhgJ0/NgtKxqo0Hz7oNAo KSkjUYWQxMo1lBLRgwyuC3mzU4Pcja4VZ+SHa1BYFRzZz+EGyqQnBczvORmUI4XgBjz5 Mp8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=l/2IbVYLJAZJUZn5XdA2A4KIGAuFqKZN/2XKgMsddrg=; b=aaA57ipoRALvOe1Mde8FkN1xxYWcoSCZSxwwB5ZfV4+49b3Jdx+6SftQFDgYjxVHwU PCyMLmSEvUakqjZ76ss3ukBfpZhA0pBw/QVrWiyzeZNu0oZJotS56RbPfzF/xUHHeUvs iuiOzYm77MWnUWHw7Yx1/QJhevrUmxQh846/lU1hHIZ/xEpmtiRZt7EQ5yhBcdFWCCwR vJsmLRR8JSYtgdlBsxoCVVzRVDDYk+To90BkhbGuatrJxzLo+u0iNOBEILzZQ6I37VjU fnXuT9qMiSjOvSkO+Q+8J+ANdYOHLgXDFCMiVWlGnwwQOwVdP246WJoeNuXQ5yp6QD8n K4uA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id 80si2319452ljr.3.2018.01.23.07.56.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 07:56:46 -0800 (PST) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3zQtG52bDYz1qv33; Tue, 23 Jan 2018 16:56:45 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3zQtG52JCcz1qqkJ; Tue, 23 Jan 2018 16:56:45 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id KrlATeEC_c56; Tue, 23 Jan 2018 16:56:43 +0100 (CET) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 23 Jan 2018 16:56:43 +0100 (CET) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 5D41E4540378; Tue, 23 Jan 2018 16:56:43 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g7OHb4LXlV0W; Tue, 23 Jan 2018 16:56:40 +0100 (CET) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id 7F7ED454035D; Tue, 23 Jan 2018 16:56:40 +0100 (CET) From: Stefano Babic To: swupdate@googlegroups.com Cc: joerg.krause@embedded.rocks, Stefano Babic Subject: [swupdate] [PATCH] Fix build if DOWNLOAD is set, but no JSON Date: Tue, 23 Jan 2018 16:56:39 +0100 Message-Id: <1516722999-32469-1-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The downloader does not require JSON, but channel_curl is built even if not called. Build fails with the error: corelib/channel_curl.c:27:10: fatal error: json-c/json.h: No such file or directory Add a CONFIG_CHANNEL_CURL that is automatically set by the modules reuiring it (suricatta and swuforwarder). Signed-off-by: Stefano Babic Reported-by: Jörg Krause --- corelib/Makefile | 2 +- handlers/Config.in | 1 + suricatta/Config.in | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/corelib/Makefile b/corelib/Makefile index 282bffd..4b30f9c 100644 --- a/corelib/Makefile +++ b/corelib/Makefile @@ -17,4 +17,4 @@ lib-$(CONFIG_ENCRYPTED_IMAGES) += swupdate_decrypt.o lib-$(CONFIG_LIBCONFIG) += swupdate_settings.o \ parsing_library_libconfig.o lib-$(CONFIG_JSON) += parsing_library_libjson.o -lib-$(CONFIG_CURL) += channel_curl.o +lib-$(CONFIG_CHANNEL_CURL) += channel_curl.o diff --git a/handlers/Config.in b/handlers/Config.in index 596f069..c8b1df7 100644 --- a/handlers/Config.in +++ b/handlers/Config.in @@ -165,6 +165,7 @@ config SWUFORWARDER_HANDLER bool "SWU forwarder" depends on HAVE_LIBCURL select CURL + select CHANNEL_CURL select JSON default n help diff --git a/suricatta/Config.in b/suricatta/Config.in index 62e448a..de25d59 100644 --- a/suricatta/Config.in +++ b/suricatta/Config.in @@ -73,6 +73,7 @@ config SURICATTA_HAWKBIT depends on HAVE_JSON_C select JSON select CURL + select CHANNEL_CURL help Support for hawkBit server. https://projects.eclipse.org/projects/iot.hawkbit