Skip to contentSkip to conversation

rfkill: use update-alternatives

PATCH In review Saul Wold 2 participants 3 messages Jun 18, 2012 – Jun 19, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 rfkill: use update-alternatives

Since oe-core added rfkill to busybox, this recipe needs to use u-a also.

---
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +7 -0
index 561fdc7..548990c 100644
@@ -3,6 +3,7 @@ HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill"
 SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
+PR = "r1"
 
 SRC_URI = "http://wireless.kernel.org/download/${PN}/${P}.tar.bz2 \
            file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch"
@@ -16,3 +17,9 @@ do_compile() {
 do_install() {
         oe_runmake DESTDIR=${D} install
 }
+
+inherit update-alternatives
+
+ALTERNATIVE_${PN} = "rfkill"
+ALTERNATIVE_PRIORITY = "50"
+
Signature · 1 line
1.7.7.6
#1 lore raw
Quoted 21 lines · Saul Wold

Since oe-core added rfkill to busybox, this recipe needs to use u-a also.

---
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +1 -0
index 561fdc7..548990c 100644
@@ -3,6 +3,7 @@ HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill"
 SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
+PR = "r1"
 
 SRC_URI = "http://wireless.kernel.org/download/${PN}/${P}.tar.bz2 \
            file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch"

meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb do_compile() { · line 24

Quoted 8 lines
meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +5 -0
@@ -16,3 +17,9 @@ do_compile() {
 do_install() {
         oe_runmake DESTDIR=${D} install
 }
+
+inherit update-alternatives
+
+ALTERNATIVE_${PN} = "rfkill"
+ALTERNATIVE_PRIORITY = "50"

Thanks for quick reaction, but something is wrong:

WARNING: rfkill: alternative target (/usr/bin/rfkill or /usr/bin/rfkill.rfkill) does not exist, skipping...
WARNING: rfkill: NOT adding alternative provide /usr/bin/rfkill: /usr/bin/rfkill.rfkill does not exist
WARNING: alt_link == alt_target: /usr/bin/rfkill == /usr/bin/rfkill

(it's in /usr/sbin... )

Cheers,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw

PATCH v2 1/1 rfkill: use update-alternatives

From: Saul Wold <[email protected]>

* Since oe-core added rfkill to busybox, this recipe needs to use u-a also.
* MJ: added ALERNATIVE_LINK_NAME[rfkill]
* MJ: increased ALTERNATIVE_PRIORITY (busybox also have 50)

---
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +8 -0
index 561fdc7..430cf65 100644
@@ -3,6 +3,7 @@ HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill"
 SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94"
+PR = "r1"
 
 SRC_URI = "http://wireless.kernel.org/download/${PN}/${P}.tar.bz2 \
            file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch"
@@ -16,3 +17,10 @@ do_compile() {
 do_install() {
         oe_runmake DESTDIR=${D} install
 }
+
+inherit update-alternatives
+
+ALTERNATIVE_${PN} = "rfkill"
+ALTERNATIVE_PRIORITY = "60"
+ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill"
+
Signature · 1 line
1.7.8.6