Changes the default PACKAGE_DEBUG_SPLIT_STYLE to generate separate
source and debug packages. SDKIMAGE_FEATURES is updated to include the
source packages so that there is not change for the SDK contents.
[YOCTO #12931]
Signed-off-by: Joshua Watt <jpewhac...@gmail.com>
---
meta/classes/populate_sdk_base.bbclass | 2 +-
meta/conf/bitbake.conf | 2 ++
meta/lib/oeqa/selftest/cases/pkgdata.py | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index f2c934aaebb..80fa443e4ca 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -18,7 +18,7 @@ def complementary_globs(featurevar, d):
globs.append(glob)
return ' '.join(globs)
-SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs
${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '',
d)}"
+SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs
${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '',
d)}"
SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES",
d)}'
PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9a095e3ed04..ca9ce2d7bc0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -282,6 +282,8 @@ SOLIBSDEV = ".so"
# at least means builds aren't completely broken and symlinks don't take up
much space.
SOLIBSDEV_darwin = ".dylibbroken"
+PACKAGE_DEBUG_SPLIT_STYLE ?= "debug-with-srcpkg"
+
PACKAGE_BEFORE_PN ?= ""
PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN}"
PACKAGES_DYNAMIC = "^${PN}-locale-.*"
diff --git a/meta/lib/oeqa/selftest/cases/pkgdata.py
b/meta/lib/oeqa/selftest/cases/pkgdata.py
index 0b4caf1b2c2..38776403496 100644
--- a/meta/lib/oeqa/selftest/cases/pkgdata.py
+++ b/meta/lib/oeqa/selftest/cases/pkgdata.py
@@ -82,7 +82,7 @@ class OePkgdataUtilTests(OESelftestTestCase):
pkglist.remove('zlib-ptest') # in case ptest is disabled
except ValueError:
pass
- self.assertEqual(pkglist, ['zlib', 'zlib-dbg', 'zlib-dev', 'zlib-doc',
'zlib-staticdev'], "Packages listed after remove: %s" % result.output)
+ self.assertEqual(pkglist, ['zlib', 'zlib-dbg', 'zlib-dev', 'zlib-doc',
'zlib-src', 'zlib-staticdev'], "Packages listed after remove: %s" %
result.output)
# With recipe specified, runtime
result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r')
pkglist = sorted(result.output.split())
@@ -90,7 +90,7 @@ class OePkgdataUtilTests(OESelftestTestCase):
pkglist.remove('libz-ptest') # in case ptest is disabled
except ValueError:
pass
- self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc',
'libz-staticdev', 'libz1'], "Packages listed after remove: %s" % result.output)
+ self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc',
'libz-src', 'libz-staticdev', 'libz1'], "Packages listed after remove: %s" %
result.output)
# With recipe specified and unpackaged
result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u')
pkglist = sorted(result.output.split())
--
2.20.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
