Patchwork [4/4] dbus-ptest: Disable python module check

login
register
mail settings
Submitter Mark Hatle
Date July 15, 2013, 8:10 p.m.
Message ID <1373919029-19108-5-git-send-email-mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/53715/
State New
Headers show

Comments

Mark Hatle - July 15, 2013, 8:10 p.m.
Disable the python module check, as the host python modules are
not needed for generating the target tests.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 .../dbus/dbus-1.6.8/python-config.patch            | 25 ++++++++++++++++++++++
 meta/recipes-core/dbus/dbus-ptest_1.6.10.bb        |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
Saul Wold - July 15, 2013, 11:48 p.m.
On 07/15/2013 01:10 PM, Mark Hatle wrote:
> Disable the python module check, as the host python modules are
> not needed for generating the target tests.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
>   .../dbus/dbus-1.6.8/python-config.patch            | 25 ++++++++++++++++++++++
>   meta/recipes-core/dbus/dbus-ptest_1.6.10.bb        |  1 +
You have a patch in the dbus-1.6.8 directory for a version 1.6.10, patch 
not found!

Sau!

>   2 files changed, 26 insertions(+)
>   create mode 100644 meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
>
> diff --git a/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch b/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
> new file mode 100644
> index 0000000..2944002
> --- /dev/null
> +++ b/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
> @@ -0,0 +1,25 @@
> +When building the dbus-ptest package, we have to enable python.  However
> +checking if the host-system python has the necessary library isn't useful.
> +
> +Disable the python module check for cross compiling.
> +
> +Upstream-Status: Inappropriate [oe specific]
> +
> +Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> +
> +--- dbus-1.6.8/configure.ac.orig	2013-07-11 14:15:58.834554799 -0500
> ++++ dbus-1.6.8/configure.ac	2013-07-11 14:14:40.969554848 -0500
> +@@ -257,13 +257,6 @@
> +   # full test coverage is required, Python is a hard dependency
> +   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject])
> +   AM_PATH_PYTHON([2.6])
> +-  AC_MSG_CHECKING([for Python modules for full test coverage])
> +-  if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then
> +-    AC_MSG_RESULT([yes])
> +-  else
> +-    AC_MSG_RESULT([no])
> +-    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules])
> +-  fi
> + else
> +   # --enable-tests not given: do not abort if Python is missing
> +   AM_PATH_PYTHON([2.6], [], [:])
> diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
> index 6c0f404..a8e82ef 100644
> --- a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
> +++ b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
> @@ -14,6 +14,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
>              file://ptest.patch \
>              file://dbus-1.init  \
>              file://run-ptest \
> +           file://python-config.patch \
>              "
>
>   SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630"
>
Mark Hatle - July 16, 2013, 12:23 a.m.
On 7/15/13 6:48 PM, Saul Wold wrote:
> On 07/15/2013 01:10 PM, Mark Hatle wrote:
>> Disable the python module check, as the host python modules are
>> not needed for generating the target tests.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>>    .../dbus/dbus-1.6.8/python-config.patch            | 25 ++++++++++++++++++++++
>>    meta/recipes-core/dbus/dbus-ptest_1.6.10.bb        |  1 +
> You have a patch in the dbus-1.6.8 directory for a version 1.6.10, patch
> not found!

Sorry this was the version before I merged.. whoops.. v2 on it's way.

(And yes, I did actually verify v2 works!)

--MArk

> Sau!
>
>>    2 files changed, 26 insertions(+)
>>    create mode 100644 meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
>>
>> diff --git a/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch b/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
>> new file mode 100644
>> index 0000000..2944002
>> --- /dev/null
>> +++ b/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
>> @@ -0,0 +1,25 @@
>> +When building the dbus-ptest package, we have to enable python.  However
>> +checking if the host-system python has the necessary library isn't useful.
>> +
>> +Disable the python module check for cross compiling.
>> +
>> +Upstream-Status: Inappropriate [oe specific]
>> +
>> +Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> +
>> +--- dbus-1.6.8/configure.ac.orig	2013-07-11 14:15:58.834554799 -0500
>> ++++ dbus-1.6.8/configure.ac	2013-07-11 14:14:40.969554848 -0500
>> +@@ -257,13 +257,6 @@
>> +   # full test coverage is required, Python is a hard dependency
>> +   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject])
>> +   AM_PATH_PYTHON([2.6])
>> +-  AC_MSG_CHECKING([for Python modules for full test coverage])
>> +-  if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then
>> +-    AC_MSG_RESULT([yes])
>> +-  else
>> +-    AC_MSG_RESULT([no])
>> +-    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules])
>> +-  fi
>> + else
>> +   # --enable-tests not given: do not abort if Python is missing
>> +   AM_PATH_PYTHON([2.6], [], [:])
>> diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
>> index 6c0f404..a8e82ef 100644
>> --- a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
>> +++ b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
>> @@ -14,6 +14,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
>>               file://ptest.patch \
>>               file://dbus-1.init  \
>>               file://run-ptest \
>> +           file://python-config.patch \
>>               "
>>
>>    SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630"
>>

Patch

diff --git a/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch b/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
new file mode 100644
index 0000000..2944002
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.6.8/python-config.patch
@@ -0,0 +1,25 @@ 
+When building the dbus-ptest package, we have to enable python.  However
+checking if the host-system python has the necessary library isn't useful.
+
+Disable the python module check for cross compiling.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+--- dbus-1.6.8/configure.ac.orig	2013-07-11 14:15:58.834554799 -0500
++++ dbus-1.6.8/configure.ac	2013-07-11 14:14:40.969554848 -0500
+@@ -257,13 +257,6 @@
+   # full test coverage is required, Python is a hard dependency
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject])
+   AM_PATH_PYTHON([2.6])
+-  AC_MSG_CHECKING([for Python modules for full test coverage])
+-  if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then
+-    AC_MSG_RESULT([yes])
+-  else
+-    AC_MSG_RESULT([no])
+-    AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules])
+-  fi
+ else
+   # --enable-tests not given: do not abort if Python is missing
+   AM_PATH_PYTHON([2.6], [], [:])
diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
index 6c0f404..a8e82ef 100644
--- a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
+++ b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
@@ -14,6 +14,7 @@  SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://ptest.patch \
            file://dbus-1.init  \
            file://run-ptest \
+           file://python-config.patch \
            "
 
 SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630"