From dbdcadb57ccdb53be1b84217eb8e3146c0a6ff72 Mon Sep 17 00:00:00 2001 From: Eran Matityahu Date: Sun, 30 Jul 2017 18:24:19 +0300 Subject: matchbox-session-sato: Make the battery applet depend on machine features matchbox-panel enables the battery plugin only if the acpi/apm machine features are enabled, so enable the battery applet in the session script under the same conditions. This avoids the 'Failed to load applet "battery"' warning at runtime, in case these machine features are not defined. (From OE-Core rev: 34b5d507d62ef501fe771bd38cf45d25785dbc90) Signed-off-by: Eran Matityahu Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 5 ++++- meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index f6313bdebe..3a70574af9 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -20,7 +20,10 @@ matchbox-desktop & # doesn't have the feature "foo". START_APPLETS=showdesktop,windowselector -END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify +END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify +END_APPLETS=battery,$END_APPLETS # feature-acpi +END_APPLETS=battery,$END_APPLETS # feature-apm +END_APPLETS=clock,$END_APPLETS END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone matchbox-panel --start-applets $START_APPLETS --end-applets $END_APPLETS & diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index d146e836d5..8230e95140 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb @@ -26,7 +26,7 @@ FILES_${PN} += "${datadir}/themes/Sato/index.theme" do_install() { # This is the set of machine features that the script has markers for - FEATURES="phone" + FEATURES="acpi apm phone" SCRIPT="${S}/sedder" rm -f $SCRIPT touch $SCRIPT -- cgit v1.2.3-54-g00ecf