[oe-commits] Roy Li : bridge-utils: fix the no brctl error when enable multilib

git at git.openembedded.org git at git.openembedded.org
Sat Mar 15 14:32:29 UTC 2014


Module: meta-openembedded.git
Branch: master-next
Commit: 42da6554d80298a23d7ddab25ab02f2aa9696230
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=42da6554d80298a23d7ddab25ab02f2aa9696230

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Feb 25 15:58:34 2014 +0800

bridge-utils: fix the no brctl error when enable multilib

update-alternatives.bbclass does not create the brctl symbolic links for
multilib, since the wrong use of PN generates
/usr/sbin/brctl.lib32-bridge-utils, not /usr/sbin/brctl.bridge-utils;

In fact, no need to rename brctl by calling mv, since update-alternatives
will handle it

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Joe MacDonald <joe at deserted.net>

---

 meta-networking/recipes-support/bridge-utils/bridge-utils.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
index bcdc04a..e06c32e 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils.inc
@@ -20,7 +20,6 @@ ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl"
 EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
 
 do_install_append () {
-    mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN}
     install -d ${D}/${datadir}/bridge-utils
     install -d ${D}/${sysconfdir}/network/if-pre-up.d
     install -d ${D}/${sysconfdir}/network/if-post-down.d



More information about the Openembedded-commits mailing list