add missing dependency on libblkid to swap-utils, needed for swapon/off (closes:...

[openwrt.git] / package / bridge-utils / Makefile

diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index 6b249ac..c771ab7 100644 (file)
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -10,12 +10,20 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=bridge-utils

-PKG_VERSION:=1.0.6

 PKG_RELEASE:=1
 PKG_RELEASE:=1

+PKG_SOURCE_URL:=@SF/bridge
+
+ifeq ($(CONFIG_LINUX_2_4),y)
+  PKG_VERSION:=1.0.6
+  PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
+endif
+
+ifeq ($(CONFIG_LINUX_2_6),y)
+  PKG_VERSION:=1.4
+  PKG_MD5SUM:=0182fcac3a2b307113bbec34e5f1c673
+endif

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=@SF/bridge
-PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -23,13 +31,24 @@ define Package/bridge
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Ethernet bridging configuration utility
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=Ethernet bridging configuration utility

-  DESCRIPTION:=\
-       Manage ethernet bridging: a way to connect networks together to \\\
-       form a larger network.

   URL:=http://bridge.sourceforge.net/
 endef
 
   URL:=http://bridge.sourceforge.net/
 endef
 

-CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
+define Package/bridge/description
+ Manage ethernet bridging: a way to connect networks together to 
+ form a larger network.
+endef
+
+CONFIGURE_ARGS += \
+       --with-linux-headers="$(LINUX_DIR)" \
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); \
+       [ "$(PKG_VERSION)" = "1.0.6" ] || ln -s configure.in configure.ac; \
+       autoconf; \
+       ./configure $(CONFIGURE_ARGS) \
+       )
+endef

 
 define Package/bridge/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/bridge/install
        $(INSTALL_DIR) $(1)/usr/sbin