Patchwork [RFC,1/1] package.bbclass, task.bbclass: Allow doc-pkgs in EXTRA_IMAGE_FEATURES

login
register
mail settings
Submitter Jason Wessel
Date June 17, 2012, 1:44 a.m.
Message ID <1339897451-2605-2-git-send-email-jason.wessel@windriver.com>
Download mbox | patch
Permalink /patch/29995/
State New
Headers show

Comments

Jason Wessel - June 17, 2012, 1:44 a.m.
The doc-pkgs package group is defined, but some of the "plumbing" is
missing to allow it to work like the dbg-pkgs and dev-pkgs.  This
patch adds the "plumbing" to allow you to specify doc-pkgs to install
all the documentation packages that correspond to the other installed
packages on the target file system in a similar manner to the dbg-pkgs.

[Yocto #2614]

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
 meta/classes/package.bbclass              |    4 ++++
 meta/classes/task.bbclass                 |    2 +-
 meta/conf/bitbake.conf                    |    2 +-
 meta/recipes-core/tasks/task-core-boot.bb |    1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 10c2f0a..3145f88 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1616,6 +1616,8 @@  python package_depchains() {
 				depend = depend.replace('-dev', '')
 			if depend.endswith('-dbg'):
 				depend = depend.replace('-dbg', '')
+			if depend.endswith('-doc'):
+				depend = depend.replace('-doc', '')
 			pkgname = getname(depend, suffix)
 			#bb.note("Adding %s for %s" % (pkgname, depend))
 			if pkgname not in rreclist:
@@ -1637,6 +1639,8 @@  python package_depchains() {
 				depend = depend.replace('-dev', '')
 			if depend.endswith('-dbg'):
 				depend = depend.replace('-dbg', '')
+			if depend.endswith('-doc'):
+				depend = depend.replace('-doc', '')
 			pkgname = getname(depend, suffix)
 			#bb.note("Adding %s for %s" % (pkgname, depend))
 			if pkgname not in rreclist:
diff --git a/meta/classes/task.bbclass b/meta/classes/task.bbclass
index 22c2fd3..0704b42 100644
--- a/meta/classes/task.bbclass
+++ b/meta/classes/task.bbclass
@@ -20,7 +20,7 @@  python () {
     packages = d.getVar('PACKAGES', True).split()
     genpackages = []
     for pkg in packages:
-        for postfix in ['-dbg', '-dev']:
+        for postfix in ['-dbg', '-dev', '-doc']:
             genpackages.append(pkg+postfix)
     d.setVar('PACKAGES', ' '.join(packages+genpackages))
 }
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 97930a7..f60aafe 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -233,7 +233,7 @@  HOMEPAGE = "unknown"
 # Ensure that -dev packages recommend the corresponding -dev packages of their
 # deps, and the same for -dbg.
 DEPCHAIN_PRE  = ""
-DEPCHAIN_POST = "-dev -dbg"
+DEPCHAIN_POST = "-dev -dbg -doc"
 
 DEPENDS = ""
 RDEPENDS = ""
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 6487436..7ca2098 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -28,6 +28,7 @@  PACKAGES = "\
     task-core-boot \
     task-core-boot-dbg \
     task-core-boot-dev \
+    task-core-boot-doc \
 "
 
 RDEPENDS_task-core-boot = "\