Browse Source

fix automatic kmod dependency handling

It is required that kmod package names are directly
useable in uppercase for automatic dependency handling.
Fix all package names in mk/modules.mk.
Waldemar Brodkorb 14 years ago
parent
commit
9de04cb9c8

File diff suppressed because it is too large
+ 170 - 211
mk/modules.mk


+ 1 - 1
package/bluez-firmware/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
 PKG_DESCR:=		Bluez firmware for BCM2033
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bluetooth bluez
+PKG_DEPENDS:=		kmod-bt bluez
 PKG_URL:=		http://www.bluez.org
 PKG_SITES:=		http://bluez.sourceforge.net/download/
 

+ 1 - 1
package/bluez/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		1c7cee215bc84656b1edee019cee78f5
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bluetooth libusb glib dbus
+PKG_DEPENDS:=		kmod-bt libusb glib dbus
 PKG_BUILDDEP+=		libusb dbus glib
 PKG_URL:=		http://www.bluez.org
 PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}

+ 1 - 1
package/cryptsetup/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
-PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-dm-mod
+PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-blk-dev-dm
 PKG_BUILDDEP+=		libgcrypt popt e2fsprogs lvm
 PKG_URL:=		http://cryptsetup.googlecode.com
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/

+ 6 - 6
package/davfs2/Makefile

@@ -6,24 +6,24 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		davfs2
 PKG_VERSION=		1.3.3
 PKG_RELEASE=		1
+PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
+PKG_DESCR:=		WebDAV filesystem
+PKG_SECTION:=		admin
 PKG_BUILDDEP+=		libiconv neon
 ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
 PKG_BUILDDEP+=		fuse
 endif
-PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
-PKG_DESCR:=		WebDAV filesystem
-PKG_SECTION:=		admin
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2
 PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
 
 include ${TOPDIR}/mk/package.mk
 
 ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
-PKG_DEPENDS:=			fuse-utils kmod-fuse libiconv neon
+PKG_DEPENDS:=			fuse-utils kmod-fuse-fs libiconv neon
 else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
-PKG_DEPENDS:=			kmod-fs-coda libiconv neon
+PKG_DEPENDS:=			kmod-coda-fs libiconv neon
 else
-PKG_DEPENDS:=			kmod-fs-coda fuse-utils kmod-fuse libiconv neon
+PKG_DEPENDS:=			kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon
 endif
 
 $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 1 - 1
package/fuse/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4879f06570d2225667534c37fea04213
 PKG_DESCR:=		Filesystem in Userspace (utilities)
 PKG_SECTION:=		admin
-PKG_DEPENDS:=		kmod-fuse
+PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://fuse.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
 

+ 1 - 1
package/iptables/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c67cf30e281a924def6426be0973df56
 PKG_DESCR:=		The netfilter firewalling software
 PKG_SECTION:=		net
-PKG_DEPENDS:=		kmod-nf-ip-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-nf-ip-target-masquerade kmod-nf-ip-target-reject kmod-nf-ip-filter
+PKG_DEPENDS:=		kmod-ip-nf-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject kmod-ip-nf-filter
 PKG_URL:=		http://www.netfilter.org
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/ \
 			ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \

+ 2 - 2
package/miax/Makefile

@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		miax
 PKG_VERSION:=		1.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		bluez
 PKG_MD5SUM:=		44f0d2ef46ee2697d890b7b96846adc7
 PKG_DESCR:=		A console iax (asterisk) client
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bluetooth bluez libpthread
+PKG_DEPENDS:=		kmod-bt bluez libpthread
+PKG_BUILDDEP+=		bluez
 PKG_URL:=		http://sourceforge.net/projects/miax
 PKG_SITES:=		http://mesh.dl.sourceforge.net/sourceforge/miax/
 

+ 1 - 1
package/pptp/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		9a706327fb9827541d7c86d48ceb9631
 PKG_DESCR:=		a Point-to-Point Tunneling Protocol (PPTP) client
 PKG_SECTION:=		net
-PKG_DEPENDS:=		ppp kmod-gre
+PKG_DEPENDS:=		ppp kmod-net-ipgre
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=pptpclient/}
 
 include ${TOPDIR}/mk/package.mk

+ 0 - 1
package/pptpd/Makefile

@@ -24,7 +24,6 @@ TCFLAGS+=		-DSBINDIR=\\\"/usr/sbin\\\"
 FAKE_FLAGS+=		INSTALL="install"
 
 post-install:
-	${INSTALL_DIR} ${IDIR_PPTPD}/etc
 	${INSTALL_DIR} ${IDIR_PPTPD}/etc/ppp
 	${INSTALL_DIR} ${IDIR_PPTPD}/usr/sbin
 	${INSTALL_DATA} ./files/pptpd.conf ${IDIR_PPTPD}/etc/

+ 2 - 2
package/util-linux-ng/Makefile

@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		util-linux-ng
 PKG_VERSION:=		2.16.1
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		e2fsprogs ncurses
 PKG_MD5SUM:=		fc57e5fd5be9e569b026b5077fafe84f
 PKG_DESCR:=		Linux utilities
 PKG_SECTION:=		admin
+PKG_BUILDDEP+=		e2fsprogs ncurses
 PKG_URL:=		http://userweb.kernel.org/~kzak/util-linux-ng
 PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.16/}
 
@@ -18,7 +18,7 @@ PKG_DESCR_SFDISK:=	Scriptable Partition table manipulation utility
 PKG_DESCR_SWAP:=	Swap space management utilities
 PKG_DEPENDS_SWAP:=	libblkid
 PKG_DESCR_LOOP:=	Loop devices setup and control utility
-PKG_DEPENDS_LOOP:=	kmod-loop
+PKG_DEPENDS_LOOP:=	kmod-blk-dev-loop
 
 include ${TOPDIR}/mk/package.mk
 

+ 2 - 2
package/wdfs/Makefile

@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		wdfs
 PKG_VERSION=		1.4.2
 PKG_RELEASE=		2
-PKG_BUILDDEP+=		openssl fuse neon glib
 PKG_MD5SUM=		628bb44194d04c1cf8aacc446ed0a230
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libopenssl fuse-utils kmod-fuse neon glib
+PKG_DEPENDS:=		libopenssl fuse-utils kmod-fuse-fs neon glib
+PKG_BUILDDEP+=		openssl fuse neon glib
 PKG_SITES=		http://noedler.de/projekte/wdfs/
 
 include ${TOPDIR}/mk/package.mk

+ 1 - 1
target/linux/config/Config.in.netfilter

@@ -352,7 +352,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
-	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KPACKAGE_KMOD_NF_IP_IPTABLES
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by

Some files were not shown because too many files changed in this diff