scripts/dtc: dtx_diff - Show real file names in diff header
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 22 Jun 2017 13:07:06 +0000 (15:07 +0200)
committerRob Herring <robh@kernel.org>
Thu, 22 Jun 2017 16:20:30 +0000 (11:20 -0500)
commit7782b1444645768f5f213eaff6994604c6c0e635
tree298709a8728072fde46d35dfbbad612c458b285c
parent7a12f459896ae1acf1d826d90b33ecff6f4508c2
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>
scripts/dtc/dtx_diff