Patchwork [meta-networking,5/5] bridge-utils: inherit update-alternatives to avoid duplicate code

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Oct. 31, 2013, 6:29 a.m.
Message ID <1383200986-18674-5-git-send-email-Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/60863/
State Accepted, archived
Commit fe0c58ddd2035fa04540cb09c42a9473ea797154
Headers show

Comments

Qi.Chen@windriver.com - Oct. 31, 2013, 6:29 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

Inherit update-alternatives to avoid duplicate code.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../recipes-support/bridge-utils/bridge-utils.inc  |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Patch

diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
index bd96c6a..bcdc04a 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
@@ -11,7 +11,11 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz \
           file://bridge-utils-1.5-fix-incorrect-command-in-manual.patch \
 "
 
-inherit autotools
+inherit autotools update-alternatives
+
+ALTERNATIVE_${PN} = "brctl"
+ALTERNATIVE_PRIORITY[brctl] = "100"
+ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl"
 
 EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
 
@@ -23,11 +27,3 @@  do_install_append () {
 }
 
 RRECOMMENDS_${PN} = "kernel-module-bridge"
-
-pkg_postinst_${PN} () {
-    update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100
-}
-
-pkg_prerm_${PN} () {
-    update-alternatives --remove brctl brctl.${PN}
-}