Просмотр исходного кода

genrandconfig: fix the case when outputdir is 'output'

When outputdir is 'output' (the default), genrandconfig didn't work
correctly because it expects the configfile in outputdir, while
Buildroot puts it in the buildroot directory.

Fix this by explicitly checking if outputdir == buildrootdir/output.
Because abspath is used for both paths, string comparison works
reliably.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Arnout Vandecappelle 8 лет назад
Родитель
Сommit
1e70470545
1 измененных файлов с 4 добавлено и 1 удалено
  1. 4 1
      utils/genrandconfig

+ 4 - 1
utils/genrandconfig

@@ -354,7 +354,10 @@ def gen_config(args):
     # Write out the configuration file
     if not os.path.exists(args.outputdir):
         os.makedirs(args.outputdir)
-    configfile = os.path.join(args.outputdir, ".config")
+    if args.outputdir == os.path.abspath(os.path.join(args.buildrootdir, "output")):
+        configfile = os.path.join(args.buildrootdir, ".config")
+    else:
+        configfile = os.path.join(args.outputdir, ".config")
     with open(configfile, "w+") as configf:
         configf.writelines(configlines)