Change default debug split to make separate source packages
PATCH 1/1 Change default debug split to make separate source packages
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]
--- meta/classes/populate_sdk_base.bbclass | 2 +- meta/conf/bitbake.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
meta/classes/populate_sdk_base.bbclass +1 -1
@@ -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"
meta/conf/bitbake.conf +2 -0
@@ -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-.*"
Signature · 1 line
2.20.1
Quoted 5 lines · Joshua Watt
Changes the default
PACKAGE_DEBUG_SPLIT_STYLEto generate separate source and debug packages.SDKIMAGE_FEATURESis updated to include the
source packages so that there is not change for the SDK contents.
Quoted 7 lines
[YOCTO #12931]
Signed-off-by Joshua Watt <[email protected]>--- meta/classes/populate_sdk_base.bbclass | 2 +- meta/conf/bitbake.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
Looks good, we'll need to fix
pkgdata.OePkgdataUtilTests.test_list_pkgs:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/157/steps/7/logs/step2d
Cheers,
Richard
PATCH v2 1/1 Change default debug split to make separate source packages
In reply to Joshua WattChanges 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]
--- 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(-)
meta/classes/populate_sdk_base.bbclass +1 -1
@@ -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"
meta/conf/bitbake.conf +2 -0
@@ -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-.*"
meta/lib/oeqa/selftest/cases/pkgdata.py +2 -2
@@ -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())
Signature · 1 line
2.20.1