Patchwork bootimg bbclass: quoting fixes

login
register
mail settings
Submitter Koen Kooi
Date Feb. 28, 2012, 3:50 p.m.
Message ID <1330444215-14321-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/22349/
State New
Headers show

Comments

Koen Kooi - Feb. 28, 2012, 3:50 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/bootimg.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - Feb. 28, 2012, 4:48 p.m.
On 02/28/2012 07:50 AM, Koen Kooi wrote:
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   meta/classes/bootimg.bbclass |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
> index 1d1a3d0..c4a4c2a 100644
> --- a/meta/classes/bootimg.bbclass
> +++ b/meta/classes/bootimg.bbclass
> @@ -35,8 +35,8 @@ ISODIR = "${S}/iso"
>   BOOTIMG_VOLUME_ID   ?= "boot"
>   BOOTIMG_EXTRA_SPACE ?= "512"
>
> -EFI = ${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}
> -EFI_CLASS = ${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}
> +EFI = '${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}'
> +EFI_CLASS = '${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}'
>
>   # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
>   # contain "efi". This way legacy is supported by default if neither is
This actually needs more changes, see my patch.

Sau!
Koen Kooi - Feb. 28, 2012, 5:04 p.m.
Op 28 feb. 2012, om 17:48 heeft Saul Wold het volgende geschreven:

> On 02/28/2012 07:50 AM, Koen Kooi wrote:
>> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
>> ---
>>  meta/classes/bootimg.bbclass |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
>> index 1d1a3d0..c4a4c2a 100644
>> --- a/meta/classes/bootimg.bbclass
>> +++ b/meta/classes/bootimg.bbclass
>> @@ -35,8 +35,8 @@ ISODIR = "${S}/iso"
>>  BOOTIMG_VOLUME_ID   ?= "boot"
>>  BOOTIMG_EXTRA_SPACE ?= "512"
>> 
>> -EFI = ${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}
>> -EFI_CLASS = ${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}
>> +EFI = '${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}'
>> +EFI_CLASS = '${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}'
>> 
>>  # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
>>  # contain "efi". This way legacy is supported by default if neither is
> This actually needs more changes, see my patch.

Indeed, I resorted to using 'rm' for fix quoting issues :)

Patch

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 1d1a3d0..c4a4c2a 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -35,8 +35,8 @@  ISODIR = "${S}/iso"
 BOOTIMG_VOLUME_ID   ?= "boot"
 BOOTIMG_EXTRA_SPACE ?= "512"
 
-EFI = ${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}
-EFI_CLASS = ${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}
+EFI = '${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}'
+EFI_CLASS = '${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)}'
 
 # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
 # contain "efi". This way legacy is supported by default if neither is