From ee18912759d170e1f926bc1a234dba781a98fbdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 26 Mar 2015 14:33:35 +0100
Subject: Setup oldconfig to yes to all

In generated .config file are missing all non bool/tri state configs (except those from defconfig).
This solution is only temporally.
This way configuration never fails.
---
 scripts/exceptions.py |  6 ------
 scripts/initialize.py |  2 +-
 scripts/kernel.py     | 20 ++++++--------------
 3 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'scripts')

diff --git a/scripts/exceptions.py b/scripts/exceptions.py
index 68fef59..722c44a 100644
--- a/scripts/exceptions.py
+++ b/scripts/exceptions.py
@@ -19,9 +19,3 @@ class PhaseMismatch(Exception):
 		pass
 	def __str__(self):
 		return "Phase in " + conf.phase_file + " is unknown."
-
-class KernelConfigFailed(Exception):
-	def __init__(self):
-		pass
-	def __str__(self):
-		return "Kernel configuration failed."
diff --git a/scripts/initialize.py b/scripts/initialize.py
index 951834a..66236e5 100644
--- a/scripts/initialize.py
+++ b/scripts/initialize.py
@@ -24,7 +24,7 @@ def kconfig_parser():
 
 def gen_requred():
 	"Generates required depenpency from required file."
-	utils.build_symbol_map()
+	utils.build_symbol_map() # Ensure smap existence
 	srmap = {value:key for key, value in utils.smap.items()}
 
 	try:
diff --git a/scripts/kernel.py b/scripts/kernel.py
index 76255d0..58e3287 100644
--- a/scripts/kernel.py
+++ b/scripts/kernel.py
@@ -4,26 +4,18 @@ import subprocess
 
 from conf import conf
 import utils
-from exceptions import KernelConfigFailed
 
 def config():
 	# Executing old linux config
 	env = dict(os.environ)
 	wd = os.getcwd()
 	os.chdir(conf.linux_sources)
-	sprc = subprocess.Popen(['make', 'oldconfig'], stdout=subprocess.PIPE, env=utils.get_kernel_env())
-	while True:
-		line = sprc.stdout.readline()
-		if line != '':
-			if b'Restart config' in line:
-				sprc.terminate()
-				raise KernelConfigFailed()
-				break
-			else:
-				if conf.kernel_config_output:
-					print(line.decode('utf-8'), end="")
-		else:
-			break
+	if conf.kernel_config_output:
+		sprc = subprocess.call('yes "" | make oldconfig', shell=True,
+			env=utils.get_kernel_env())
+	else:
+		sprc = subprocess.call('yes "" | make oldconfig', shell=True,
+			stdout=subprocess.DEVNULL, env=utils.get_kernel_env())
 	os.chdir(wd)
 
 def make():
-- 
cgit v1.2.3