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/libnet | |
| 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/libnet')
| -rw-r--r-- | package/libnet/Makefile | 10 | ||||
| -rw-r--r-- | package/libnet/ipkg/libnet.control | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 9eb7a3eeb..788650ba7 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -9,17 +9,21 @@ PKG_NAME:= libnet PKG_VERSION:= 1.0.2a PKG_RELEASE:= 7 PKG_MD5SUM:= ddf53f0f484184390e8c2a1bd0853667 -MASTER_SITES:= http://www.packetfactory.net/libnet/dist/deprecated/ +PKG_DESCR:= a low-level packet creation library +PKG_SECTION:= libs +PKG_DEPENDS:= libpcap +PKG_SITES:= http://www.packetfactory.net/libnet/dist/deprecated/ + WRKDIST= ${WRKDIR}/Libnet-${PKG_VERSION} include ${TOPDIR}/mk/package.mk ENDIAN:=lil -ifeq (${ARCH},mips) +ifeq (${CPU_ARCH},mips) ENDIAN:=big endif -$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= ac_libnet_have_pf_packet=yes \ diff --git a/package/libnet/ipkg/libnet.control b/package/libnet/ipkg/libnet.control deleted file mode 100644 index 65a2b5e84..000000000 --- a/package/libnet/ipkg/libnet.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libnet -Priority: optional -Section: libs -Description: a low-level packet creation library -Depends: libpcap |