Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50A48C4338F for ; Wed, 28 Jul 2021 19:26:42 +0000 (UTC) Received: from smtp2.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 mail.kernel.org (Postfix) with ESMTPS id 152156103A for ; Wed, 28 Jul 2021 19:26:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 152156103A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=free.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=busybox.net Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D021B400ED; Wed, 28 Jul 2021 19:26:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I54VcnwIe94Y; Wed, 28 Jul 2021 19:26:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 5EC8840188; Wed, 28 Jul 2021 19:26:39 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 629781BF2BC for ; Wed, 28 Jul 2021 19:26:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 50F3E838FB for ; Wed, 28 Jul 2021 19:26:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=free.fr Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tXmiqPRIfD0U for ; Wed, 28 Jul 2021 19:26:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [IPv6:2a01:e0c:1:1599::11]) by smtp1.osuosl.org (Postfix) with ESMTPS id DE48D81A12 for ; Wed, 28 Jul 2021 19:26:35 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8b51:cb00:453b:e753:6c2:161c]) (Authenticated sender: yann.morin.1998@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 96A672003AE; Wed, 28 Jul 2021 21:26:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1627500393; bh=IfEWV/hZUqa2OeReKYBcLi7tt+QrK+3GpKqvpucBUPc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kHvJyQt/WDXoRvBaQ2iCYFlPa7bhdzcn+uyT+8e495D2WioEbaQAtDcLa9EIQNdSH A/q1iP6pZwzORpxaUtvfhQ8JC6OEA0mMXa7NoD9V9FQbp6uNZX/H2l8/N2K0+VQnAe cu/NAOVtjLUjahe48RcqVbXmYG1v+aYV+rsY3wCDe1hb2+wfJJdv/vlwPWE3V8PJWZ 5UdJ8KNiwCxHaUFjYAZYlDoPB2qyKtfJwlZoA4TP8QZ29WPuFcD11MkxqWoQNf7oNU HgB0KN8tm9WuEMReGDtX+qMGd3adk/F+zXuC0ML4Q78lBmITPVQEo/WT/Vv8tVciNf emSFJ128B0Qgg== Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Wed, 28 Jul 2021 21:26:23 +0200 Date: Wed, 28 Jul 2021 21:26:23 +0200 From: "Yann E. MORIN" To: Sergey Matyukevich Message-ID: <20210728192623.GD3189549@scaer> References: <20201101114712.1696943-1-geomatsi@gmail.com> <20201101114712.1696943-2-geomatsi@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201101114712.1696943-2-geomatsi@gmail.com> User-Agent: Mutt/1.5.22 (2013-10-16) Subject: Re: [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 , Thomas Petazzoni , buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Sergey, Olivier, All, On 2020-11-01 14:47 +0300, Sergey Matyukevich spake thusly: > 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 Applied to master, thanks. Regards, Yann E. MORIN. > --- > 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 > -- > 2.29.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot