Remove DISTRO_TYPE, replacing with IMAGE_FEATURES. Documentation is in local.conf.sample

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1053 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 46 insertions, 43 deletions

diff --git a/meta/packages/tasks/task-oh-sdk.bb b/meta/packages/tasks/task-oh-sdk.bb
index a142816306..ac3aaec746 100644
--- a/meta/packages/tasks/task-oh-sdk.bb
+++ b/meta/packages/tasks/task-oh-sdk.bb
@@ -1,10 +1,13 @@
 DESCRIPTON = "Software Development Tasks for OpenedHand Poky"
-PR = "r11"
+PR = "r12"
 DEPENDS = "task-oh"
 ALLOW_EMPTY = "1"
-PACKAGEFUNCS =+ 'generate_sdk_pkgs'
+#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
-PACKAGES = "task-oh-sdk"
+PACKAGES = "\
+    task-oh-sdk \
+    task-oh-sdk-dbg \
+    task-oh-sdk-dev"
 
 RDEPENDS_task-oh-sdk = "\
     autoconf \
@@ -19,43 +22,43 @@ RDEPENDS_task-oh-sdk = "\
     pkgconfig \
     distcc"
 
-python generate_sdk_pkgs () {
-    ohpkgs = read_pkgdata('task-oh', d)['PACKAGES']
-    pkgs = bb.data.getVar('PACKAGES', d, 1).split()
-    for pkg in ohpkgs.split():
-        newpkg = pkg.replace('task-oh', 'task-oh-sdk')
-
-        # for each of the task packages, add a corresponding sdk task
-        pkgs.append(newpkg)
-
-        # for each sdk task, take the rdepends of the non-sdk task, and turn
-        # that into rrecommends upon the -dev versions of those, not unlike
-        # the package depchain code
-        spkgdata = read_subpkgdata(pkg, d)
-
-        rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '')
-        rreclist = []
-
-        for depend in rdepends:
-            split_depend = depend.split(' (')
-            name = split_depend[0].strip()
-            if packaged('%s-dev' % name, d):
-                rreclist.append('%s-dev' % name)
-            else:
-                deppkgdata = read_subpkgdata(name, d)
-                rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '')
-                for depend in rdepends2:
-                    split_depend = depend.split(' (')
-                    name = split_depend[0].strip()
-                    if packaged('%s-dev' % name, d):
-                        rreclist.append('%s-dev' % name)
-
-            oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or ''
-            bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d)
-            # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d)))
-
-    # bb.note('pkgs is %s' % pkgs)
-    bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
-}
-
-PACKAGES_DYNAMIC = "task-oh-sdk-*"
+#python generate_sdk_pkgs () {
+#    ohpkgs = read_pkgdata('task-oh', d)['PACKAGES']
+#    pkgs = bb.data.getVar('PACKAGES', d, 1).split()
+#    for pkg in ohpkgs.split():
+#        newpkg = pkg.replace('task-oh', 'task-oh-sdk')
+#
+#        # for each of the task packages, add a corresponding sdk task
+#        pkgs.append(newpkg)
+#
+#        # for each sdk task, take the rdepends of the non-sdk task, and turn
+#        # that into rrecommends upon the -dev versions of those, not unlike
+#        # the package depchain code
+#        spkgdata = read_subpkgdata(pkg, d)
+#
+#        rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '')
+#        rreclist = []
+#
+#        for depend in rdepends:
+#            split_depend = depend.split(' (')
+#            name = split_depend[0].strip()
+#            if packaged('%s-dev' % name, d):
+#                rreclist.append('%s-dev' % name)
+#            else:
+#                deppkgdata = read_subpkgdata(name, d)
+#                rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '')
+#                for depend in rdepends2:
+#                    split_depend = depend.split(' (')
+#                    name = split_depend[0].strip()
+#                    if packaged('%s-dev' % name, d):
+#                        rreclist.append('%s-dev' % name)
+#
+#            oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or ''
+#            bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d)
+#            # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d)))
+#
+#    # bb.note('pkgs is %s' % pkgs)
+#    bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
+#}
+#
+#PACKAGES_DYNAMIC = "task-oh-sdk-*"