fix a small bug in config.pl that tends to mess up kernel cmdlines

[openwrt.git] / package / bridge / Makefile

diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index 5340a9b..0091af5 100644 (file)
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -1,69 +1,45 @@
-#############################################################
+# 
+# Copyright (C) 2006 OpenWrt.org

 #
 #

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

 #
 #

-#############################################################
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridge
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridge

-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.6

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://umn.dl.sourceforge.net/sourceforge/bridge
+

 PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz

-PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)
+PKG_SOURCE_URL:=@SF/bridge
+PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd

 PKG_CAT:=zcat
 PKG_CAT:=zcat

-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
-
-$(DL_DIR)/$(PKG_SOURCE):
-        $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
-
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(PKG_BUILD_DIR)/.unpacked

 
 

-$(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --sbindir=/usr/sbin \
-               --libexecdir=/usr/lib \
-               --sysconfdir=/etc \
-               --datadir=/usr/share \
-               --localstatedir=/var \
-               --mandir=/usr/man \
-               --infodir=/usr/info \
-               $(DISABLE_NLS) \
-               --with-linux-headers=$(LINUX_DIR) \
-       );
-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/brctl/brctl: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR)
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/brctl/brctl
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_IPK_DIR)/usr/sbin
-       cp $(PKG_BUILD_DIR)/brctl/brctl $(PKG_IPK_DIR)/usr/sbin/
-       $(STRIP) $(PKG_IPK_DIR)/usr/sbin/brctl
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION)

 
 

-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install:
-       $(IPKG) install $(PKG_IPK)
-clean:
-       rm -rf $(PKG_BUILD_DIR)
+include $(INCLUDE_DIR)/package.mk
+
+define Package/bridge
+  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
+
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --with-linux-headers="$(LINUX_DIR)" \
+       )
+endef
+
+define Package/bridge/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,bridge))