mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change default debug split to make separate source packages

Browse Source 
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]

(From OE-Core rev: 8df14b678e44cc749b361224af05ccbcfa9ae9b5)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2019-01-25 13:47:45 -06:00
committed by Richard Purdie
parent ecfe268349
commit ba3aa53112
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/populate_sdk_base.bbclass
View File

@@ -18,7 +18,7 @@ def complementary_globs(featurevar, d):
globs.append(glob) globs.append(glob)
return ' '.join(globs) 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)}' SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target" PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target"

2
meta/conf/bitbake.conf
View File

@@ -282,6 +282,8 @@ SOLIBSDEV = ".so"
# at least means builds aren't completely broken and symlinks don't take up much space. # at least means builds aren't completely broken and symlinks don't take up much space.
SOLIBSDEV_darwin = ".dylibbroken" SOLIBSDEV_darwin = ".dylibbroken"
PACKAGE_DEBUG_SPLIT_STYLE ?= "debug-with-srcpkg"
PACKAGE_BEFORE_PN ?= "" PACKAGE_BEFORE_PN ?= ""
PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
PACKAGES_DYNAMIC = "^${PN}-locale-.*" PACKAGES_DYNAMIC = "^${PN}-locale-.*"

4
meta/lib/oeqa/selftest/cases/pkgdata.py
View File

@@ -82,7 +82,7 @@ class OePkgdataUtilTests(OESelftestTestCase):
pkglist.remove('zlib-ptest') # in case ptest is disabled pkglist.remove('zlib-ptest') # in case ptest is disabled
except ValueError: except ValueError:
pass 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 # With recipe specified, runtime
result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r') result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r')
pkglist = sorted(result.output.split()) pkglist = sorted(result.output.split())
@@ -90,7 +90,7 @@ class OePkgdataUtilTests(OESelftestTestCase):
pkglist.remove('libz-ptest') # in case ptest is disabled pkglist.remove('libz-ptest') # in case ptest is disabled
except ValueError: except ValueError:
pass 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 # With recipe specified and unpackaged
result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u') result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u')
pkglist = sorted(result.output.split()) pkglist = sorted(result.output.split())