From 53b26022965cdbeafe5e584d77354c68d229805b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 19 Sep 2011 22:53:07 +0200
Subject: bridge-utils: normalize package name

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/bridge-utils/Config.in          |  2 +-
 package/bridge-utils/bridge-utils.mk    | 18 ++++++++++++++++++
 package/bridge-utils/bridge-utils.patch | 11 +++++++++++
 package/bridge-utils/bridge.mk          | 18 ------------------
 package/bridge-utils/bridge.patch       | 11 -----------
 5 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 package/bridge-utils/bridge-utils.mk
 create mode 100644 package/bridge-utils/bridge-utils.patch
 delete mode 100644 package/bridge-utils/bridge.mk
 delete mode 100644 package/bridge-utils/bridge.patch

(limited to 'package')

diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in
index c2e8ca028..537eb1f59 100644
--- a/package/bridge-utils/Config.in
+++ b/package/bridge-utils/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_BRIDGE
+config BR2_PACKAGE_BRIDGE_UTILS
 	bool "bridge-utils"
 	help
 	  Manage ethernet bridging; a way to connect networks together to
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
new file mode 100644
index 000000000..680749393
--- /dev/null
+++ b/package/bridge-utils/bridge-utils.mk
@@ -0,0 +1,18 @@
+#############################################################
+#
+# bridge-utils
+#
+#############################################################
+
+BRIDGE_UTILS_VERSION = 1.5
+BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.gz
+BRIDGE_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge
+BRIDGE_UTILS_AUTORECONF = YES
+BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
+
+define BRIDGE_UTILS_UNINSTALL_TARGET_CMDS
+	rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
+		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
+endef
+
+$(eval $(call AUTOTARGETS,package,bridge-utils))
diff --git a/package/bridge-utils/bridge-utils.patch b/package/bridge-utils/bridge-utils.patch
new file mode 100644
index 000000000..f44737750
--- /dev/null
+++ b/package/bridge-utils/bridge-utils.patch
@@ -0,0 +1,11 @@
+--- bridge-utils-0.9.6/libbridge/Makefile.in.dist	2004-03-01 20:55:52.000000000 -0600
++++ bridge-utils-0.9.6/libbridge/Makefile.in	2004-03-01 20:56:23.000000000 -0600
+@@ -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-utils/bridge.mk b/package/bridge-utils/bridge.mk
deleted file mode 100644
index 8f3f74138..000000000
--- a/package/bridge-utils/bridge.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################################################
-#
-# bridge-utils
-#
-#############################################################
-
-BRIDGE_VERSION = 1.5
-BRIDGE_SOURCE = bridge-utils-$(BRIDGE_VERSION).tar.gz
-BRIDGE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge
-BRIDGE_AUTORECONF = YES
-BRIDGE_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
-
-define BRIDGE_UNINSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
-		include/libbridge.h share/man/man8/brctl.8 sbin/brctl)
-endef
-
-$(eval $(call AUTOTARGETS,package,bridge))
diff --git a/package/bridge-utils/bridge.patch b/package/bridge-utils/bridge.patch
deleted file mode 100644
index f44737750..000000000
--- a/package/bridge-utils/bridge.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bridge-utils-0.9.6/libbridge/Makefile.in.dist	2004-03-01 20:55:52.000000000 -0600
-+++ bridge-utils-0.9.6/libbridge/Makefile.in	2004-03-01 20:56:23.000000000 -0600
-@@ -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