aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lutomirski <luto@kernel.org>2019-10-02 10:20:11 -0700
committerGitHub <noreply@github.com>2019-10-02 10:20:11 -0700
commit49043d5fb2115818439490757ffe302fa3b7dcea (patch)
tree8bfe16847c7172f8f0494b0d02c976de18595890
parent6e73caa827631b3b32f589c6a5670889784469e9 (diff)
parent9e7632d635cbbed509c3d4061ded81c3f14483e9 (diff)
downloadvirtme-49043d5fb2115818439490757ffe302fa3b7dcea.tar.gz
Merge pull request #48 from haggaie/master
configkernel: Work in kernel build directories and not just source dirs
-rw-r--r--virtme/commands/configkernel.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/virtme/commands/configkernel.py b/virtme/commands/configkernel.py
index 82379d2..f7393aa 100644
--- a/virtme/commands/configkernel.py
+++ b/virtme/commands/configkernel.py
@@ -91,8 +91,9 @@ _GENERIC_CONFIG = [
def main():
args = _ARGPARSER.parse_args()
- if not os.path.isfile('scripts/kconfig/merge_config.sh'):
- print('virtme-configkernel must be run in a kernel source directory')
+ if not os.path.isfile('scripts/kconfig/merge_config.sh') and \
+ not os.path.isfile('source/scripts/kconfig/merge_config.sh'):
+ print('virtme-configkernel must be run in a kernel source/build directory')
return 1
arch = architectures.get(args.arch)