From ff14f6bdcfc80feb98b9992da2c626100c13e1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Mon, 25 Nov 2019 00:00:01 +0000 Subject: [PATCH] build-dhrystone: use copy_overlay env --- build-dhrystone | 2 +- common.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-dhrystone b/build-dhrystone index aa82891..c32f8e9 100755 --- a/build-dhrystone +++ b/build-dhrystone @@ -48,7 +48,7 @@ https://cirosantilli.com/linux-kernel-module-cheat#dhrystone ] + extra_flags ) - if ret == 0 and self.env['mode'] == 'userland': + if ret == 0 and env['copy_overlay']: self.sh.copy_file_if_update( os.path.join(build_dir, 'dhrystone'), os.path.join(self.env['out_rootfs_overlay_lkmc_dir'], self.root_relpath, 'dhrystone'), diff --git a/common.py b/common.py index 6b62110..93f3f3b 100644 --- a/common.py +++ b/common.py @@ -946,10 +946,6 @@ Incompatible archs are skipped. env['initarg'] = 'init' env['quit_init'] = '{}={}'.format(env['initarg'], env['userland_quit_cmd']) - if not env['_args_given']['copy_overlay']: - if self.env['in_tree'] or self.env['static']: - env['copy_overlay'] = False - # Userland env['userland_source_arch_arch_dir'] = join(env['userland_source_arch_dir'], env['arch']) if env['in_tree']: @@ -957,6 +953,9 @@ Incompatible archs are skipped. else: env['userland_build_dir'] = join(env['out_dir'], 'userland', env['userland_build_id'], env['arch']) env['package'] = set(env['package']) + if not env['_args_given']['copy_overlay']: + if self.env['in_tree'] or self.env['static']: + env['copy_overlay'] = False # Kernel modules. env['kernel_modules_build_dir'] = join(env['kernel_modules_build_base_dir'], env['arch'])