public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH] u-boot-script: Handle quoted --append bootloader parameter
@ 2018-09-03  8:02 Jan Kiszka
  2018-09-06 20:46 ` Maxim Yu. Osipov
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2018-09-03  8:02 UTC (permalink / raw)
  To: isar-users

We only supported a single parameter value for --append so far and broke
if the user put multiples under quotes.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
index 490c306..da8dca5 100644
--- a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
+++ b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
@@ -33,8 +33,8 @@ do_install() {
 	# to the packaged /etc/default/u-boot-script.
 	if [ -n ${WKS_PATH} ]; then
 		APPEND=$(grep "^bootloader " ${WKS_PATH} | \
-			 sed 's/.* --append=\([^ $]*\).*/\1/')
-		sed -i 's|\(^KERNEL_ARGS_APPEND=\).*|\1'${APPEND}'|' \
+			 sed 's/.* --append=\(".*"\|[^ $]*\).*/\1/')
+		sed -i 's|\(^KERNEL_ARGS_APPEND=\).*|\1'"${APPEND}"'|' \
 			${WORKDIR}/u-boot-script
 	fi
 
-- 
2.16.4

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] u-boot-script: Handle quoted --append bootloader parameter
  2018-09-03  8:02 [PATCH] u-boot-script: Handle quoted --append bootloader parameter Jan Kiszka
@ 2018-09-06 20:46 ` Maxim Yu. Osipov
  0 siblings, 0 replies; 2+ messages in thread
From: Maxim Yu. Osipov @ 2018-09-06 20:46 UTC (permalink / raw)
  To: Jan Kiszka, isar-users

On 09/03/2018 10:02 AM, Jan Kiszka wrote:
> We only supported a single parameter value for --append so far and broke
> if the user put multiples under quotes.

Applied to the 'next',

Thanks,
Maxim.

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
> index 490c306..da8dca5 100644
> --- a/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
> +++ b/meta/recipes-bsp/u-boot-script/u-boot-script_1.0.bb
> @@ -33,8 +33,8 @@ do_install() {
>   	# to the packaged /etc/default/u-boot-script.
>   	if [ -n ${WKS_PATH} ]; then
>   		APPEND=$(grep "^bootloader " ${WKS_PATH} | \
> -			 sed 's/.* --append=\([^ $]*\).*/\1/')
> -		sed -i 's|\(^KERNEL_ARGS_APPEND=\).*|\1'${APPEND}'|' \
> +			 sed 's/.* --append=\(".*"\|[^ $]*\).*/\1/')
> +		sed -i 's|\(^KERNEL_ARGS_APPEND=\).*|\1'"${APPEND}"'|' \
>   			${WORKDIR}/u-boot-script
>   	fi
>   
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-09-06 20:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-03  8:02 [PATCH] u-boot-script: Handle quoted --append bootloader parameter Jan Kiszka
2018-09-06 20:46 ` Maxim Yu. Osipov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox