build-buildroot: only cat EOF configs once

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2018-10-28 00:00:04 +00:00
parent 8dd6019333
commit 3ae614cba4

View File

@@ -91,11 +91,11 @@ usually extra Buildroot targets.
'BR2_JLEVEL={}'.format(args.nproc), 'BR2_JLEVEL={}'.format(args.nproc),
'BR2_DL_DIR="{}"'.format(common.buildroot_download_dir), 'BR2_DL_DIR="{}"'.format(common.buildroot_download_dir),
]) ])
common.write_configs(common.buildroot_config_file, configs)
if not args.build_linux: if not args.build_linux:
configs.extend([ configs.extend([
'# BR2_LINUX_KERNEL is not set', '# BR2_LINUX_KERNEL is not set',
]) ])
config_fragments = []
if not args.baseline: if not args.baseline:
configs.extend([ configs.extend([
'BR2_GLOBAL_PATCH_DIR="{}"'.format( 'BR2_GLOBAL_PATCH_DIR="{}"'.format(
@@ -120,15 +120,15 @@ usually extra Buildroot targets.
config_fragments = [ config_fragments = [
os.path.join(common.root_dir, 'buildroot_config', 'default') os.path.join(common.root_dir, 'buildroot_config', 'default')
] + args.config_fragment ] + args.config_fragment
common.write_configs(common.buildroot_config_file, configs, config_fragments) common.write_configs(common.buildroot_config_file, configs, config_fragments)
common.run_cmd( common.run_cmd(
[ [
'make', 'make',
'O={}'.format(common.buildroot_build_dir), 'O={}'.format(common.buildroot_build_dir),
'olddefconfig', 'olddefconfig',
], ],
cwd=common.buildroot_src_dir, cwd=common.buildroot_src_dir,
) )
common.make_build_dirs() common.make_build_dirs()
if not args.no_all: if not args.no_all:
extra_make_args.append('all') extra_make_args.append('all')