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)
committerJianxin Pan <jianxin.pan@amlogic.com>
Fri, 7 Sep 2018 08:17:07 +0000 (01:17 -0700)
commit5fd253b068c98ad826c10bd1afb655cc9ffe3eba
treec0c248c50b8ee31e63c535d371db972cc825c3ea
parentcdeeed6a6e7b33b3970925f173c021f9f7ffa424
scripts/dtc: dtx_diff - Show real file names in diff header

PD#173147: update dtc to v1.4.4

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

Change-Id: I6e070da490a8190682b7ec522e3f6746cdb651b2
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