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 <[email protected]>
---
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!
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
