From patchwork Sat Feb 3 21:40:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 868948 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=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vUZ4aExK"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zYnNS26brz9s71 for ; Sun, 4 Feb 2018 08:41:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 749828825F; Sat, 3 Feb 2018 21:41:07 +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 Op1Gj2LX3LCK; Sat, 3 Feb 2018 21:41:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 78EC6883FA; Sat, 3 Feb 2018 21:41:05 +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 A287D1BFFC3 for ; Sat, 3 Feb 2018 21:41:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9DA862DA9D for ; Sat, 3 Feb 2018 21:41:03 +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 8uilknf66mjp for ; Sat, 3 Feb 2018 21:41:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by silver.osuosl.org (Postfix) with ESMTPS id 39E972CD4D for ; Sat, 3 Feb 2018 21:41:02 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id s5so25896098wra.0 for ; Sat, 03 Feb 2018 13:41:02 -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; bh=aP3Kd0OA5zyBcARVOUdH6DlOLpwBw1ex+71MX3fqNi4=; b=vUZ4aExK+tQdJl3BAqLeJVLaT2TXOm6e4/5k2rFUHV3IZgeawdxaryIrTNyRUuRy66 NsmKKTQP/xnuolLwrwxnEcflbn/nJXs3cu4P87jyuQqMw+2laT+FhQkVQmNftT8Dl49O 4s+w8JWySLN+r3bw5PT+XhYiWQNvKhis7CJocxDKZSz8nkaxtT5no39O/6qyQ6OQcm9j MXeQZElVR1JB+7ChpMtOaWwHK8StFTri6g8A2QVgd5QM/Hln3DxI2miqNZEdkKT0EjU/ GMJ95UenINmKbosxW0zghW51LeXRKcsczazUrxTK5zbLnuGdhzuvxkUYKfauQWdNWbXb 37Sg== 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=aP3Kd0OA5zyBcARVOUdH6DlOLpwBw1ex+71MX3fqNi4=; b=t0hINHJYN5tNcGKA14EVYOmnVzWTx3gjcz+a4Qhh4IGY/QFgdayXYEvtpnBpiBUUhA 8qMho2Gl9JGzIJr7s7DtzggvHHiITlil/q7LPpLo0ydOG4SvQ8dA40jcAWOWvEuPjFGw XIEEswSGgah5z/SNAPGgYtwKhxPG5ZyrvMSJLDfhmWvXpMcvd5i7C04s7VQ4D6idwu9I GkcpsnLjxvmH6flbGMKSHwR72HRawOxvHTr0uUIgBwy/HoJP/LI9gdkF0jXDkoosg+rh U4ulYYj4/DEG7QQPmkajjDVbLv9YHTbqo15jCBDzjMLvzL8vbCm6IbSjd6+j+hjobBkO pOgg== X-Gm-Message-State: AKwxytfvIA5fQHUbZJ2QV+cwUzk8tiQPNZH6oxuacjDscBwupg6AqkVc 8WfFvN7yIXritHjK756jDRD27g== X-Google-Smtp-Source: AH8x224w97A7/nEgOhFr66Vl0CNEoQwZ3rAnpFw7m8pOjEOsbMU7Zmtqyin/D1/W1iojWVCN2/l+1Q== X-Received: by 10.223.160.207 with SMTP id n15mr21109028wrn.25.1517694060479; Sat, 03 Feb 2018 13:41:00 -0800 (PST) Received: from zgyarmati-w530.localdomain (x55b57df3.dyn.telefonica.de. [85.181.125.243]) by smtp.gmail.com with ESMTPSA id o13sm2038121wrc.62.2018.02.03.13.40.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Feb 2018 13:40:59 -0800 (PST) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Sat, 3 Feb 2018 22:40:53 +0100 Message-Id: <1517694053-15488-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH v2] package/gpsd: add config option for Spectratime iSync and build fix patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" As in the inital 3.17 version bump patch the iSync config option was not added, the iSync driver was implicitly enabled in the gpsd config as default, and due to a bug in the gpsd build setup, this caused several autobuild issues which are fixed by this. This commit adds both the Buildroot config option and the gpsd patch which was also sent to and accepted in upstream. Fixes: http://autobuild.buildroot.net/results/555b4bdd1707aa21e6d3014e30b635c96c5efffc http://autobuild.buildroot.net/results/cfc14a2c471c63ecc4c95c12b8e00ed7656acfd2 http://autobuild.buildroot.net/results/2104e15526bd6f467f0d56dee10b5fa46e2c71dd http://autobuild.buildroot.net/results/610b3f898b396c1def682b809482408c2c4555bc ... and many more. Signed-off-by: Zoltan Gyarmati Reviewed-by: Matt Weber --- Changes v1->v2: * Add upstream commit link to build fix patch --- ...x-isync-build-when-ublox-not-selected-too.patch | 36 ++++++++++++++++++++++ package/gpsd/Config.in | 5 +++ package/gpsd/gpsd.mk | 3 ++ 3 files changed, 44 insertions(+) create mode 100644 package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch diff --git a/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch b/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch new file mode 100644 index 0000000..1dfa960 --- /dev/null +++ b/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch @@ -0,0 +1,36 @@ +From 98c8f5f4429ac3bfc09eee235fee08b9aaff8c52 Mon Sep 17 00:00:00 2001 +From: Zoltan Gyarmati +Date: Tue, 30 Jan 2018 19:58:54 -0800 +Subject: [PATCH] Fix isync build when ublox not selected too. + +The isync support uses the ublox driver, but if the ublox support is +disabled while isync is enabled, the build will fail. + + +Upstream commit: +http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=98c8f5f4429ac3bfc09eee235fee08b9aaff8c52 + +Signed-off-by: Zoltan Gyarmati +--- + SConstruct | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/SConstruct b/SConstruct +index 1c1a215..c6a309e 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -334,6 +334,11 @@ for driver in ('ashtech', + env['nmea0183'] = True + break + ++ ++# iSync uses ublox underneath, so we force to enable it ++if env['isync']: ++ env['ublox'] = True ++ + opts.Save('.scons-option-cache', env) + env.SConsignFile(".sconsign.dblite") + +-- +2.7.4 + diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 68d3e2e..d9ab7b7 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -152,6 +152,11 @@ config BR2_PACKAGE_GPSD_GPSCLOCK help GPSClock support +config BR2_PACKAGE_GPSD_ISYNC + bool "iSync" + help + Spectratime iSync LNRClok/GRCLOK support + config BR2_PACKAGE_GPSD_ITRAX bool "iTrax" help diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index e3fa20c..8c8023e 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -111,6 +111,9 @@ endif ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y) GPSD_SCONS_OPTS += gpsclock=no endif +ifneq ($(BR2_PACKAGE_GPSD_ISYNC),y) +GPSD_SCONS_OPTS += isync=no +endif ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y) GPSD_SCONS_OPTS += itrax=no endif