summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-04 12:37:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-04 14:07:51 +0100
commit5d27c4968b3b669e9e4af5770dea262585473c62 (patch)
tree7879a453872f5f453655c574bedc1ed2c39cf79e /meta
parentcf1f3f552f9bc7e783765df5c0aa30207cb9bc1b (diff)
downloadpoky-5d27c4968b3b669e9e4af5770dea262585473c62.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
index d0f507e673..c5096c1530 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
5 5
6SRC_URI = "file://shutdown.desktop" 6SRC_URI = "file://shutdown.desktop"
7 7
8PR = "r1"
9
8S = "${WORKDIR}" 10S = "${WORKDIR}"
9 11
10do_install() { 12do_install() {
@@ -14,7 +16,8 @@ do_install() {
14 16
15pkg_postinst_${PN} () { 17pkg_postinst_${PN} () {
16 grep -q qemuarm $D${sysconfdir}/hostname && \ 18 grep -q qemuarm $D${sysconfdir}/hostname && \
17 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' 19 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' \
20 || true
18} 21}
19 22
20inherit allarch 23inherit allarch