3rd-party/linux-kernel-module-cheat
1
0
Fork 0
mirror of https://github.com/cirosantilli/linux-kernel-module-cheat.git synced 2026-01-23 02:05:57 +01:00
Code Issues Releases Wiki Activity

build-dhrystone: use copy_overlay env

Browse Source
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-11-25 00:00:01 +00:00
parent 001479a150
commit ff14f6bdcf
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-dhrystone
View File

@@ -48,7 +48,7 @@ https://cirosantilli.com/linux-kernel-module-cheat#dhrystone
] ]
+ extra_flags + extra_flags
) )
if ret == 0 and self.env['mode'] == 'userland': if ret == 0 and env['copy_overlay']:
self.sh.copy_file_if_update( self.sh.copy_file_if_update(
os.path.join(build_dir, 'dhrystone'), os.path.join(build_dir, 'dhrystone'),
os.path.join(self.env['out_rootfs_overlay_lkmc_dir'], self.root_relpath, 'dhrystone'), os.path.join(self.env['out_rootfs_overlay_lkmc_dir'], self.root_relpath, 'dhrystone'),

7
common.py
View File

@@ -946,10 +946,6 @@ Incompatible archs are skipped.
env['initarg'] = 'init' env['initarg'] = 'init'
env['quit_init'] = '{}={}'.format(env['initarg'], env['userland_quit_cmd']) 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 # Userland
env['userland_source_arch_arch_dir'] = join(env['userland_source_arch_dir'], env['arch']) env['userland_source_arch_arch_dir'] = join(env['userland_source_arch_dir'], env['arch'])
if env['in_tree']: if env['in_tree']:
@@ -957,6 +953,9 @@ Incompatible archs are skipped.
else: else:
env['userland_build_dir'] = join(env['out_dir'], 'userland', env['userland_build_id'], env['arch']) env['userland_build_dir'] = join(env['out_dir'], 'userland', env['userland_build_id'], env['arch'])
env['package'] = set(env['package']) 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. # Kernel modules.
env['kernel_modules_build_dir'] = join(env['kernel_modules_build_base_dir'], env['arch']) env['kernel_modules_build_dir'] = join(env['kernel_modules_build_base_dir'], env['arch'])