summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-01-25 13:47:45 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-28 23:14:09 +0000
commitba3aa531129186ce531c46acb68f329f6c8f376e (patch)
treec54af19a5cb1f26c769d49629f8a087d28a7fe40
parentecfe26834922861ab69602b8c1aa404080f0fb0c (diff)
downloadpoky-ba3aa531129186ce531c46acb68f329f6c8f376e.tar.gz
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] (From OE-Core rev: 8df14b678e44cc749b361224af05ccbcfa9ae9b5) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/lib/oeqa/selftest/cases/pkgdata.py4
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index f2c934aaeb..80fa443e4c 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -18,7 +18,7 @@ def complementary_globs(featurevar, d):
18 globs.append(glob) 18 globs.append(glob)
19 return ' '.join(globs) 19 return ' '.join(globs)
20 20
21SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" 21SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}"
22SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' 22SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
23 23
24PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target" 24PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index ab00ac2f06..8cb9b31f04 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -282,6 +282,8 @@ SOLIBSDEV = ".so"
282# at least means builds aren't completely broken and symlinks don't take up much space. 282# at least means builds aren't completely broken and symlinks don't take up much space.
283SOLIBSDEV_darwin = ".dylibbroken" 283SOLIBSDEV_darwin = ".dylibbroken"
284 284
285PACKAGE_DEBUG_SPLIT_STYLE ?= "debug-with-srcpkg"
286
285PACKAGE_BEFORE_PN ?= "" 287PACKAGE_BEFORE_PN ?= ""
286PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" 288PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
287PACKAGES_DYNAMIC = "^${PN}-locale-.*" 289PACKAGES_DYNAMIC = "^${PN}-locale-.*"
diff --git a/meta/lib/oeqa/selftest/cases/pkgdata.py b/meta/lib/oeqa/selftest/cases/pkgdata.py
index 0b4caf1b2c..3877640349 100644
--- a/meta/lib/oeqa/selftest/cases/pkgdata.py
+++ b/meta/lib/oeqa/selftest/cases/pkgdata.py
@@ -82,7 +82,7 @@ class OePkgdataUtilTests(OESelftestTestCase):
82 pkglist.remove('zlib-ptest') # in case ptest is disabled 82 pkglist.remove('zlib-ptest') # in case ptest is disabled
83 except ValueError: 83 except ValueError:
84 pass 84 pass
85 self.assertEqual(pkglist, ['zlib', 'zlib-dbg', 'zlib-dev', 'zlib-doc', 'zlib-staticdev'], "Packages listed after remove: %s" % result.output) 85 self.assertEqual(pkglist, ['zlib', 'zlib-dbg', 'zlib-dev', 'zlib-doc', 'zlib-src', 'zlib-staticdev'], "Packages listed after remove: %s" % result.output)
86 # With recipe specified, runtime 86 # With recipe specified, runtime
87 result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r') 87 result = runCmd('oe-pkgdata-util list-pkgs -p zlib -r')
88 pkglist = sorted(result.output.split()) 88 pkglist = sorted(result.output.split())
@@ -90,7 +90,7 @@ class OePkgdataUtilTests(OESelftestTestCase):
90 pkglist.remove('libz-ptest') # in case ptest is disabled 90 pkglist.remove('libz-ptest') # in case ptest is disabled
91 except ValueError: 91 except ValueError:
92 pass 92 pass
93 self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc', 'libz-staticdev', 'libz1'], "Packages listed after remove: %s" % result.output) 93 self.assertEqual(pkglist, ['libz-dbg', 'libz-dev', 'libz-doc', 'libz-src', 'libz-staticdev', 'libz1'], "Packages listed after remove: %s" % result.output)
94 # With recipe specified and unpackaged 94 # With recipe specified and unpackaged
95 result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u') 95 result = runCmd('oe-pkgdata-util list-pkgs -p zlib -u')
96 pkglist = sorted(result.output.split()) 96 pkglist = sorted(result.output.split())