From patchwork Sat Jan 4 11:08:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 306804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 871C52C00A5 for ; Sat, 4 Jan 2014 22:08:45 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6E4A788684; Sat, 4 Jan 2014 11:08:44 +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 cfwiNLMubOHr; Sat, 4 Jan 2014 11:08:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AB05A8869C; Sat, 4 Jan 2014 11:08:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5893B1BF9E7 for ; Sat, 4 Jan 2014 11:08:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 53AB48651A for ; Sat, 4 Jan 2014 11:08:42 +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 WYW7ca6+5Aq6 for ; Sat, 4 Jan 2014 11:08:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id E25C185A33 for ; Sat, 4 Jan 2014 11:08:40 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id hq4so1283229wib.8 for ; Sat, 04 Jan 2014 03:08:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=05iYWiSiBci7Ey3xCpVvoh5hcs7FnxIvSyVyx7x2fy4=; b=oNoDUmQ5p0414lUzbzUbrs2XFcFk7lU57xVOT/aIKwhBFVMGx0wElhB2E9LV95mEmf 7MhiipvbhegDHjOEmgU+YQhZHwlCYkjYavI9XiafNpVMIcztgJQPbJjJIOEXM/4kRtth p+p9iLaZdokDEe7RMXgFRPawh1UqrzheQcg6N+1B1d0wSBYsejRZFufEOk1ulnAwb/zD cbINjXPy6jFNr71RBJJ4aVI9dJOjDnfneZwEsvS8dLJf3xbA3RrXBMdeqPhURkk0AF+b U2gsNWKrUWty4l6FFMKSXh38R5OT49k4+fDtHK4OvrUZa4+55Hek8TYoQo+MW8/DOwfZ 4m8A== X-Received: by 10.180.21.143 with SMTP id v15mr5241122wie.60.1388833719478; Sat, 04 Jan 2014 03:08:39 -0800 (PST) Received: from percy.lan (host-92-24-119-175.ppp.as43234.net. [92.24.119.175]) by mx.google.com with ESMTPSA id f7sm37530768wjb.7.2014.01.04.03.08.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 04 Jan 2014 03:08:38 -0800 (PST) From: spdawson@gmail.com To: buildroot@busybox.net Date: Sat, 4 Jan 2014 11:08:36 +0000 Message-Id: <1388833716-19667-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH] gpsd: bump git snapshot X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net From: Simon Dawson The 3.11 release of gpsd still hasn't materialised. For now, bump the Git snapshot again, removing local patches that have now been merged upstream. Signed-off-by: Simon Dawson --- .../gpsd/gpsd-02-sconstruct-disable-rpath.patch | 2 +- ...bx_mode-link-error-when-reconfigure-false.patch | 48 ---------------------- ...4-gpsmon-fix-build-when-reconfigure-false.patch | 46 --------------------- .../gpsd-05-gpsmon-fix-build-when-nmea-false.patch | 46 --------------------- package/gpsd/gpsd.mk | 2 +- 5 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch delete mode 100644 package/gpsd/gpsd-04-gpsmon-fix-build-when-reconfigure-false.patch delete mode 100644 package/gpsd/gpsd-05-gpsmon-fix-build-when-nmea-false.patch diff --git a/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch index 155542d..5cbdf13 100644 --- a/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch +++ b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch @@ -13,7 +13,7 @@ diff -Nurp a/SConstruct b/SConstruct -if env["shared"]: - sysrpath = Split(_getoutput("ldconfig -v -N -X 2>/dev/null | sed -n -e '/^\//s/://p'")) - if env["libdir"] not in ["/usr/lib", "/lib"] + sysrpath: -- announce("Prepending %s to RPATH." % installdir('libdir')) +- announce("Prepending %s to RPATH." % installdir('libdir', False)) - env.Prepend(RPATH=[installdir('libdir')]) # Give deheader a way to set compiler flags diff --git a/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch b/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch deleted file mode 100644 index 1e216f8..0000000 --- a/package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch +++ /dev/null @@ -1,48 +0,0 @@ -When reconfigure is false, the link step fails as follows. - -/scratch/peko/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -o gpsd -pthread --sysroot=/scratch/peko/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot gpsd.o ntpshm.o shmexport.o dbusexport.o -L. -L/scratch/peko/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lrt -lbluetooth -ldbus-1 -lgpsd -lusb-1.0 -lbluetooth -lgps -lm -ldbus-1 -lpthread -lrt -./libgpsd.so: undefined reference to `ubx_mode' -collect2: error: ld returned 1 exit status -scons: *** [gpsd] Error 1 -scons: building terminated because of errors. - -The problem appears to be a failure to guard a call to ubx_mode with a -RECONFIGURE_ENABLE ifdef. - -Signed-off-by: Simon Dawson ---- - driver_ubx.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/driver_ubx.c b/driver_ubx.c -index d75bbf8..9554a96 100644 ---- a/driver_ubx.c -+++ b/driver_ubx.c -@@ -68,7 +68,9 @@ static gps_mask_t ubx_msg_nav_svinfo(struct gps_device_t *session, - unsigned char *buf, size_t data_len); - static void ubx_msg_sbas(struct gps_device_t *session, unsigned char *buf); - static void ubx_msg_inf(unsigned char *buf, size_t data_len, const int debug); -+#ifdef RECONFIGURE_ENABLE - static void ubx_mode(struct gps_device_t *session, int mode); -+#endif /* RECONFIGURE_ENABLE */ - - /** - * Navigation solution message -@@ -645,12 +647,14 @@ static void ubx_event_hook(struct gps_device_t *session, event_t event) - (void)ubx_write(session, UBX_CLASS_MON, 0x04, msg, 0); - /*@ +type @*/ - -+#ifdef RECONFIGURE_ENABLE - /* - * Turn off NMEA output, turn on UBX on this port. - */ - if (session->mode == O_OPTIMIZE) { - ubx_mode(session, MODE_BINARY); - } -+#endif /* RECONFIGURE_ENABLE */ - } else if (event == event_deactivate) { - /*@ -type @*/ - unsigned char msg[4] = { --- -1.8.3.2 - diff --git a/package/gpsd/gpsd-04-gpsmon-fix-build-when-reconfigure-false.patch b/package/gpsd/gpsd-04-gpsmon-fix-build-when-reconfigure-false.patch deleted file mode 100644 index bbb7cd9..0000000 --- a/package/gpsd/gpsd-04-gpsmon-fix-build-when-reconfigure-false.patch +++ /dev/null @@ -1,46 +0,0 @@ -When reconfigure is False and ncurses support is enabled, the build fails as -follows. - -gpsmon.o: In function `gpsd_write': -gpsmon.c:(.text+0xbbc): undefined reference to `monitor_dump_send' -gpsmon.o: In function `main': -gpsmon.c:(.text.startup+0xd68): undefined reference to `announce_log' -collect2: error: ld returned 1 exit status -scons: *** [gpsmon] Error 1 -scons: building terminated because of errors. - -The problem appears to be a failure to protect calls to momnitor_dump_send -and announce_log with appropriate #ifdef guards. - -Signed-off-by: Simon Dawson ---- - gpsmon.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gpsmon.c b/gpsmon.c -index 106e080..de1f14b 100644 ---- a/gpsmon.c -+++ b/gpsmon.c -@@ -632,7 +632,9 @@ ssize_t gpsd_write(struct gps_device_t *session, - const size_t len) - /* pass low-level data to devices, echoing it to the log window */ - { -+#if defined(CONTROLSEND_ENABLE) || defined(RECONFIGURE_ENABLE) - monitor_dump_send((const char *)buf, len); -+#endif /* defined(CONTROLSEND_ENABLE) || defined(RECONFIGURE_ENABLE) */ - return gpsd_serial_write(session, buf, len); - } - -@@ -823,7 +825,9 @@ static bool do_command(const char *line) - context.readonly = !context.readonly; - else - context.readonly = (atoi(line + 1) == 0); -+#ifdef RECONFIGURE_ENABLE - announce_log("[probing %sabled]", context.readonly ? "dis" : "en"); -+#endif /* RECONFIGURE_ENABLE */ - if (!context.readonly) - /* magic - forces a reconfigure */ - session.packet.counter = 0; --- -1.8.3.2 - diff --git a/package/gpsd/gpsd-05-gpsmon-fix-build-when-nmea-false.patch b/package/gpsd/gpsd-05-gpsmon-fix-build-when-nmea-false.patch deleted file mode 100644 index f0f11e8..0000000 --- a/package/gpsd/gpsd-05-gpsmon-fix-build-when-nmea-false.patch +++ /dev/null @@ -1,46 +0,0 @@ -When nmea is False and ncurses support is enabled, the build fails as -follows. - -gpsmon.o: In function `gpsmon_hook': -gpsmon.c:(.text+0x974): undefined reference to `driver_nmea0183' -collect2: error: ld returned 1 exit status -scons: *** [gpsmon] Error 1 -scons: building terminated because of errors. - -The problem appears to be a failure to protect use of the driver_nmea0183 -variable with appropriate #ifdef guards. - -Signed-off-by: Simon Dawson ---- - gpsmon.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gpsmon.c b/gpsmon.c -index 106e080..c965a3f 100644 ---- a/gpsmon.c -+++ b/gpsmon.c -@@ -36,7 +36,9 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt; - extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt; - extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt; - extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt; -+#ifdef NMEA_ENABLE - extern const struct gps_type_t driver_nmea0183; -+#endif /* NMEA_ENABLE */ - - /* These are public */ - struct gps_device_t session; -@@ -477,9 +479,11 @@ static void select_packet_monitor(struct gps_device_t *device) - */ - if (device->packet.type != last_type) { - const struct gps_type_t *active_type = device->device_type; -+#ifdef NMEA_ENABLE - if (device->packet.type == NMEA_PACKET - && ((device->device_type->flags & DRIVER_STICKY) != 0)) - active_type = &driver_nmea0183; -+#endif /* NMEA_ENABLE */ - if (!switch_type(active_type)) - longjmp(terminate, TERM_DRIVER_SWITCH); - else { --- -1.8.3.2 - diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 24b0146..efc8d37 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = a496a59c81173881900d976be35752787f4ab38c +GPSD_VERSION = b4c32aa40cff1b4e1041d5f3004e9d9156cdf96f GPSD_SITE = git://git.savannah.nongnu.org/gpsd.git GPSD_LICENSE = BSD-3c GPSD_LICENSE_FILES = COPYING