Re: [PATCH] scripts/mkcompile_h: Remove trailing spaces from compiler version

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Dec 13, 2018 at 09:34:08AM +0300, Antony Pavlov wrote:
> This is an adoption of the linux kernel commit
> 
> | commit adcc3f7cee29eb831f79f4ac7ba6a0fbce7ac936
> | Author: Jonathan Liu <net147@xxxxxxxxx>
> | Date:   Mon Jun 12 18:23:17 2017 +1000
> |
> |    scripts/mkcompile_h: Remove trailing spaces from compiler version
> |
> |    Improves the output of "cat /proc/version" by getting rid of the
> |    trailing space at the end of the compiler version when the kernel
> |    is compiled using GCC.
> |
> |    Signed-off-by: Jonathan Liu <net147@xxxxxxxxx>
> |    Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> 
> Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx>
> ---
>  scripts/mkcompile_h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
> index 1a80ef7c70..60b20cafc6 100755
> --- a/scripts/mkcompile_h
> +++ b/scripts/mkcompile_h
> @@ -72,7 +72,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
>    echo \#define BAREBOX_COMPILE_BY \"`echo $BAREBOX_COMPILE_BY | $UTS_TRUNCATE`\"
>    echo \#define BAREBOX_COMPILE_HOST \"`echo $BAREBOX_COMPILE_HOST | $UTS_TRUNCATE`\"
>  
> -  echo \#define BAREBOX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
> +  echo \#define BAREBOX_COMPILER \"`$CC -v 2>&1 | grep ' version ' | sed 's/[[:space:]]*$//'`\"
>  ) > .tmpcompile
>  
>  # Only replace the real compile.h if the new one is different,
> -- 
> 2.20.0.rc2
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox



[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux