[meta-handheld][PATCH] formfactor: fix sed expression

[meta-handheld][PATCH] formfactor: fix sed expression

[Andrea Adami]

* a last-minute check was added...with a missing '*'

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend
index e888ec1..22fd9db 100644
--- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,10 +1,10 @@
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 do_install_prepend () {
 	# provide machine-specific /etc/rotation for psplash
-	sed -n 's/^[ \t]DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation
+	sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation
 	printf "\n" >> ${S}/rotation
 }
 
-- 
1.7.8.6

Re: [meta-handheld][PATCH] formfactor: fix sed expression

[Andrea Adami]

On Thu, Jul 12, 2012 at 12:33 AM, Andrea Adami <andrea.adami@gmail.com> wrote:
> * a last-minute check was added...with a missing '*'
>
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
>  recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend
> index e888ec1..22fd9db 100644
> --- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
> +++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
> @@ -1,10 +1,10 @@
> -PRINC := "${@int(PRINC) + 2}"
> +PRINC := "${@int(PRINC) + 3}"
>
>  FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
>
>  do_install_prepend () {
>         # provide machine-specific /etc/rotation for psplash
> -       sed -n 's/^[ \t]DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation
> +       sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation
>         printf "\n" >> ${S}/rotation
>  }
>
> --
> 1.7.8.6
>

Please withdraw this patch, v2 is following.

Andrea

[meta-initramfs][PATCH v2] formfactor: fix sed expression

[Andrea Adami]

* a last-minute check was added...with a missing '*'
* don't add newline so we can easily test -s

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-bsp/formfactor/formfactor_0.0.bbappend
index e888ec1..b509028 100644
--- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,11 +1,10 @@
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 do_install_prepend () {
 	# provide machine-specific /etc/rotation for psplash
-	sed -n 's/^[ \t]DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation
-	printf "\n" >> ${S}/rotation
+	sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc '[0-9]' > ${S}/rotation
 }
 
 do_install_append () {
-- 
1.7.8.6

Re: [meta-initramfs][PATCH v2] formfactor: fix sed expression

[Paul Eggleton]

On Thursday 12 July 2012 01:40:50 Andrea Adami wrote:
> * a last-minute check was added...with a missing '*'
> * don't add newline so we can easily test -s
> 
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
>  recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend
> b/recipes-bsp/formfactor/formfactor_0.0.bbappend index e888ec1..b509028
> 100644
> --- a/recipes-bsp/formfactor/formfactor_0.0.bbappend
> +++ b/recipes-bsp/formfactor/formfactor_0.0.bbappend
> @@ -1,11 +1,10 @@
> -PRINC := "${@int(PRINC) + 2}"
> +PRINC := "${@int(PRINC) + 3}"
> 
>  FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> 
>  do_install_prepend () {
>  	# provide machine-specific /etc/rotation for psplash
> -	sed -n 's/^[ \t]DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc
> '[0-9]' > ${S}/rotation -	printf "\n" >> ${S}/rotation
> +	sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc
> '[0-9]' > ${S}/rotation }
> 
>  do_install_append () {

I've now merged the v2 into meta-handheld (not meta-initramfs) master, thanks.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre