summaryrefslogtreecommitdiff
path: root/classes/package.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/package.bbclass')
-rw-r--r--classes/package.bbclass10
1 files changed, 7 insertions, 3 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index eb3a0349cb..0d6a7734af 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -177,10 +177,12 @@ runstrip() {
ro=1
chmod +w "$1"
}
- '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg"
+ mkdir $(dirname "$1")/.debug
+ debugfile="$(dirname "$1")/.debug/$(basename "$1")"
+ '${OBJCOPY}' --only-keep-debug "$1" "$debugfile"
'${STRIP}' "$1"
st=$?
- '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1"
+ '${OBJCOPY}' --add-gnu-debuglink="$debugfile" "$1"
test -n "$ro" && chmod -w "$1"
if test $st -ne 0
then
@@ -723,7 +725,7 @@ python package_do_split_locales() {
bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
}
-PACKAGEFUNCS = "do_install package_do_split_locales \
+PACKAGEFUNCS ?= " do_install package_do_split_locales \
populate_packages package_do_shlibs \
package_do_pkgconfig read_shlibdeps"
python package_do_package () {
@@ -732,6 +734,8 @@ python package_do_package () {
}
do_package[dirs] = "${D}"
+# shlibs requires any DEPENDS to have already packaged for the *.list files
+do_package[deptask] = "do_package"
populate_packages[dirs] = "${D}"
EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook
addtask package before do_build after do_populate_staging