[oe] [meta-oe][PATCH 2/2] fixup trailing-whitespace following warning from create-pull-request
Robert Calhoun
rcalhoun at shotspotter.com
Tue May 20 20:16:36 UTC 2014
---
...0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch | 5
++---
.../0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch | 3 +--
.../gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.patch | 7
+++----
meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 2 --
meta-oe/recipes-navigation/gpsd/supported-chipsets.inc | 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
index e557703..1328cf4 100644
---
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
@@ -62,10 +62,9 @@ index 14e2f59..47c5753 100644
python_env.AddPostAction(python_extensions_install, '$STRIP
$TARGET')
+ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s"
"$TARGET"' \
+ % (python_lib_dir, ))
-
+
python_modules_install = python_env.Install( DESTDIR +
python_module_dir,
python_modules)
---
+--
1.7.8.5
-
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
index 06dd6e7..a6a9376 100644
---
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
@@ -25,6 +25,5 @@ index 14e2f59..47c5753 100644
# splint does not know about multi-arch, work around that
ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH')
if ma_status == 0:
---
+--
1.7.5.4
-
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
index 83b98bb..a3e8bdb 100644
---
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
@@ -24,7 +24,7 @@ index a1bddb9..3e7c607 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1205,8 +1205,11 @@ if qt_env:
-
+
# We don't use installdir here in order to avoid having DESTDIR affect
the rpath
if env["shared"] and env["chrpath"]:
- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
@@ -34,9 +34,8 @@ index a1bddb9..3e7c607 100644
+ % (installdir('libdir', False), ))
+ else:
+ env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"')
-
+
if not env['debug'] and not env['profiling'] and env['strip']:
env.AddPostAction(binaryinstall, '$STRIP $TARGET')
---
+--
1.7.5.4
-
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
index 715b5a7..55e59d3 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
@@ -11,5 +11,3 @@ PR = "r1"
SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3"
SRC_URI[sha256sum] =
"706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320"
-
-
diff --git a/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
b/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
index dee898b..90eaa49 100644
--- a/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
+++ b/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
@@ -25,4 +25,3 @@ PACKAGECONFIG += "tnt"
PACKAGECONFIG += "tripmate"
PACKAGECONFIG += "tsip"
PACKAGECONFIG += "ublox"
-
--
1.9.1
More information about the Openembedded-devel
mailing list