From 549b52ed48bbe3dbc3716444a31e322a2be95851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 16 Jan 2020 00:01:17 +0100 Subject: [PATCH] instant-sysroot-target: move task copy_to_target_sysroot out of conflict zone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- classes/instant-sysroot-target.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/instant-sysroot-target.bbclass b/classes/instant-sysroot-target.bbclass index 23c3b6d..b55dc6d 100644 --- a/classes/instant-sysroot-target.bbclass +++ b/classes/instant-sysroot-target.bbclass @@ -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)}"