[PATCH 1/2] python-dbus: use PACKAGECONFIG for doc generation

[PATCH 1/2] python-dbus: use PACKAGECONFIG for doc generation

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Adds 'docs' (for html doc generation) and 'api-docs' (for API doc generation)
configurations and leaves them both disabled by default. This avoids
autodetected dependency upon docutils.

Fixes [YOCTO #6530]

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/recipes-devtools/python/python-dbus_1.2.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/python/python-dbus_1.2.0.bb b/meta/recipes-devtools/python/python-dbus_1.2.0.bb
index e64f99f..b314dce 100644
--- a/meta/recipes-devtools/python/python-dbus_1.2.0.bb
+++ b/meta/recipes-devtools/python/python-dbus_1.2.0.bb
@@ -14,6 +14,10 @@ S = "${WORKDIR}/dbus-python-${PV}"
 
 inherit distutils-base autotools pkgconfig
 
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[docs] = "--enable-html-docs,--disable-html-docs,python-docutils-native"
+PACKAGECONFIG[api-docs] = "--enable-api-docs,--disable-api-docs,python-docutils-native python-epydoc-native"
+
 export BUILD_SYS
 export HOST_SYS
 
-- 
1.8.3.4

[PATCH 2/2] oe.package_manager: fix use of PACKAGE_EXCLUDE for dpkg

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

It was iterating over the variable character-by-character rather than
word-by-word.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/lib/oe/package_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index a0984c4..8be3d41 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1666,7 +1666,7 @@ class DpkgPM(PackageManager):
                 priority += 5
 
             pkg_exclude = self.d.getVar('PACKAGE_EXCLUDE', True) or ""
-            for pkg in pkg_exclude:
+            for pkg in pkg_exclude.split():
                 prefs_file.write(
                     "Package: %s\n"
                     "Pin: release *\n"
-- 
1.8.3.4