diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2017-07-21 03:05:18 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-25 22:50:20 +0200 |
| commit | 1e70470545c348c21f521fa6b7b4cf707d989aad (patch) | |
| tree | 6b18b434dd5177122d4e67ae85295e8ef2ef5805 | |
| parent | 5638b10c22dc3c4ec67a4e602d38d097e8e16c69 (diff) | |
| download | buildroot-1e70470545c348c21f521fa6b7b4cf707d989aad.tar.gz buildroot-1e70470545c348c21f521fa6b7b4cf707d989aad.zip | |
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>
| -rwxr-xr-x | utils/genrandconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/genrandconfig b/utils/genrandconfig index eaca6cff8c..4ff7deb26a 100755 --- a/utils/genrandconfig +++ b/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) |
