diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/bridge-utils | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/bridge-utils')
| -rw-r--r-- | package/bridge-utils/Makefile | 13 | ||||
| -rw-r--r-- | package/bridge-utils/ipkg/bridge-utils.control | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index f6363634c..6fbda287c 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -6,16 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bridge-utils -PKG_VERSION:= 1.0.6 +PKG_VERSION:= 1.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b7dc52656f5cbec846a7ba3299f73bd -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} +PKG_MD5SUM:= 0182fcac3a2b307113bbec34e5f1c673 +PKG_DESCR:= Ethernet bridging tools +PKG_SECTION:= net +PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf gnu CONFIGURE_ARGS+= --with-linux-headers=${LINUX_DIR} BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/bridge-utils/ipkg/bridge-utils.control b/package/bridge-utils/ipkg/bridge-utils.control deleted file mode 100644 index da38f85e9..000000000 --- a/package/bridge-utils/ipkg/bridge-utils.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: bridge-utils -Priority: optional -Section: net -Description: Ethernet bridging tools |