From patchwork Sat Jan 18 16:36:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1225178 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=H9husDl1; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.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 480NpC53b4z9sPJ for ; Sun, 19 Jan 2020 03:35:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 73E9987B3E; Sat, 18 Jan 2020 16:35:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hsw23Z9EsfRQ; Sat, 18 Jan 2020 16:35:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 444AC85CB8; Sat, 18 Jan 2020 16:35:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C6BEB1BF3C2 for ; Sat, 18 Jan 2020 16:35:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C3FE320354 for ; Sat, 18 Jan 2020 16:35:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vXxlOwnen5Pm for ; Sat, 18 Jan 2020 16:35:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by silver.osuosl.org (Postfix) with ESMTPS id DDE2A2002E for ; Sat, 18 Jan 2020 16:35:20 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id p17so10591131wma.1 for ; Sat, 18 Jan 2020 08:35:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gRPk+ex1ZCJXfmGmaCwJAKB/JKwcQ0/I49hARF8kMO4=; b=H9husDl1Ivgy0u+BbwR3QSgK/3z2g7U3WiZ93v3rl488ioxARqpogZjMeDPcMO6Lie CmDyR6hcWSR3e69P0ypPow5yKf/o+Y8UZM4iAR7Itt29EZsSkBn2olrbVACljMHdfY43 2ydQbrPJwz10xDkutVekidnuTFn3b/H0iWLSQT1PhasAOIAz5qKOPT2fNPj05dS6jvL4 i4pr19MsAjUXhDSgceF+PkydUQsk7v5en1IAiDO9lXs+BX1LoCzjEu4rvq3N7TTtglS+ vHvtravQORJvc1RtIlt10/UbzKB/uzDinYe/Yc4N3dtWoSnPdMTinr/oz+/LwW7HzOgl Ukkg== 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:mime-version :content-transfer-encoding; bh=gRPk+ex1ZCJXfmGmaCwJAKB/JKwcQ0/I49hARF8kMO4=; b=N47QiqcBDB1nx0O5h/XH5IwzmrAxD8h73yuDCqzwMmSipWmCMpTGf1jCVnnkno8XCv zTcQfSx4Stf0RFsp1zR7U00p/dXyglkiFGpRhX532y2L7feu7hBCRNpKoOo4iafjslSr cNo0WA3JOZSVHuOd9R8yANe4NSpFo7RNwqG+ECqGkV7cpOxpacyfEDv+bHzmbGf8VM26 s5zAy0g75MjrWZcU0GsMIG34CCLZ8ba95OfnCwVIsKd/vDTV1fllt/oCT03FPhjWc37Z jQahOLLlt1KLvT6JFwuSgJKlSwlTcl3VaKSN9FVvJ0Bk8UT4KuhT6wFZSQqhcYNf8++C iixQ== X-Gm-Message-State: APjAAAV33PayILQ3pDYsmL1qqeEbzqH4tGoiqhX1L+y4ejFcVB4E+IR9 dOlUyC2vD76fSoQwXKsqgMoGh3e1 X-Google-Smtp-Source: APXvYqwcIajxLwKZnqO80DSxTNmqosMTwN/Mt/2CtDOnLs7cPJ5Rq2FVqHxCfGShat23ILaZBdYRtg== X-Received: by 2002:a05:600c:214f:: with SMTP id v15mr10607373wml.110.1579365318940; Sat, 18 Jan 2020 08:35:18 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id n14sm14735831wmi.26.2020.01.18.08.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2020 08:35:18 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 18 Jan 2020 17:36:18 +0100 Message-Id: <20200118163618.662596-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/olsr: add pud plugin X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" pud plugin needs gpsd and has a specific license Signed-off-by: Fabrice Fontaine --- ...-lib-pud-Makefile-fix-parallel-build.patch | 33 +++++++++++++++++++ package/olsr/olsr.mk | 11 +++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 package/olsr/0001-lib-pud-Makefile-fix-parallel-build.patch diff --git a/package/olsr/0001-lib-pud-Makefile-fix-parallel-build.patch b/package/olsr/0001-lib-pud-Makefile-fix-parallel-build.patch new file mode 100644 index 0000000000..b15df2408d --- /dev/null +++ b/package/olsr/0001-lib-pud-Makefile-fix-parallel-build.patch @@ -0,0 +1,33 @@ +From 2f9311668dfdeee0453f5fceb27e8c95c065c4b6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 18 Jan 2020 17:29:56 +0100 +Subject: [PATCH] lib/pud/Makefile: fix parallel build + +nmealib is needed to build olsrd_pud plugin otherwise build fails on: + +[LD] olsrd_pud.so.3.0.0 (nmealib dynamically linked) +/home/fabrice/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-none-linux-gnueabi/4.8.3/../../../../arm-none-linux-gnueabi/bin/ld: cannot find -lnmea +wireformat/lib/libOlsrdPudWireFormat.so: file not recognized: File truncated + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OLSR/olsrd/pull/78] +--- + lib/pud/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/pud/Makefile b/lib/pud/Makefile +index e2524421..28330d92 100644 +--- a/lib/pud/Makefile ++++ b/lib/pud/Makefile +@@ -108,7 +108,7 @@ endif + + default_target: nmealib library $(PLUGIN_FULLNAME) + +-$(PLUGIN_FULLNAME): $(OBJS) version-script.txt ++$(PLUGIN_FULLNAME): $(OBJS) version-script.txt nmealib + ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) + ifeq ($(VERBOSE),0) + @echo "[LD] $@ (nmealib dynamically linked)" +-- +2.24.1 + diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index 31c601f80e..4a24cda442 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -10,10 +10,17 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ mdns nameservice netjson poprouting p2pd pgraph secure txtinfo watchdog # Doesn't really need quagga but not very useful without it OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) -OLSR_LICENSE = BSD-3-Clause, LGPL-2.1+ -OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE +OLSR_LICENSE = BSD-3-Clause +OLSR_LICENSE_FILES = license.txt OLSR_DEPENDENCIES = host-flex host-bison +ifeq ($(BR2_PACKAGE_GPSD),y) +OLSR_LICENSE += , LGPL-2.1+ (nmealib) +OLSR_LICENSE_FILES += lib/pud/nmealib/LICENSE +OLSR_DEPENDENCIES += gpsd +OLSR_PLUGINS += pud +endif + define OLSR_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd $(foreach p,$(OLSR_PLUGINS), \