[Astlinux-commits] SF.net SVN: astlinux: [1777] trunk/package

[<kr...@us...>]

Revision: 1777
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1777&view=rev
Author:   krisk84
Date:     2008-05-20 15:43:28 -0700 (Tue, 20 May 2008)

Log Message:
-----------
clean up iproute2/busybox ip app confusion

Modified Paths:
--------------
    trunk/package/busybox/busybox.mk
    trunk/package/iproute2/Config.in
    trunk/package/iproute2/iproute2.mk

Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk	2008-05-20 20:36:48 UTC (rev 1776)
+++ trunk/package/busybox/busybox.mk	2008-05-20 22:43:28 UTC (rev 1777)
@@ -81,6 +81,9 @@
 ifeq ($(strip $(BR2_PACKAGE_WGET)),y)
 	$(SED) "s/^.*CONFIG_WGET[ =].*/CONFIG_WGET=n/" $(BUSYBOX_DIR)/.config
 endif
+ifeq ($(strip $(BR2_PACKAGE_IPROUTE2_IP)),y)
+	$(SED) "s/^.*CONFIG_IP[ =].*/CONFIG_IP=n/" $(BUSYBOX_DIR)/.config
+endif
 	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
 	touch $@

Modified: trunk/package/iproute2/Config.in
===================================================================
--- trunk/package/iproute2/Config.in	2008-05-20 20:36:48 UTC (rev 1776)
+++ trunk/package/iproute2/Config.in	2008-05-20 22:43:28 UTC (rev 1777)
@@ -6,3 +6,10 @@
 	  like ip and tc.
 
 	  http://developer.osdl.org/dev/iproute2/
+
+config BR2_PACKAGE_IPROUTE2_IP
+	bool "iproute2-ip"
+	default n
+	depends BR2_PACKAGE_IPROUTE2
+	help
+	  Install ip app from iproute2, not busybox

Modified: trunk/package/iproute2/iproute2.mk
===================================================================
--- trunk/package/iproute2/iproute2.mk	2008-05-20 20:36:48 UTC (rev 1776)
+++ trunk/package/iproute2/iproute2.mk	2008-05-20 22:43:28 UTC (rev 1777)
@@ -37,7 +37,9 @@
 		SUBDIRS="lib tc ip"
 
 $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY): $(IPROUTE2_DIR)/$(IPROUTE2_BINARY)
+ifeq ($(strip $(BR2_PACKAGE_IPROUTE2_IP)),y)
 	$(INSTALL) -Dc $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/ip
+endif
 	$(INSTALL) -Dc $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
 	$(INSTALL) -D -m 0755 package/iproute2/astshape.init $(TARGET_DIR)/etc/init.d/astshape
 	$(INSTALL) -D -m 0755 package/iproute2/astshape $(TARGET_DIR)/usr/sbin/astshape
@@ -46,6 +48,9 @@
 
 iproute2-clean:
 	rm -f $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
+ifeq ($(strip $(BR2_PACKAGE_IPROUTE2_IP)),y)
+	rm -f $(TARGET_DIR)/sbin/ip
+endif
 	rm -f $(TARGET_DIR)/etc/init.d/astshape
 	-$(MAKE) -C $(IPROUTE2_DIR) clean
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.