diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-10-04 12:37:19 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-04 14:07:51 +0100 |
| commit | 5d27c4968b3b669e9e4af5770dea262585473c62 (patch) | |
| tree | 7879a453872f5f453655c574bedc1ed2c39cf79e /meta/recipes-sato/shutdown-desktop | |
| parent | cf1f3f552f9bc7e783765df5c0aa30207cb9bc1b (diff) | |
| download | ast2050-yocto-poky-5d27c4968b3b669e9e4af5770dea262585473c62.zip ast2050-yocto-poky-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/recipes-sato/shutdown-desktop')
| -rw-r--r-- | meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb | 5 |
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 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 |
