From a8e4960f3d97e0ddbcdd35d9dadd582850033393 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 3 Sep 2007 08:12:27 +0000 Subject: rename bridge package to bridge-utils (to match source name) SVN-Revision: 8586 --- package/bridge-utils/Makefile | 39 ++++++++++++++++++++ .../patches/001-patch-libbridge_makefile_in | 13 +++++++ package/bridge/Makefile | 41 ---------------------- .../bridge/patches/001-patch-libbridge_makefile_in | 13 ------- 4 files changed, 52 insertions(+), 54 deletions(-) create mode 100644 package/bridge-utils/Makefile create mode 100644 package/bridge-utils/patches/001-patch-libbridge_makefile_in delete mode 100644 package/bridge/Makefile delete mode 100644 package/bridge/patches/001-patch-libbridge_makefile_in diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile new file mode 100644 index 0000000000..6b249ac868 --- /dev/null +++ b/package/bridge-utils/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=bridge-utils +PKG_VERSION:=1.0.6 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/bridge +PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd + +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 + +CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)" + +define Package/bridge/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,bridge)) diff --git a/package/bridge-utils/patches/001-patch-libbridge_makefile_in b/package/bridge-utils/patches/001-patch-libbridge_makefile_in new file mode 100644 index 0000000000..5d211284a2 --- /dev/null +++ b/package/bridge-utils/patches/001-patch-libbridge_makefile_in @@ -0,0 +1,13 @@ +Index: bridge-utils-1.0.6/libbridge/Makefile.in +=================================================================== +--- bridge-utils-1.0.6.orig/libbridge/Makefile.in 2007-06-04 13:21:26.951879360 +0200 ++++ bridge-utils-1.0.6/libbridge/Makefile.in 2007-06-04 13:21:27.019869024 +0200 +@@ -5,7 +5,7 @@ + RANLIB=@RANLIB@ + + CC=@CC@ +-CFLAGS = -Wall -g $(KERNEL_HEADERS) ++CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) + + prefix=@prefix@ + exec_prefix=@exec_prefix@ diff --git a/package/bridge/Makefile b/package/bridge/Makefile deleted file mode 100644 index 3ea92117e5..0000000000 --- a/package/bridge/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# 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 -PKG_VERSION:=1.0.6 -PKG_RELEASE:=1 - -PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/bridge -PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd - -PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION) - -include $(INCLUDE_DIR)/kernel.mk -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 - -CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)" - -define Package/bridge/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/ -endef - -$(eval $(call BuildPackage,bridge)) diff --git a/package/bridge/patches/001-patch-libbridge_makefile_in b/package/bridge/patches/001-patch-libbridge_makefile_in deleted file mode 100644 index 5d211284a2..0000000000 --- a/package/bridge/patches/001-patch-libbridge_makefile_in +++ /dev/null @@ -1,13 +0,0 @@ -Index: bridge-utils-1.0.6/libbridge/Makefile.in -=================================================================== ---- bridge-utils-1.0.6.orig/libbridge/Makefile.in 2007-06-04 13:21:26.951879360 +0200 -+++ bridge-utils-1.0.6/libbridge/Makefile.in 2007-06-04 13:21:27.019869024 +0200 -@@ -5,7 +5,7 @@ - RANLIB=@RANLIB@ - - CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) - - prefix=@prefix@ - exec_prefix=@exec_prefix@ -- cgit v1.2.3