From: Ross Burton <ross.burton@intel.com>
Date: Thu, 4 Oct 2012 11:37:19 +0000 (+0100)
Subject: shutdown-desktop: ensure the postinst script succeeds
X-Git-Tag: rev_ivi_2015_02_04~15244
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae8ccde6d37a920f9f5b00e12b1464e812136492;p=scm%2Fbb%2Ftizen-distro.git

shutdown-desktop: ensure the postinst script succeeds

When the hostname isn't qemuarm the grep fails so the postinst fails. Stop this
happening by explicitly evaluating true.

[YOCTO #3224]

(From OE-Core rev: 8848ea6793ddaab61c9dad250ec578d68d7d087d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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