[PATCH] matchbox-session-sato: Make the battery applet depend on machine features

[PATCH] matchbox-session-sato: Make the battery applet depend on machine features

[Jaewon Lee]

From: Eran Matityahu <eran.m@variscite.com>

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.

Signed-off-by: Eran Matityahu <eran.m@variscite.com>
---
 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(-)

diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index f6313bd..3a70574 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 d146e83..8230e95 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
--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

✗ patchtest: failure for matchbox-session-sato: Make the battery applet depend on machine features (rev2)

[Patchwork]

== Series Details ==

Series: matchbox-session-sato: Make the battery applet depend on machine features (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/8026/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 1b03cdf290)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH] matchbox-session-sato: Make the battery applet depend on machine features

[Eran Matityahu]

Hi.
This is a duplicate of the original patch 142525 that I've submitted
on July 30, 2017, only it has tabs replaced with spaces so it doesn't
apply.
The original patch applies cleanly. Please use it instead this one.

Regards,
Eran

On Wed, May 2, 2018 at 8:33 PM, Jaewon Lee <jaewon.lee@xilinx.com> wrote:
> From: Eran Matityahu <eran.m@variscite.com>
>
> 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.
>
> Signed-off-by: Eran Matityahu <eran.m@variscite.com>
> ---
>  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(-)
>
> diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
> index f6313bd..3a70574 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 d146e83..8230e95 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
> --
> 2.7.4
>
> This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

[PATCH] matchbox-session-sato: Make the battery applet depend on machine features

[Eran Matityahu]

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.

Signed-off-by: Eran Matityahu <eran.m@variscite.com>
---
 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(-)

diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
index f6313bd..3a70574 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 d146e83..8230e95 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
-- 
2.7.4