From 037be68e540c6b8781b13f210e67b1a8a95de298 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 16 Apr 2013 10:53:58 +0000
Subject: bridge-utils: move to meta-networking and tweak

* Update HOMEPAGE
* Set SUMMARY instead of DESCRIPTION
* Move DEPENDS up towards the top

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../bridge-utils/bridge-utils.inc                  | 28 ----------------------
 .../bridge-utils/bridge-utils/kernel-headers.patch | 22 -----------------
 .../bridge-utils/bridge-utils_1.5.bb               | 11 ---------
 3 files changed, 61 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc
 delete mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
 delete mode 100644 meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb

(limited to 'meta-oe')

diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc
deleted file mode 100644
index 3fc54ba995..0000000000
--- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Tools for ethernet bridging."
-HOMEPAGE = "http://bridge.sourceforge.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
-
-do_install_append () {
-    mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN}
-    install -d ${D}/${datadir}/bridge-utils
-    install -d ${D}/${sysconfdir}/network/if-pre-up.d
-    install -d ${D}/${sysconfdir}/network/if-post-down.d
-}
-
-DEPENDS = "sysfsutils"
-RRECOMMENDS_${PN} = "kernel-module-bridge"
-
-pkg_postinst_${PN} () {
-    update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100
-}
-
-pkg_prerm_${PN} () {
-    update-alternatives --remove brctl brctl.${PN}
-}
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
deleted file mode 100644
index de36f0598b..0000000000
--- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-include missing kernel header
-
-Fixes errors like
-
-| /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type
-| In file included from ../libbridge/libbridge.h:24:0,
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: bridge-utils-1.5/libbridge/libbridge.h
-===================================================================
---- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-28 17:52:54.000000000 -0700
-+++ bridge-utils-1.5/libbridge/libbridge.h	2013-03-04 21:16:25.781188309 -0800
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- 
- #include <sys/socket.h>
-+#include <linux/in6.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
- 
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
deleted file mode 100644
index 04f863b223..0000000000
--- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require bridge-utils.inc
-
-SRC_URI += "file://kernel-headers.patch"
-
-PARALLEL_MAKE = ""
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
-
-SRC_URI[md5sum] = "ec7b381160b340648dede58c31bb2238"
-SRC_URI[sha256sum] = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"
-
-- 
cgit 1.2.3-korg