Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1672611 > unrolled thread
| Started by | Geert Uytterhoeven <geert+renesas@glider.be> |
|---|---|
| First post | 2017-06-22 15:10 +0200 |
| Last post | 2017-06-22 18:30 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] scripts/dtc: dtx_diff - Show real file names in diff header Geert Uytterhoeven <geert+renesas@glider.be> - 2017-06-22 15:10 +0200
Re: [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header Frank Rowand <frowand.list@gmail.com> - 2017-06-22 18:00 +0200
Re: [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header Rob Herring <robh@kernel.org> - 2017-06-22 18:30 +0200
| From | Geert Uytterhoeven <geert+renesas@glider.be> |
|---|---|
| Date | 2017-06-22 15:10 +0200 |
| Subject | [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header |
| Message-ID | <tVa1Y-5aF-15@gated-at.bofh.it> |
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>
---
scripts/dtc/dtx_diff | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff
index ec47f95991a3aecc..fb86f3899e162200 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}")
--
2.7.4
[toc] | [next] | [standalone]
| From | Frank Rowand <frowand.list@gmail.com> |
|---|---|
| Date | 2017-06-22 18:00 +0200 |
| Subject | Re: [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header |
| Message-ID | <tVcGu-6LO-17@gated-at.bofh.it> |
| In reply to | #1672611 |
On 06/22/17 06:07, Geert Uytterhoeven wrote:
> 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>
> ---
> scripts/dtc/dtx_diff | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/dtc/dtx_diff b/scripts/dtc/dtx_diff
> index ec47f95991a3aecc..fb86f3899e162200 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}")
>
>
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Thanks Geert! It may look like a small change, but it is a big
usability win.
-Frank
[toc] | [prev] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2017-06-22 18:30 +0200 |
| Subject | Re: [PATCH] scripts/dtc: dtx_diff - Show real file names in diff header |
| Message-ID | <tVd9w-7bb-27@gated-at.bofh.it> |
| In reply to | #1672611 |
On Thu, Jun 22, 2017 at 03:07:06PM +0200, Geert Uytterhoeven wrote: > 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> > --- > scripts/dtc/dtx_diff | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web