From patchwork Tue Mar 28 00:10:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 744028 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vsWXh5HL8z9s79 for ; Tue, 28 Mar 2017 11:11:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="E/NaSGdJ"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lh0fBTZJ"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=e8iEc+enYaVytSdKqpXohUEVQUhg81TK6SvvP20iuZs=; b=E/NaSGdJfDVkP4 XTSvvsD0cRKzpDtHsYjK3F6JV0POkwC4hx5MJMUkAcaUPJxGbshSRq40bT3j4AGlKI5H3VUkC1+lm yucCv79h8OZZDeBZseth457HqqvmfL6mXQy1aI95XtDBbD2q1sMA9GWfIT4pSdCNy5p+20SWByxzQ i6/eysW2DoUlRVHxMu9CGm1uy5EkbhnnP9U4PuXqia3Doy55eHavv+lCS/gKAQuUY2byGXfjq76p5 LzxPKjI9RmwgP3ClWz2FkGtfVTcLPg50XHg+dqGV2KrmL+exPFnfqYUn5KrNpQ3lDd0pWRUNMMhAU RDOWPOQsDkDuJZ3gVU5A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1csejN-0006FK-Kh; Tue, 28 Mar 2017 00:11:25 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csejK-0006AZ-6Z for lede-dev@lists.infradead.org; Tue, 28 Mar 2017 00:11:23 +0000 Received: by mail-qk0-x243.google.com with SMTP id p22so10247785qka.0 for ; Mon, 27 Mar 2017 17:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iptXlYzJPOKVP/xaHJP7pZt6TBOGkpIHzj5yZOwJ6Sw=; b=lh0fBTZJkiUd/3wKKgyZJoxBjkQlnh9ih1h1Z36khJXL/zGSs5FQ7+QlKnnmRHz7km Fm6ROIflguQ/bAnvhspPJQo64FIZDtywF2Smx5VVI/fceGgAHIvw/S6WEnS4IRRfbSQc 9hQag8dJgKp0DpsnanQ5pvEiXugtGewe/7SgcZA0MLPeoKZGn2jAeSCbe4qg0RHGR5r0 tBE+NYrQqMdNnXkL/Z6hUCcvJAX1jxORqQS6n3I9sqre3o6KpmQP84gZIpryfKTvpwPS vx/s4XkmZKKnVcGRtSQy/D+GagrP7NFm73v+2vz9KDinhvQo/qHrH9VqvKpJ2H9umSqY Nc7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iptXlYzJPOKVP/xaHJP7pZt6TBOGkpIHzj5yZOwJ6Sw=; b=GLtsyhzszpv6X+QmABS4vN196otT+9sOubj2r9uHBSK4B1BQZg6mxRITKU5hW1noPA L9X1d62EA+lPSk99lNCyHUJ/JkEux/ECcnsNTo6zld3/vYMPNg7opQiAYULC31VOQyPS YfrqC49eQImuN4ruf0NplD2jajaJkdvj9hyaHFa+IXCunL1C60gs3TZb5mj6vvyHGQmp 4vqhuFJak9BFdQgaETrI3t731zRhezLT7OWUWsxIpVkvYYGl9hhfJEMkLzM9mcpSD58f ghkC6argiO8qy/vLNFkVJeRpS128+JNqlUBkPh5NsatijB0sst2oxzYkoDqDGXxbe3LK 2UGw== X-Gm-Message-State: AFeK/H3/3h8VmKtXFpn7GDB7+3Zuzz0PU9nYXGsM7CJh5EIZHWSoz8GRafmMtiuAII54Zw== X-Received: by 10.55.90.68 with SMTP id o65mr23830704qkb.89.1490659860179; Mon, 27 Mar 2017 17:11:00 -0700 (PDT) Received: from stb-bld-03.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id b126sm1487184qka.26.2017.03.27.17.10.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Mar 2017 17:10:59 -0700 (PDT) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Mon, 27 Mar 2017 17:10:57 -0700 Message-Id: <20170328001057.12124-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.12.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170327_171122_342083_CE5025C7 X-CRM114-Status: UNSURE ( 6.12 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400d:c09:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH fstools] cmake: Make blockd link against libjson-c X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , john@phrozen.org MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Similar to commit 35aa20c51995 ("cmake: Link against libjson-c"), blockd uses libblob_msg which needs libjson-c. Fixes: 98bbb5a068d6 ("blockd: add automounting support") Signed-off-by: Florian Fainelli --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d277f92513..a828244db109 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,12 +54,12 @@ ADD_EXECUTABLE(mount_root mount_root.c) TARGET_LINK_LIBRARIES(mount_root fstools) INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin) +find_library(json NAMES json-c json) + ADD_EXECUTABLE(blockd blockd.c) -TARGET_LINK_LIBRARIES(blockd fstools ubus blobmsg_json) +TARGET_LINK_LIBRARIES(blockd fstools ubus blobmsg_json ${json}) INSTALL(TARGETS blockd RUNTIME DESTINATION sbin) -find_library(json NAMES json-c json) - ADD_EXECUTABLE(block block.c probe.c probe-libblkid.c) IF(DEFINED CMAKE_UBIFS_EXTROOT) ADD_DEFINITIONS(-DUBIFS_EXTROOT)