From patchwork Sat Mar 16 21:07:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 228253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id CF1CB2C0095 for ; Sun, 17 Mar 2013 08:08:28 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58BC3102AB6; Sat, 16 Mar 2013 21:08:12 +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 YpRag5WJOLoz; Sat, 16 Mar 2013 21:08:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9FB49102451; Sat, 16 Mar 2013 21:08:08 +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 942238F74B for ; Sat, 16 Mar 2013 21:08:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BA048BA2C for ; Sat, 16 Mar 2013 21:08:23 +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 faeuwIRWXnJK for ; Sat, 16 Mar 2013 21:08:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7E7588BD74 for ; Sat, 16 Mar 2013 21:08:21 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id hq4so1521767wib.5 for ; Sat, 16 Mar 2013 14:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=adg2nHVKWC0F+HR8cJEgD7lO/yDK3FD5q7KBle5fc/g=; b=08Ugq9VyTvWmJNL+o8djvZ1O75Edkz6ja1egP242UHtN/AmbdW8CRZMw5MzKKsdgHg Jexe0wwABq4klRLvInsU3PtAqp3Hs6e6kNtwa5BxZntoBN2P8oHLgXhTEnw9XdBMEvnR bH9EoEPZsPKiTsKPjpK+mU99K1ta1lJSwq+JNAtBMonbeGDiPWf1Nrjr/edmPSIGvXF7 5mheElOzCuA90cjQ7bo+KZnJfPIZJSWyz5NCd6ggpkkfNAmGzlLWrlC5m2Dvz/4Y8+L6 WeCmAnmfv+hFl4MZ9pJZBJUafodNVQbp0nzZGXcH77XMCJ2B1bZ/1RXKaZ5NQ9Mlm6It Lqbw== X-Received: by 10.180.83.10 with SMTP id m10mr9382884wiy.5.1363468099741; Sat, 16 Mar 2013 14:08:19 -0700 (PDT) Received: from localhost.localdomain (host-84-13-110-38.opaltelecom.net. [84.13.110.38]) by mx.google.com with ESMTPS id t7sm5213569wij.2.2013.03.16.14.08.18 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 16 Mar 2013 14:08:18 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Sat, 16 Mar 2013 21:07:13 +0000 Message-Id: <1363468033-1701-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] gpsd: add upstream patches 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 Add a couple of patches submitted by Mike Frysinger to gpsd upstream. One of these patches (that for the gpsd/dbus interface) fixes autobuild failures such as the following. http://autobuild.buildroot.net/results/41ccc838c5d44ab237a7195767940585bbb8b1f6 Note that neither of these patches has yet been accepted upstream. Signed-off-by: Simon Dawson --- package/gpsd/gpsd-03-upstream-dbus.patch | 31 ++++++++++++++++++++++++++++++ package/gpsd/gpsd-04-upstream-udev.patch | 31 ++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 package/gpsd/gpsd-03-upstream-dbus.patch create mode 100644 package/gpsd/gpsd-04-upstream-udev.patch diff --git a/package/gpsd/gpsd-03-upstream-dbus.patch b/package/gpsd/gpsd-03-upstream-dbus.patch new file mode 100644 index 0000000..2345484 --- /dev/null +++ b/package/gpsd/gpsd-03-upstream-dbus.patch @@ -0,0 +1,31 @@ +The current libgps.a logic doesn't pass down pkg-config output from +dbus and such which breaks building when compiling: + +gcc -o libgps_dbus.o -c -D_GNU_SOURCE -Wextra -Wall -Wno-uninitialized \ + -Wno-missing-field-initializers -Wcast-align -Wmissing-declarations \ + -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type \ + -O2 libgps_dbus.c +libgps_dbus.c:26:23: fatal error: dbus/dbus.h: No such file or directory +compilation terminated. + +Signed-off-by: Mike Frysinger +Signed-off-by: Simon Dawson +--- + SConstruct | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index e5d1f54..a56fa9b 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -886,7 +886,9 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs + caplibs + # linking + # The final executable will build but not be portable. + +-env.StaticLibrary(target = 'libgps.a', source = libgps_sources) ++env.StaticLibrary(target='libgps.a', ++ source=libgps_sources, ++ parse_flags=dbus_libs + rtlibs) + + # Source groups + diff --git a/package/gpsd/gpsd-04-upstream-udev.patch b/package/gpsd/gpsd-04-upstream-udev.patch new file mode 100644 index 0000000..6de058d --- /dev/null +++ b/package/gpsd/gpsd-04-upstream-udev.patch @@ -0,0 +1,31 @@ +Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR +logic when upgrading the udev path handling. + +It also slightly broke the mkdir setup by not creating the rules.d +subdir under the udev path. + +Signed-off-by: Mike Frysinger +Signed-off-by: Simon Dawson +--- + SConstruct | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SConstruct b/SConstruct +index a56fa9b..1c187f3 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1662,10 +1662,10 @@ if env['python']: + # is plugged in. + + Utility('udev-install', 'install', [ +- 'mkdir -p ' + env['udevdir'], +- 'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules', +- 'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'], +- 'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug', ++ 'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d', ++ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules', ++ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'], ++ 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug', + ]) + + Utility('udev-uninstall', '', [