From: Peter Kjellerstedt <peter.kjellerst...@axis.com>
The split_and_strip_files() function is big and hard to follow. This
takes a small step to improve that by splitting out the part that sets
up the variables used to implement the various debug splitting methods
specified by PACKAGE_DEBUG_SPLIT_STYLE.
Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
meta/classes/package.bbclass | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 985dfacd09..31e89ff37d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1069,17 +1069,7 @@ python fixup_perms () {
fix_perms(each_file, fs_perms_table[dir].fmode,
fs_perms_table[dir].fuid, fs_perms_table[dir].fgid, dir)
}
-python split_and_strip_files () {
- import stat, errno
- import subprocess
-
- dvar = d.getVar('PKGD')
- pn = d.getVar('PN')
- hostos = d.getVar('HOST_OS')
-
- oldcwd = os.getcwd()
- os.chdir(dvar)
-
+def package_debug_vars(d):
# We default to '.debug' style
if d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-file-directory':
# Single debug-file-directory style debug info
@@ -1117,6 +1107,23 @@ python split_and_strip_files () {
debugstaticlibdir = ""
debugsrcdir = "/usr/src/debug"
+ return (debugappend, debugstaticappend, debugdir, debugstaticdir,
+ debuglibdir, debugstaticlibdir, debugsrcdir)
+
+python split_and_strip_files () {
+ import stat, errno
+ import subprocess
+
+ dvar = d.getVar('PKGD')
+ pn = d.getVar('PN')
+ hostos = d.getVar('HOST_OS')
+
+ oldcwd = os.getcwd()
+ os.chdir(dvar)
+
+ debugappend, debugstaticappend, debugdir, debugstaticdir, \
+ debuglibdir, debugstaticlibdir, debugsrcdir = package_debug_vars(d)
+
#
# First lets figure out all of the files we may have to process ... do
this only once!
#
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161519):
https://lists.openembedded.org/g/openembedded-core/message/161519
Mute This Topic: https://lists.openembedded.org/mt/88999265/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
