aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2015-05-13 18:46:36 +0200
committerKarel Kočí <cynerd@email.cz>2015-05-13 18:46:36 +0200
commit0a29552ec44690db86e684713559e3a262616534 (patch)
tree87ed2c656b82f0acdb7ff9d962ac3021a5fc8426 /scripts
parent536976d60c8417d901b7a0f4b1182e52790e499f (diff)
downloadlinux-conf-perf-0a29552ec44690db86e684713559e3a262616534.tar.gz
linux-conf-perf-0a29552ec44690db86e684713559e3a262616534.tar.bz2
linux-conf-perf-0a29552ec44690db86e684713559e3a262616534.zip
Add kernel_env setting
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kernel.py7
-rw-r--r--scripts/utils.py4
2 files changed, 4 insertions, 7 deletions
diff --git a/scripts/kernel.py b/scripts/kernel.py
index 994d5cf..4494f22 100644
--- a/scripts/kernel.py
+++ b/scripts/kernel.py
@@ -39,9 +39,8 @@ def make():
wd = os.getcwd()
os.chdir(sf(conf.linux_sources))
if conf.kernel_make_output:
- subprocess.call(['make'] + conf.linux_make_args,
- env=utils.get_kernel_env())
+ subprocess.call(build_command, env=utils.get_kernel_env())
else:
- subprocess.call(['make'] + conf.linux_make_args,
- stdout=subprocess.DEVNULL, env=utils.get_kernel_env())
+ subprocess.call(build_command, stdout=subprocess.DEVNULL,
+ env=utils.get_kernel_env())
os.chdir(wd)
diff --git a/scripts/utils.py b/scripts/utils.py
index 0c10553..0b6ac9c 100644
--- a/scripts/utils.py
+++ b/scripts/utils.py
@@ -83,9 +83,7 @@ def callsubprocess(process_name, process, show_output = True, regular = "",
def get_kernel_env():
env = dict(os.environ)
- env['SRCARCH'] = conf.SRCARCH
- env['ARCH'] = conf.ARCH
- env['KERNELVERSION'] = 'KERNELVERSION' # hides error
+ env.update(conf.kernel_env)
return env