summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-02-22 22:44:31 +0100
committerWolfram Sang <w.sang@pengutronix.de>2011-02-22 22:49:11 +0100
commit0994538abfd22de2fc0524f08b6a32a8cb04829e (patch)
treefbefa0c38ce4716b050b6f38886f0aec13c5aaca
parentcf8f9229729ebff545454934375ee0a0bf958da0 (diff)
downloadptxdist-0994538abfd22de2fc0524f08b6a32a8cb04829e.tar.gz
ptxdist-0994538abfd22de2fc0524f08b6a32a8cb04829e.tar.xz
gpsd: add comments to patches which are upstream meanwhile
They can be left out on the next version bump when the release is there. (and yes, we should have upstreamed a few of those) Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-rw-r--r--patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff3
-rw-r--r--patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff3
-rw-r--r--patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff3
-rw-r--r--patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff3
4 files changed, 12 insertions, 0 deletions
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff b/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
index a720e7d4f..4a144e09e 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
+++ b/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
@@ -15,6 +15,9 @@ python is not enabled.
Signed-off-by: FIXME
---
+
+[20110222 wsa: fixed in master meanwhile]
+
configure.ac | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff b/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
index 087bdbe92..b487ea5f0 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
+++ b/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
@@ -8,6 +8,9 @@ NMEA_ENABLE to fix this.
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
---
+
+[20110222 wsa: fixed in master meanwhile]
+
libgpsd_core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff b/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
index 771bf0ac6..5e832a24a 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
+++ b/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
@@ -12,6 +12,9 @@ I only did this quick hack. Better ideas are highly welcome.
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
---
+
+[20110222 wsa: fixed in master meanwhile. Like this.]
+
gpsdecode.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff b/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
index 126d7396b..4438e8442 100644
--- a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
+++ b/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
@@ -8,6 +8,9 @@ This fixes the following compile error:
Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
---
+
+[20110222 wsa: fixed in master meanwhile]
+
drivers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)