From patchwork Sun Nov 1 11:47:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1391703 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.136; helo=silver.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=GhVuxqxL; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CPDf82g5Zz9sSn for ; Sun, 1 Nov 2020 22:41:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DDC062044B; Sun, 1 Nov 2020 11:41:34 +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 T73NWybF4oZ9; Sun, 1 Nov 2020 11:41:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1E68420379; Sun, 1 Nov 2020 11:41:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7412F1BF41D for ; Sun, 1 Nov 2020 11:41:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6DA6786771 for ; Sun, 1 Nov 2020 11:41: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 L+ag7TGGJ3KG for ; Sun, 1 Nov 2020 11:41:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3E1D9874A7 for ; Sun, 1 Nov 2020 11:41:16 +0000 (UTC) Received: by mail-lf1-f53.google.com with SMTP id y184so11745361lfa.12 for ; Sun, 01 Nov 2020 03:41:16 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=7IeVMaFckKENgpnxJ+QEb14WEOga7i6iyoYOLxR+Jlk=; b=GhVuxqxLShYHnenHPko0J9yUsT/Smc1qdHTcbOnY43Jc1IVg6AtNiBmNo5HzNO82T3 m3UuGgK9aqE8/H/XwDV3a3I1irQA2HCOYtQfiBf12Mg1CRRBkSlY7a/JH4kx+uQ5/284 DLyw8UBP/dkW4/FBeIc+c434RXMnSJgtjhMLKqslPGpzdo5kylyfAZnlyunFx8PV39Ba 7AgqCCPJTwF78n1dnK+exd6gYvmiJV4pzF4dzga84lkH8+utB4eXzfWCRx/51Sok3RGL loTh/F9hO4Q8au/XTCd4/Txj0GLSodrkI7vR4l2HPBIFvBtnkxQCLugMb4Ta0MFysXHF h5xQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=7IeVMaFckKENgpnxJ+QEb14WEOga7i6iyoYOLxR+Jlk=; b=bjhjjb6x+lwtXk5fXUN5xe9CIIMNVdSK47TlxaVM5MqR9029olt6L9E7zxsh26LAe+ OpdNBKMRjVjM0iOnEayYHGRTd61jlW3H3dlYaWfPF0pvnIlyajb0ba9SfVRTbbwoUovV m7keGulVcn0aNrBcRBOb+hsdPT/v4zbOdWAWN40r2lgR/vXBm751vJh25qH5eDAqVSgN FV+BUM+gT4tLEm4LwDVEnQPw6Y/ZhnIMswOQIlu3A1B/kwqzf1s4km0/qMziLez8pNiL 14ApbMS7Fvxv0yPznbYGrek2YbOkKMHFwtwnsdtcWau17pG20z8TF25bxzt1ix8M3Pmx nnYw== X-Gm-Message-State: AOAM5339qV3/hLRRDptln2a9Bz4U+QEpD+9AnovaIUUUjpEiN3tiWiW6 HdsRjZpw9og1kF7B4Cla2gt2/uMXhLU= X-Google-Smtp-Source: ABdhPJyRQek48RXiCAKFit+K7CdxO/b8osPevP7HAE9iYk1uGBUSlIiG20WmIQiMbTH8Jdi7ia98Xg== X-Received: by 2002:ac2:592c:: with SMTP id v12mr4023548lfi.492.1604230873858; Sun, 01 Nov 2020 03:41:13 -0800 (PST) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id h2sm1450174lfd.82.2020.11.01.03.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2020 03:41:13 -0800 (PST) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sun, 1 Nov 2020 14:47:11 +0300 Message-Id: <20201101114712.1696943-2-geomatsi@gmail.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201101114712.1696943-1-geomatsi@gmail.com> References: <20201101114712.1696943-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/2] package/gpsd: bump version to 3.21 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: Bernd Kuhls , Olivier Dautricourt , Sergey Matyukevich , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Olivier Dautricourt Update gpsd to latest release v3.21: - bump version - update checksums - remove patch for v3.20: it is not needed for v3.21 - remove obsolete options and add them to Config.in.legacy Signed-off-by: Olivier Dautricourt Signed-off-by: Sergey Matyukevich --- Config.in.legacy | 20 +++ ...s-during-gpsd-3.20-cross-compilation.patch | 148 ------------------ package/gpsd/Config.in | 16 -- package/gpsd/gpsd.hash | 4 +- package/gpsd/gpsd.mk | 11 +- 5 files changed, 23 insertions(+), 176 deletions(-) delete mode 100644 package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch diff --git a/Config.in.legacy b/Config.in.legacy index 9eb18907dd..59513c32b3 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,26 @@ endif comment "Legacy options removed in 2020.11" +config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED + bool "compile with fixed serial port speed" + select BR2_LEGACY + help + Since gpsd 3.20, GPSD_FIXED_PORT_SPEED is replaced + by runtime option --speed. + +config BR2_PACKAGE_GPSD_RECONFIGURE + bool "allow gpsd to change device settings" + select BR2_LEGACY + help + Since gpsd 3.21, GPSD_RECONFIGURE is replaced + by runtime option --passive. + +config BR2_PACKAGE_GPSD_CONTROLSEND + bool "allow gpsctl/gpsmon to change device settings" + select BR2_LEGACY + help + Option removed in gpsd 3.21 + config BR2_PACKAGE_OPENCV bool "opencv package was removed" select BR2_LEGACY diff --git a/package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch b/package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch deleted file mode 100644 index 7ab863d4a3..0000000000 --- a/package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 727c37ef78f2229998ac51942f5d11c754d0c6b9 Mon Sep 17 00:00:00 2001 -From: Robert Hancock -Date: Mon, 13 Jul 2020 17:33:48 -0600 -Subject: [PATCH] Fix errors during gpsd 3.20 cross-compilation - -Adapt some post-3.20 changes to the gpsd SConstruct file from the -gpsd master branch to fix issues when cross-compiling. Original -commits did not cherry-pick cleanly onto 3.20 due to other -upstream changes. - -Signed-off-by: Robert Hancock ---- - SConstruct | 81 ++++++++++++++++++++++-------------------------------- - 1 file changed, 33 insertions(+), 48 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 33e0ff326..93e8fcfea 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -386,13 +386,16 @@ env['SC_PYTHON'] = sys.executable # Path to SCons Python - # So we rely on MergeFlags/ParseFlags to do the right thing for us. - env['STRIP'] = "strip" - env['PKG_CONFIG'] = "pkg-config" --for i in ["AR", "CC", "CXX", "LD", -- "PKG_CONFIG", "STRIP", "TAR"]: -+for i in ["AR", # linker for static libs, usually "ar" -+ "CC", -+ "CXX", -+ # "LD", # scons does not use LD, usually "ld" -+ "PKG_CONFIG", -+ "SHLINK", # linker for shared libs, usually "gcc" or "g++", NOT "ld" -+ "STRIP", -+ "TAR"]: - if i in os.environ: -- j = i -- if i == "LD": -- i = "SHLINK" -- env[i] = os.getenv(j) -+ env[i] = os.getenv(i) - for i in ["ARFLAGS", "CFLAGS", "CXXFLAGS", "LDFLAGS", "SHLINKFLAGS", - "CPPFLAGS", "CCFLAGS", "LINKFLAGS"]: - if i in os.environ: -@@ -483,7 +486,7 @@ devenv = (("ADDR2LINE", "addr2line"), - ("GCCBUG", "gccbug"), - ("GCOV", "gcov"), - ("GPROF", "gprof"), -- ("LD", "ld"), -+ # ("LD", "ld"), # scons does not use LD - ("NM", "nm"), - ("OBJCOPY", "objcopy"), - ("OBJDUMP", "objdump"), -@@ -565,6 +568,22 @@ def CheckXsltproc(context): - return ret - - -+def CheckTime_t(context): -+ context.Message('Checking if sizeof(time_t) is 64 bits... ') -+ ret = context.TryLink(""" -+ #include -+ -+ int main(int argc, char **argv) { -+ static int test_array[1 - 2 * ((long int) sizeof(time_t) < 8 )]; -+ test_array[0] = 0; -+ (void) argc; (void) argv; -+ return 0; -+ } -+ """, '.c') -+ context.Result(ret) -+ return ret -+ -+ - def CheckCompilerOption(context, option): - context.Message('Checking if compiler accepts %s... ' % (option,)) - old_CFLAGS = context.env['CFLAGS'][:] # Get a *copy* of the old list -@@ -597,42 +616,6 @@ def CheckHeaderDefines(context, file, define): - return ret - - --def CheckSizeOf(context, type): -- """Check sizeof 'type'""" -- context.Message('Checking size of ' + type + '... ') -- -- program = """ --#include --#include -- --/* -- * The CheckSizeOf function does not have a way for the caller to -- * specify header files to be included to provide the type being -- * checked. As a workaround until that is remedied, include the -- * header required for time_t, which is the sole current use of this -- * function. -- */ --#include -- --int main() { -- printf("%d", (int)sizeof(""" + type + """)); -- return 0; --} --""" -- -- # compile it -- ret = context.TryCompile(program, '.c') -- if 0 == ret: -- announce('ERROR: TryCompile failed\n') -- # fall back to sizeof(time_t) is 8 -- return '8' -- -- # run it -- ret = context.TryRun(program, '.c') -- context.Result(ret[0]) -- return ret[1] -- -- - def CheckCompilerDefines(context, define): - context.Message('Checking if compiler supplies %s... ' % (define,)) - ret = context.TryLink(""" -@@ -708,8 +691,8 @@ config = Configure(env, custom_tests={ - 'CheckCompilerOption': CheckCompilerOption, - 'CheckHeaderDefines': CheckHeaderDefines, - 'CheckPKG': CheckPKG, -- 'CheckSizeOf': CheckSizeOf, - 'CheckXsltproc': CheckXsltproc, -+ 'CheckTime_t': CheckTime_t, - 'GetPythonValue': GetPythonValue, - }) - -@@ -1043,11 +1026,13 @@ else: - confdefs.append("/* #undef HAVE_%s_H */\n" - % hdr.replace("/", "_").upper()) - -- sizeof_time_t = config.CheckSizeOf("time_t") -- confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t) -- announce("sizeof(time_t) is %s" % sizeof_time_t) -- if 4 >= int(sizeof_time_t): -+ if 0 == config.CheckTime_t(): - announce("WARNING: time_t is too small. It will fail in 2038") -+ sizeof_time_t = 4 -+ else: -+ sizeof_time_t = 8 -+ -+ confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t) - - # check function after libraries, because some function require libraries - # for example clock_gettime() require librt on Linux glibc < 2.17 --- -2.18.4 - diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 3e13f1ba71..5dd57c34b8 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -60,14 +60,6 @@ config BR2_PACKAGE_GPSD_GROUP_VALUE default "nobody" depends on BR2_PACKAGE_GPSD_GROUP -config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED - bool "compile with fixed serial port speed" - -config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE - int "serial port speed" - default "9600" - depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED - config BR2_PACKAGE_GPSD_MAX_CLIENT bool "compile with limited maximum clients" @@ -84,14 +76,6 @@ config BR2_PACKAGE_GPSD_MAX_DEV_VALUE default "2" depends on BR2_PACKAGE_GPSD_MAX_DEV -config BR2_PACKAGE_GPSD_RECONFIGURE - bool "allow gpsd to change device settings" - default y - -config BR2_PACKAGE_GPSD_CONTROLSEND - bool "allow gpsctl/gpsmon to change device settings" - default y - config BR2_PACKAGE_GPSD_SQUELCH bool "squelch gpsd_report and gpsd_hexdump to save cpu" diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index af53fc05bf..b91ab16e18 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50 gpsd-3.20.tar.gz -sha256 13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b COPYING +sha256 65504c3af8d3b0cce3c07405b8815d7730d2d2be2da7d28d275f1a9c57c6fe91 gpsd-3.21.tar.gz +sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 57955b7895..62c4c611c3 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.20 +GPSD_VERSION = 3.21 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING @@ -165,12 +165,6 @@ endif ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) GPSD_SCONS_OPTS += squelch=yes endif -ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y) -GPSD_SCONS_OPTS += reconfigure=no -endif -ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y) -GPSD_SCONS_OPTS += controlsend=no -endif ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y) GPSD_SCONS_OPTS += oldstyle=no endif @@ -186,9 +180,6 @@ endif ifeq ($(BR2_PACKAGE_GPSD_GROUP),y) GPSD_SCONS_OPTS += gpsd_group=$(BR2_PACKAGE_GPSD_GROUP_VALUE) endif -ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y) -GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE) -endif ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y) GPSD_SCONS_OPTS += max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE) endif From patchwork Sun Nov 1 11:47:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1391702 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.136; helo=silver.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=IRi95qYz; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CPDf11RJgz9sSn for ; Sun, 1 Nov 2020 22:41:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AFFB52040E; Sun, 1 Nov 2020 11:41:27 +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 pzQt0j0A6SpV; Sun, 1 Nov 2020 11:41:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 39E7B20424; Sun, 1 Nov 2020 11:41:20 +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 D294B1BF41D for ; Sun, 1 Nov 2020 11:41:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CEEC387A2A for ; Sun, 1 Nov 2020 11:41:18 +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 lhhXCnBaB4S7 for ; Sun, 1 Nov 2020 11:41:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 12D2F87A28 for ; Sun, 1 Nov 2020 11:41:17 +0000 (UTC) Received: by mail-lf1-f46.google.com with SMTP id f9so13722079lfq.2 for ; Sun, 01 Nov 2020 03:41:16 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=eCFjGPnnxOQ0RtpC/0g/+Ewd1SNQAthk2c1rw35vJm4=; b=IRi95qYzfnZN5Xf8gYRhGdWTt16MKno8J+oGXOIuc5oTpvUE038mkxvFCoPgZeJgdo 9i+lhNadk1z97GtSUl1WHyZU63F6pO8WrzO4Y4dnkIkwQKj0WHLT6JtIbPI1/NU9CItK sZzfvxzBRn3COK1ACa3X00uj0zLGLhL/EKtQrxOiys9LW4cIyYArClmOYy5exxXFMJAn plHPc4CW6IZxuurfH39ps0WXAyFIP2wJw52enJgmgcdvrPKAB0QPokLX4nsB4SIO6Vzi ge4TbDvarODCLWgyGT9ORlfTrHd1je2+e3BfS6gYl6pKKnxTetGiQXWOT5O54Ffps5/o NCIw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=eCFjGPnnxOQ0RtpC/0g/+Ewd1SNQAthk2c1rw35vJm4=; b=Q2GIri4G/UF7d7ddpAeVpzEgYLX/Cx92WmYlFYIVtwE21RG+VfW6Gs+Q3IM7rWMBsm EPJdgBJ9YghPuP7zTpUj6Y5Vs595cMvNxiZh5t6NIm6v6gEdIzX+gllfc57ImQrEjsHH h4rxbnS42Y7ct9PNKEEHh9FQGW2W/3x4KflFenl/9rh5tY+ps8gdGGBFCfcc55qT6+x0 eoaKZLFMbYKHLW/LQD7V9zCu2/vqYiTHulD3kHrqpfTo9HGWJRP4TCF7PH3pB1QPOfRE 5cR6ShUMBxDY6VQ6Dxfy2itrPa6AvDAUQsB67Nv42JfqHSwDjBsmWUutJmYWZkL0eqLz Malw== X-Gm-Message-State: AOAM532yHzkqv1y+F3lGQBQiJi/ZrSkkjPx9XCHsc0TSAmjtZ3FJjVxJ u5IH5Ysmbw9agIGBrRNlG0yq6Ty5lmA= X-Google-Smtp-Source: ABdhPJzx8XpEO1QzxXSfX3WsK4YylJcvol7CPEYDFpk5m5dL5+HdDXseLSV3ViY+YYwARRUG76JRaQ== X-Received: by 2002:a05:6512:6d6:: with SMTP id u22mr3870218lff.432.1604230874844; Sun, 01 Nov 2020 03:41:14 -0800 (PST) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id h2sm1450174lfd.82.2020.11.01.03.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2020 03:41:14 -0800 (PST) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sun, 1 Nov 2020 14:47:12 +0300 Message-Id: <20201101114712.1696943-3-geomatsi@gmail.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201101114712.1696943-1-geomatsi@gmail.com> References: <20201101114712.1696943-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 2/2] package/gpsd: enable python support and modules 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: Bernd Kuhls , Olivier Dautricourt , Sergey Matyukevich , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add option that enables gpsd python support including modules, tools, and gpsfake test harness. If python is enabled then install python modules unconditionally. Note that gpsd python modules run compatibly under Python 2 and 3.x for x >= 2. So enable gpsd python support when any Python version is enabled in board configuration. If no Python is enabled, but gpsd Python support is requested, then select Python 3. Signed-off-by: Sergey Matyukevich --- package/gpsd/Config.in | 10 ++++++++++ package/gpsd/gpsd.mk | 13 ++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 5dd57c34b8..e63c3d66b9 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -79,6 +79,16 @@ config BR2_PACKAGE_GPSD_MAX_DEV_VALUE config BR2_PACKAGE_GPSD_SQUELCH bool "squelch gpsd_report and gpsd_hexdump to save cpu" +config BR2_PACKAGE_GPSD_PYTHON + bool "build Python support and modules" + depends on BR2_USE_WCHAR # python + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + help + Python libraries and tools for the gpsd service daemon including gpsfake test harness. + +comment "GPSD python support not available with toolchain w/o wide characters support" + depends on !BR2_USE_WCHAR + comment "Protocols" config BR2_PACKAGE_GPSD_AIVDM diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 62c4c611c3..8934d525e5 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -23,7 +23,6 @@ GPSD_SCONS_OPTS = \ prefix=/usr \ sysroot=$(STAGING_DIR) \ strip=no \ - python=no \ qt=no \ systemd=$(if $(BR2_INIT_SYSTEMD),yes,no) @@ -186,6 +185,18 @@ endif ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif +ifeq ($(BR2_PACKAGE_PYTHON3),y) + GPSD_SCONS_OPTS += \ + python=yes \ + python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" +else ifeq ($(BR2_PACKAGE_PYTHON),y) + GPSD_SCONS_OPTS += \ + python=yes \ + python_libdir="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" +else + GPSD_SCONS_OPTS += \ + python=no +endif GPSD_SCONS_ENV += \ LDFLAGS="$(GPSD_LDFLAGS)" \