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/fping | |
| 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/fping')
| -rw-r--r-- | package/fping/Makefile | 12 | ||||
| -rw-r--r-- | package/fping/ipkg/fping.control | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/package/fping/Makefile b/package/fping/Makefile index 7b794d5aa..212b5ee51 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -9,20 +9,24 @@ PKG_NAME:= fping PKG_VERSION:= 2.4b2_to PKG_RELEASE:= 1 PKG_MD5SUM:= d5e8be59e307cef76bc479e1684df705 +PKG_DESCR:= A program to ping hosts in parallel +PKG_SECTION:= net +PKG_URL:= http://fping.sourceforge.net +PKG_SITES:= http://fping.sourceforge.net/download/ + DISTFILES:= ${PKG_NAME}.tar.gz -MASTER_SITES:= http://fping.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu do-build: - ${MAKE} -j1 CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD} clean ${PKG_NAME} + ${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD} clean ${PKG_NAME} mv ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}4 ifeq ($(ADK_IPV6),y) - ${MAKE} -j1 CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -DIPV6=1" -C ${WRKBUILD} clean ${PKG_NAME} + ${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS} -DIPV6=1" -C ${WRKBUILD} clean ${PKG_NAME} mv ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}6 endif diff --git a/package/fping/ipkg/fping.control b/package/fping/ipkg/fping.control deleted file mode 100644 index 964c8dbf2..000000000 --- a/package/fping/ipkg/fping.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: fping -Priority: optional -Section: net -Description: A program to ping hosts in parallel |