Patchwork shutdown-desktop: ensure the postinst script succeeds

login
register
mail settings
Submitter Ross Burton
Date Oct. 4, 2012, 11:37 a.m.
Message ID <1349350639-24126-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/37771/
State Accepted
Commit 8848ea6793ddaab61c9dad250ec578d68d7d087d
Headers show

Comments

Ross Burton - Oct. 4, 2012, 11:37 a.m.
When the hostname isn't qemuarm the grep fails so the postinst fails. Stop this
happening by explicitly evaluating true.

[YOCTO #3224]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Saul Wold - Oct. 5, 2012, 4:07 p.m.
On 10/04/2012 04:37 AM, Ross Burton wrote:
> When the hostname isn't qemuarm the grep fails so the postinst fails. Stop this
> happening by explicitly evaluating true.
>
> [YOCTO #3224]
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
> index d0f507e..c5096c1 100644
> --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
> +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
> @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
>   SRC_URI = "file://shutdown.desktop"
>
> +PR = "r1"
> +
>   S = "${WORKDIR}"
>
>   do_install() {
> @@ -14,7 +16,8 @@ do_install() {
>
>   pkg_postinst_${PN} () {
>       grep -q qemuarm $D${sysconfdir}/hostname && \
> -        sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
> +        sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' \
> +        || true
>   }
>
>   inherit allarch
>
Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
index d0f507e..c5096c1 100644
--- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
+++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
@@ -5,6 +5,8 @@  LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 SRC_URI = "file://shutdown.desktop"
 
+PR = "r1"
+
 S = "${WORKDIR}"
 
 do_install() {
@@ -14,7 +16,8 @@  do_install() {
 
 pkg_postinst_${PN} () {
     grep -q qemuarm $D${sysconfdir}/hostname && \
-        sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
+        sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' \
+        || true
 }
 
 inherit allarch