zepto-forks/meta-mortsgna
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

instant-sysroot-target: move task copy_to_target_sysroot out of conflict zone

Browse Source 
First results from scratch showed that previous commit did not work and set
copy_to_target_sysroot at a very early position beginning.

With default PACKAGE_CLASSES = "package_ipk" (no package_deb / package_rpm)
task order looks as expected without bb.utils.contains-dance

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-01-16 00:01:17 +01:00
parent 0cf33d763e
commit 549b52ed48
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/instant-sysroot-target.bbclass
View File

@@ -173,7 +173,7 @@ do_copy_to_target_sysroot() {
fi
}
addtask copy_to_target_sysroot after bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'do_package_write_deb', '', d) bb.utils.contains('PACKAGE_CLASSES', 'package_ipk', 'do_package_write_ipk', '', d) bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', 'do_package_write_rpm', '', d) before do_build
addtask copy_to_target_sysroot after do_package_write_deb do_package_write_ipk do_package_write_rpm before do_build
# same as do package
do_copy_to_target_sysroot[vardeps] = "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"