Skip to contentSkip to conversation

formfactor: fix sed expression

PATCH Superseded Andrea Adami 2 participants 4 messages Jul 11, 2012 – Jul 12, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 formfactor: fix sed expression

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

---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -2
index e888ec1..22fd9db 100644
@@ -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
 }
 
Signature · 1 line
1.7.8.6
#1 lore raw
Quoted 25 lines · Andrea Adami

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

---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -3
index e888ec1..22fd9db 100644
@@ -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
 }
 
--
Quoted 2 lines

1.7.8.6

Please withdraw this patch, v2 is following.

Andrea

#2 lore raw

PATCH v2 1/1 formfactor: fix sed expression

In reply to Andrea Adami

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

---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -3
index e888ec1..b509028 100644
@@ -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 () {
Signature · 1 line
1.7.8.6
#3 lore raw
Quoted 26 lines · 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

---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/recipes-bsp/formfactor/formfactor_0.0.bbappend index e888ec1..b509028 100644

recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -2
@@ -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

recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -0
+	sed -n 's/^[ \t]*DISPLAY_ORIENTATION[ \t]*//p' ${S}/machconfig | tr -dc

'[0-9]' > ${S}/rotation }

Quoted 1 line

do_install_append () {

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

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre