From patchwork Fri May 11 10:24:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 158473 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 67E85B6FF8 for ; Fri, 11 May 2012 20:28:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A14B4A0084; Fri, 11 May 2012 10:28:35 +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 wBbIxpays70Y; Fri, 11 May 2012 10:28:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id ED70FA012C; Fri, 11 May 2012 10:28:33 +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 73BA48F753 for ; Fri, 11 May 2012 10:28:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 638198D3F4 for ; Fri, 11 May 2012 10:28:32 +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 wW8ELxyoRAoW for ; Fri, 11 May 2012 10:28:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5A6AA8D3DE for ; Fri, 11 May 2012 10:28:30 +0000 (UTC) From: Markos Chandras To: Date: Fri, 11 May 2012 11:24:14 +0100 Message-ID: <1336731854-5526-1-git-send-email-markos.chandras@imgtec.com> X-Mailer: git-send-email 1.7.1 X-OriginalArrivalTime: 11 May 2012 10:24:39.0688 (UTC) FILETIME=[45BB4880:01CD2F60] MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01181__2012_05_11_11_28_27 Subject: [Buildroot] [PATCH] gpsd: Remove package version from the navcom patch 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net If the buildroot infrastructure finds a patch file that contains the $PKG-$VERSION tuple in the filename, it will only apply this kind of patches, ignoring the rest of the patches in the package directory. As a result of which, the gpsd-fix-libgpsmm.patch did not apply because the gpsd-2.95-navcom.patch satisfies the $PKG-$VERSION convention. The buildroot policy (as discussed during the Buildroot Developer meeting) is to remove the package version from the patch filename. Signed-off-by: Markos Chandras --- package/gpsd/gpsd-2.95-navcom.patch | 47 ----------------------------------- package/gpsd/gpsd-navcom.patch | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 package/gpsd/gpsd-2.95-navcom.patch create mode 100644 package/gpsd/gpsd-navcom.patch diff --git a/package/gpsd/gpsd-2.95-navcom.patch b/package/gpsd/gpsd-2.95-navcom.patch deleted file mode 100644 index 659cea1..0000000 --- a/package/gpsd/gpsd-2.95-navcom.patch +++ /dev/null @@ -1,47 +0,0 @@ -[PATCH] Navcom needs binary support - -Enable binary support when navcom driver is enabled, otherwise the build -errors out with: - -./libgpsd.so: undefined reference to `navcom_binary' - -If no other drivers needing binary support are enabled. - -Signed-off-by: Peter Korsgaard ---- - driver_navcom.c | 4 ++-- - gpsd.h-tail | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -Index: gpsd-2.95/driver_navcom.c -=================================================================== ---- gpsd-2.95.orig/driver_navcom.c -+++ gpsd-2.95/driver_navcom.c -@@ -44,7 +44,7 @@ - #include - #include "gpsd.h" - --#if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) -+#if defined(NAVCOM_ENABLE) - #include "bits.h" - - /* Have data which is 24 bits long */ -@@ -1339,4 +1339,4 @@ - }; - /* *INDENT-ON* */ - --#endif /* defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) */ -+#endif /* defined(NAVCOM_ENABLE) */ -Index: gpsd-2.95/gpsd.h-tail -=================================================================== ---- gpsd-2.95.orig/gpsd.h-tail -+++ gpsd-2.95/gpsd.h-tail -@@ -30,7 +30,7 @@ - #ifdef EARTHMATE_ENABLE - #define ZODIAC_ENABLE - #endif --#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) -+#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(NAVCOM_ENABLE) - #define BINARY_ENABLE - #endif - #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE) diff --git a/package/gpsd/gpsd-navcom.patch b/package/gpsd/gpsd-navcom.patch new file mode 100644 index 0000000..659cea1 --- /dev/null +++ b/package/gpsd/gpsd-navcom.patch @@ -0,0 +1,47 @@ +[PATCH] Navcom needs binary support + +Enable binary support when navcom driver is enabled, otherwise the build +errors out with: + +./libgpsd.so: undefined reference to `navcom_binary' + +If no other drivers needing binary support are enabled. + +Signed-off-by: Peter Korsgaard +--- + driver_navcom.c | 4 ++-- + gpsd.h-tail | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: gpsd-2.95/driver_navcom.c +=================================================================== +--- gpsd-2.95.orig/driver_navcom.c ++++ gpsd-2.95/driver_navcom.c +@@ -44,7 +44,7 @@ + #include + #include "gpsd.h" + +-#if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) ++#if defined(NAVCOM_ENABLE) + #include "bits.h" + + /* Have data which is 24 bits long */ +@@ -1339,4 +1339,4 @@ + }; + /* *INDENT-ON* */ + +-#endif /* defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) */ ++#endif /* defined(NAVCOM_ENABLE) */ +Index: gpsd-2.95/gpsd.h-tail +=================================================================== +--- gpsd-2.95.orig/gpsd.h-tail ++++ gpsd-2.95/gpsd.h-tail +@@ -30,7 +30,7 @@ + #ifdef EARTHMATE_ENABLE + #define ZODIAC_ENABLE + #endif +-#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) ++#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(NAVCOM_ENABLE) + #define BINARY_ENABLE + #endif + #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE)