* [PATCH] shutdown-desktop: ensure the postinst script succeeds
@ 2012-10-04 11:37 Ross Burton
2012-10-05 16:07 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Ross Burton @ 2012-10-04 11:37 UTC (permalink / raw)
To: openembedded-core
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
--
1.7.10
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] shutdown-desktop: ensure the postinst script succeeds
2012-10-04 11:37 [PATCH] shutdown-desktop: ensure the postinst script succeeds Ross Burton
@ 2012-10-05 16:07 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2012-10-05 16:07 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-05 16:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-04 11:37 [PATCH] shutdown-desktop: ensure the postinst script succeeds Ross Burton
2012-10-05 16:07 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox