Patchwork [88/90] openbox: fix PR format and use new update-alternatives syntax

login
register
mail settings
Submitter Martin Jansa
Date Dec. 11, 2012, 1 a.m.
Message ID <49c232118052aeef2336aafff464603cf6771eb9.1355187290.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40717/
State Accepted
Commit 49c232118052aeef2336aafff464603cf6771eb9
Headers show

Comments

Martin Jansa - Dec. 11, 2012, 1 a.m.
* fixes:
  NOTE: recipe openbox-3.5.0-1: task do_package: Started
  WARNING: openbox: Use of ALTERNATIVE_NAME is deprecated, see
  update-alternatives.bbclass for more info.
* bump PE if you care about upgrade path from wrong PR, introduced in
  commit 3becce8504033dfac7c497fa12675f873a5df9e0
  Author: Mario Domenech Goulart <mario@ossystems.com.br>
  Date:   Mon Dec 3 16:03:23 2012 +0000

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
Otavio Salvador - Dec. 11, 2012, 2:40 p.m.
On Mon, Dec 10, 2012 at 11:00 PM, Martin Jansa <martin.jansa@gmail.com>wrote:

> * fixes:
>   NOTE: recipe openbox-3.5.0-1: task do_package: Started
>   WARNING: openbox: Use of ALTERNATIVE_NAME is deprecated, see
>   update-alternatives.bbclass for more info.
> * bump PE if you care about upgrade path from wrong PR, introduced in
>   commit 3becce8504033dfac7c497fa12675f873a5df9e0
>   Author: Mario Domenech Goulart <mario@ossystems.com.br>
>   Date:   Mon Dec 3 16:03:23 2012 +0000
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Eric, please add it to danny as well. This was not catch by me when
reviewing Mario's patch. Sorry.

Patch

diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
index a2c5a66..1fe2e17 100644
--- a/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
+++ b/meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
@@ -9,14 +9,13 @@  SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz"
 SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9"
 SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a"
 
-PR = "1"
+PR = "r2"
 
 inherit autotools gettext update-alternatives
 
-ALTERNATIVE_PATH = "${bindir}/openbox"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_${PN}-core = "x-window-manager"
+ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox"
+ALTERNATIVE_PRIORITY[x-window-manager] = "10"
 
 EXTRA_OECONF += "--with-plugins=none"