Skip to contentSkip to conversation

gpsd: fix Python 2.5 build failure

PATCH New spdawson at gmail.com 2 participants 2 messages Jul 30, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpsd: fix Python 2.5 build failure

From: Simon Dawson <[email protected]>

The platform.linux_distribution method was introduced in Python 2.6. Some of the Buildroot autobuilders still use Python 2.5, which is causing build failures such as the following.

http://autobuild.buildroot.net/results/045f1f69bac170d8e75cb4952a2e5b4e85a677b8/build-end.log

This patch removes the linux distribution check from the gpsd SConstruct file.

---
 ...sconstruct-python-2.5-compat-distro-check.patch |   27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch
package/gpsd/gpsd-04-sconstruct-python-2.5-compat-distro-check.patch new file +27 -0
new file mode 100644
index 0000000..767a450
@@ -0,0 +1,27 @@
+The platform.linux_distribution method was introduced in Python 2.6. Some
+of the Buildroot autobuilders still use Python 2.5, which is causing build
+failures such as the following.
+
+  http://autobuild.buildroot.net/results/045f1f69bac170d8e75cb4952a2e5b4e85a677b8/build-end.log
+
+This patch removes the linux distribution check from the gpsd SConstruct file.
+
+Signed-off-by: Simon Dawson <[email protected]>
+diff -Nurp a/SConstruct b/SConstruct
+--- a/SConstruct	2012-07-30 07:57:16.515688546 +0100
++++ b/SConstruct	2012-07-30 08:00:30.135679914 +0100
+@@ -80,14 +80,6 @@ systemd = os.path.exists("/usr/share/sys
+ 
+ # Set distribution-specific defaults here
+ imloads = True
+-if sys.platform.startswith('linux'):
+-    (distro, version, cutename) = platform.linux_distribution()
+-    if distro == 'Fedora':
+-        if int(version) >= 13:
+-            # See https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
+-            imloads = False
+-    elif os.path.exists("/etc/arch-release"):
+-        imloads = False
+ 
+ # Does our platform has a working memory-barrier instruction?
+ # The shared-memory export won't be reliable without it.
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 gpsd: fix Python 2.5 build failure

Le Mon, 30 Jul 2012 08:08:21 +0100,
spdawson at gmail.com a ?crit :

Quoted 11 lines

From: Simon Dawson <[email protected]>

The platform.linux_distribution method was introduced in Python 2.6. Some of the Buildroot autobuilders still use Python 2.5, which is causing build failures such as the following.

http://autobuild.buildroot.net/results/045f1f69bac170d8e75cb4952a2e5b4e85a677b8/build-end.log

This patch removes the linux distribution check from the gpsd SConstruct file.

Applied, thanks.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com