From 68ef4fa6487213d2d03389045557fa5432c4c605 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Dec 2015 20:37:53 +0100 Subject: use new PKG_KDEPENDS variable --- package/aiccu/Makefile | 2 +- package/chillispot/Makefile | 2 +- package/cryptodev-linux/Makefile | 1 + package/igmpproxy/Makefile | 4 +--- package/kexec-tools/Makefile | 2 +- package/nfs-utils/Makefile | 1 + package/openvpn/Makefile | 2 +- package/ppp/Makefile | 2 +- package/pptp/Makefile | 3 +-- package/pptpd/Makefile | 4 +--- package/sysdig/Makefile | 5 +---- package/tinc/Makefile | 2 +- package/vpnc/Makefile | 2 +- package/vtun/Makefile | 2 +- 14 files changed, 14 insertions(+), 20 deletions(-) diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index b2512aa27..7585d093d 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 11 PKG_HASH:= 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 PKG_DESCR:= sixxs automatic ipv6 connectivity client utility PKG_SECTION:= net/ipv6 +PKG_KDEPENDS:= tun PKG_NEEDS:= threads PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ -PKG_CFLINE_AICCU:= select ADK_KERNEL_TUN m PKG_LIBC_DEPENDS:= uclibc-ng glibc diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 1612b3712..4b62d188c 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 2 PKG_HASH:= b505ab963af8423ef8ae844951ef05fe1554630b448f1174074e9881cb474a01 PKG_DESCR:= wireless lan access point controller PKG_SECTION:= net/wifi +PKG_KDEPENDS:= tun PKG_URL:= http://www.chillispot.info/ PKG_SITES:= http://www.chillispot.info/download/ -PKG_CFLINE_CHILLISPOT:= select ADK_KERNEL_TUN m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index 957853724..6998ac1a1 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376 PKG_DESCR:= device that allows access to kernel cryptographic drivers PKG_SECTION:= app/crypto +PKG_KDEPENDS:= crypto-aead crypto-algapi crypto-manager PKG_URL:= http://home.gna.org/cryptodev-linux/ PKG_SITES:= http://download.gna.org/cryptodev-linux/ diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile index f5645574a..16d9f70cb 100644 --- a/package/igmpproxy/Makefile +++ b/package/igmpproxy/Makefile @@ -9,14 +9,12 @@ PKG_RELEASE:= 3 PKG_HASH:= ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae PKG_DESCR:= simple dynamic multicast routing daemon PKG_SECTION:= net/route +PKG_KDEPENDS:= ip-multicast ip-mroute PKG_URL:= http://sourceforge.net/projects/igmpproxy/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=igmpproxy/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CFLINE_IGMPPROXY:= select ADK_KERNEL_IP_MULTICAST@ -PKG_CFLINE_IGMPPROXY+= select ADK_KERNEL_IP_MROUTE - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IGMPPROXY,igmpproxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 3d633aeb5..8021ac0df 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -11,11 +11,11 @@ PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib PKG_BUILDEP:= zlib +PKG_KDEPENDS:= kexec PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/kexec/} PKG_ARCH_DEPENDS:= !mips !m68k -PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 636cd9269..b84f393a8 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind libdevmapper PKG_BUILDDEP:= keyutils libtirpc lvm +PKG_KDEPENDS:= nfs-fs PKG_NEEDS:= threads PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 4bf1a290f..1ac67c982 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -8,10 +8,10 @@ PKG_VERSION:= 2.3.7 PKG_RELEASE:= 1 PKG_HASH:= 4062ce972500f98988e9c6e9dd1040be25582f0d49aa7e69f3f4cff96e9aebee PKG_DESCR:= vpn solution using ssl/tls +PKG_KDEPENDS:= tun PKG_SECTION:= net/security PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ -PKG_CFLINE_OPENVPN:= select ADK_KERNEL_TUN m PKG_CHOICES_OPENVPN:= WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_LIBRESSL:= use libressl for crypto diff --git a/package/ppp/Makefile b/package/ppp/Makefile index b236d4770..2bb8b784d 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -10,9 +10,9 @@ PKG_HASH:= 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 PKG_DESCR:= point-to-point protocol software PKG_SECTION:= net/ppp PKG_BUILDDEP:= libpcap +PKG_KDEPENDS:= ppp PKG_URL:= http://ppp.samba.org/ PKG_SITES:= https://ppp.samba.org/ftp/ppp/ -PKG_CFLINE_PPP:= select ADK_KERNEL_PPP m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/pptp/Makefile b/package/pptp/Makefile index f55b4d490..abe07d74e 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -10,9 +10,8 @@ PKG_HASH:= e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda PKG_DESCR:= point-to-point tunneling protocol client PKG_SECTION:= net/ppp PKG_DEPENDS:= ppp +PKG_KDEPENDS:= ppp net-ipgre PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} -PKG_CFLINE_PPTP:= select ADK_KERNEL_NET_IPGRE m@ -PKG_CFLINE_PPTP+= select ADK_KERNEL_PPP m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 5944343bd..221359948 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -10,11 +10,9 @@ PKG_HASH:= c23a9bdd219a0a36ae7ca20e7c9749f2efdcdbf108aabeeeb5066ba442ec88b6 PKG_DESCR:= point-to-point tunneling protocol server PKG_SECTION:= net/ppp PKG_DEPENDS:= ppp +PKG_KDEPENDS:= ppp ppp-mppe net-ipgre PKG_URL:= http://www.poptop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} -PKG_CFLINE_PPTPD:= select ADK_KERNEL_NET_IPGRE m@ -PKG_CFLINE_PPTPD+= select ADK_KERNEL_PPP m@ -PKG_CFLINE_PPTPD+= select ADK_KERNEL_PPP_MPPE m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/sysdig/Makefile b/package/sysdig/Makefile index dbb521557..12006f3ee 100644 --- a/package/sysdig/Makefile +++ b/package/sysdig/Makefile @@ -10,14 +10,11 @@ PKG_DESCR:= system troubleshooting tool PKG_SECTION:= app/debug PKG_DEPENDS:= zlib jsoncpp luajit PKG_BUILDDEP:= cmake-host zlib jsoncpp luajit +PKG_KDEPENDS:= ftrace generic-tracer function-tracer PKG_NEEDS:= c++ PKG_URL:= http://www.sysdig.org/ PKG_SITES:= https://github.com/draios/sysdig.git -PKG_CFLINE_SYSDIG:= select ADK_KERNEL_FTRACE@ -PKG_CFLINE_SYSDIG+= select ADK_KERNEL_GENERIC_TRACER@ -PKG_CFLINE_SYSDIG+= select ADK_KERNEL_FUNCTION_TRACER - include $(ADK_TOPDIR)/mk/package.mk include ${ADK_TOPDIR}/mk/kernel-ver.mk diff --git a/package/tinc/Makefile b/package/tinc/Makefile index eb2ec673d..0fcce762b 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -11,9 +11,9 @@ PKG_DESCR:= vpn tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo PKG_BUILDDEP:= zlib liblzo +PKG_KDEPENDS:= tun PKG_URL:= http://www.tinc-vpn.org/ PKG_SITES:= http://www.tinc-vpn.org/packages/ -PKG_CFLINE_TINC:= select ADK_KERNEL_TUN m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index f4c6a7d01..72c98683f 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -11,9 +11,9 @@ PKG_DESCR:= client for cisco3000 vpn concentrator PKG_SECTION:= net/security PKG_DEPENDS:= libgcrypt libgpg-error PKG_BUILDDEP:= libgcrypt libgpg-error +PKG_KDEPENDS:= tun PKG_URL:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ PKG_SITES:= http://www.unix-ag.uni-kl.de/~massar/vpnc/ -PKG_CFLINE_VPNC:= select ADK_KERNEL_TUN m DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/vtun/Makefile b/package/vtun/Makefile index 0dfc30d34..d584da3b0 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -11,8 +11,8 @@ PKG_DESCR:= vpn tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo PKG_BUILDDEP:= zlib liblzo +PKG_KDEPENDS:= tun PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vtun/} -PKG_CFLINE_VTUN:= select ADK_KERNEL_TUN m PKG_CHOICES_VTUN:= WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_LIBRESSL:= use libressl for crypto -- cgit v1.2.3