Skip to contentSkip to conversation

scripts/mkcompile_h: Remove trailing spaces from compiler version

PATCH Applied Antony Pavlov 2 participants 2 messages Dec 13, 2018 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/mkcompile_h: Remove trailing spaces from compiler version

This is an adoption of the linux kernel commit

| commit adcc3f7cee29eb831f79f4ac7ba6a0fbce7ac936
| Author: Jonathan Liu <[email protected]>
| 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 <[email protected]>
|    Signed-off-by: Masahiro Yamada <[email protected]>
---
 scripts/mkcompile_h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mkcompile_h +1 -1
index 1a80ef7c70..60b20cafc6 100755
@@ -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,
Signature · 7 lines
2.20.0.rc2


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw
Quoted 15 lines · Antony Pavlov

This is an adoption of the linux kernel commit

| commit adcc3f7cee29eb831f79f4ac7ba6a0fbce7ac936
| Author: Jonathan Liu <[email protected]>
| 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 <[email protected]>
|    Signed-off-by: Masahiro Yamada <[email protected]>
Quoted 4 lines
---
 scripts/mkcompile_h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

Quoted 18 lines
scripts/mkcompile_h +1 -1
index 1a80ef7c70..60b20cafc6 100755
@@ -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,
Signature · 1 line
2.20.0.rc2
Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox