diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-06-22 15:07:06 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-06-22 11:20:30 -0500 |
| commit | 7782b1444645768f5f213eaff6994604c6c0e635 (patch) | |
| tree | 298709a8728072fde46d35dfbbad612c458b285c | |
| parent | 7a12f459896ae1acf1d826d90b33ecff6f4508c2 (diff) | |
| download | linux-7782b1444645768f5f213eaff6994604c6c0e635.tar.bz2 | |
scripts/dtc: dtx_diff - Show real file names in diff header
As the comparison uses process substitution to pass files after
conversion to DTS format, the diff header doesn't show the real
filenames, but the names of the file descriptors used:
--- /dev/fd/63 2017-06-22 11:21:47.531637188 +0200
+++ /dev/fd/62 2017-06-22 11:21:47.531637188 +0200
This is especially annoying when comparing a bunch of DT files in a
loop, as the output doesn't show a clue about which files it refers to.
Fix this by explicitly passing the original file names to the diff
command using the --label option, giving e.g.:
--- arch/arm/boot/dts/r8a7791-koelsch.dtb
+++ arch/arm/boot/dts/r8a7791-porter.dtb
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rwxr-xr-x | scripts/dtc/dtx_diff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff index ec47f95991a3..fb86f3899e16 100755 --- a/scripts/dtc/dtx_diff +++ b/scripts/dtc/dtx_diff @@ -338,7 +338,7 @@ DTC="${DTC} ${dtc_flags} -O dts -qq -f ${dtc_sort} -o -" if (( ${cmd_diff} )) ; then - diff ${diff_flags} \ + diff ${diff_flags} --label "${dtx_file_1}" --label "${dtx_file_2}" \ <(compile_to_dts "${dtx_file_1}") \ <(compile_to_dts "${dtx_file_2}") |