[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-55-g181b8e9

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  181b8e9668b40f1529871dc562aa2e815fba975e (commit)
      from  96d28377434501120fd4d464928e3f451f664a58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 181b8e9668b40f1529871dc562aa2e815fba975e
Author: Kevin JOLY <jol...@gm...>
Date:   Fri Apr 15 13:46:34 2011 +0200

    Update makefile busybox: Fix the conflict between ip (busybox) and iproute2
    
    Signed-off-by: Kevin JOLY <jol...@gm...>
    Signed-off-by: Fabien Marteau <fab...@ar...>

-----------------------------------------------------------------------

Summary of changes:
 ...-disable_ip_busybox_if_iproute2_buildroot.patch |   36 ++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch

diff --git a/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
new file mode 100644
index 0000000..97562df
--- /dev/null
+++ b/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
@@ -0,0 +1,36 @@
+This patch disable the ip tools options of the busybox config when the iproute2 package is selected
+in buildroot config. It modify the makefile of the busybox package in buildroot.
+We need to disable ip from busybox if we choose to use iproute2 because by default,
+the binary used for ip is the ip of busybox (/bin/ip) and we need to use ip of iproute2
+(/sbin/ip). This patch fix the conflict with the two binaries.
+
+Signed-off-by: Kevin Joly <jol...@gm...>
+
+Index: buildroot/package/busybox/busybox.mk
+===================================================================
+--- buildroot.orig/package/busybox/busybox.mk	2011-04-14 15:30:09.765201003 +0200
++++ buildroot/package/busybox/busybox.mk	2011-04-14 15:21:00.000000000 +0200
+@@ -100,6 +100,15 @@
+ endef
+ endif
+ 
++# If IPROUTE2 is selected, disable all the ip tools of busybox
++ifeq ($(BR2_PACKAGE_IPROUTE2),y)
++define BUSYBOX_IPROUTE2
++	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IP,$(BUSYBOX_BUILD_CONFIG))
++	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN,$(BUSYBOX_BUILD_CONFIG))
++	$(call KCONFIG_DISABLE_OPT,CONFIG_IP,$(BUSYBOX_BUILD_CONFIG))
++endef
++endif
++
+ define BUSYBOX_COPY_CONFIG
+ 	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
+ endef
+@@ -116,6 +125,7 @@
+ 	$(BUSYBOX_PREFER_STATIC)
+ 	$(BUSYBOX_NETKITBASE)
+ 	$(BUSYBOX_NETKITTELNET)
++	$(BUSYBOX_IPROUTE2)
+ 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
+ 		-C $(@D) oldconfig
+ endef


hooks/post-receive
-- 
armadeus