diff options
100 files changed, 1119 insertions, 1352 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index f5b1ec004..04237462e 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -785,10 +785,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } @@ -880,10 +877,7 @@ int main() { if (pkg_depends != NULL) { token = strtok(pkg_depends, " "); while (token != NULL) { - if (strncmp(token, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(token)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(token)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(token)); token = strtok(NULL, " "); } free(pkg_depends); @@ -996,10 +990,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } @@ -1055,10 +1046,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } @@ -1095,10 +1083,7 @@ int main() { if (result == 1) { val = strtok_r(hvalue, " ", &saveptr); while (val != NULL) { - if (strncmp(val, "kmod", 4) == 0) - fprintf(cfg, "\tselect ADK_KPACKAGE_%s\n", toupperstr(val)); - else - fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); + fprintf(cfg, "\tselect ADK_PACKAGE_%s\n", toupperstr(val)); val = strtok_r(NULL, " ", &saveptr); } } diff --git a/mk/kernel.mk b/mk/kernel.mk index 68e0e76ab..a624ad947 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -17,7 +17,7 @@ TARGETS:= # Adds a target for creating a package containing # the specified (kernel-provided) modules. # Parameters: -# 1: the config symbol name (without leading 'ADK_[K,]PACKAGE_KMOD_') +# 1: the config symbol name (without leading 'ADK_KERNEL_') # this _must_ be equal to the kernel config symbol name # 2: the name for the package, should be unique # 3: actual modules to add; absolute path inside $(MODULES_DIR) @@ -34,10 +34,7 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_A I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($${ADK_TARGET_KERNEL_CUSTOMISING},y) -ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) -TARGETS+=$$(PKG_$(1)) -endif -ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),y) +ifeq ($$(ADK_KERNEL_$(1)),m) TARGETS+=$$(PKG_$(1)) INSTALL_TARGETS+=$$(PKG_$(1)) endif diff --git a/mk/modules.mk b/mk/modules.mk index 67118a951..c0791abfa 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1749,10 +1749,6 @@ $(eval $(call KMOD_template,CRC32,crc32, \ $(MODULES_DIR)/kernel/lib/crc32 \ ,01)) -#$(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \ -# $(MODULES_DIR)/kernel/lib/libcrc32c \ -#,10)) - # # parallel port support # @@ -1788,6 +1784,7 @@ $(eval $(call KMOD_template,OPROFILE,oprofile,\ # # SPI # + $(eval $(call KMOD_template,SPI_BITBANG,spi-bitbang,\ $(MODULES_DIR)/kernel/drivers/spi/spi-bitbang \ ,20)) @@ -1799,6 +1796,7 @@ $(eval $(call KMOD_template,SPI_IMX,spi-imx,\ # # I2C # + $(eval $(call KMOD_template,I2C_DEV,i2c-dev,\ $(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \ ,20)) @@ -1814,6 +1812,7 @@ $(eval $(call KMOD_template,SCX200_ACB,scx200-acb,\ # # VirtIO # + $(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\ $(MODULES_DIR)/kernel/drivers/net/virtio_blk \ ,20)) diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index 5cc43e359..b34909e5b 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449 PKG_DESCR:= IPv4/IPv6 tunnel proxy PKG_SECTION:= ipv6 PKG_BUILDDEP:= autotool -PKG_DEPENDS:= kmod-ipv6 PKG_URL:= http://toxygen.net/6tunnel/ PKG_SITES:= http://toxygen.net/6tunnel/ diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 407c3a65c..155da938f 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 11 PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility PKG_SECTION:= ipv6 -PKG_DEPENDS:= kmod-ipv6 kmod-tun libpthread +PKG_DEPENDS:= libpthread PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index f19ca1a4e..33d9067f7 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= firmware for BCM2033 PKG_SECTION:= misc -PKG_DEPENDS:= kmod-bt bluez +PKG_DEPENDS:= bluez PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://bluez.sourceforge.net/download/ diff --git a/package/bluez/Makefile b/package/bluez/Makefile index b4bc70410..e2bdec773 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5d37e581107b3d6f91b81194a5006407 PKG_DESCR:= bluetooth applications PKG_SECTION:= wifi -PKG_DEPENDS:= kmod-bt glib dbus libreadline +PKG_DEPENDS:= glib dbus libreadline PKG_BUILDDEP:= autotool glib dbus readline PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://mirror.anl.gov/pub/linux/bluetooth/ diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index 678648059..9fec7c28a 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= ec7b381160b340648dede58c31bb2238 PKG_DESCR:= ethernet bridging tools PKG_SECTION:= bridge PKG_BUILDDEP:= autotool -PKG_DEPENDS:= kmod-bridge kmod-ipv6 PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index fb430112c..aa5c08470 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -7,10 +7,9 @@ PKG_NAME:= chillispot PKG_VERSION:= 1.1.0 PKG_RELEASE:= 2 PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b -PKG_DESCR:= Wireless LAN Access Point Controller +PKG_DESCR:= wireless LAN access point controller PKG_SECTION:= wifi PKG_BUILDDEP:= autotool -PKG_DEPENDS:= kmod-tun PKG_URL:= http://www.chillispot.info/ PKG_SITES= http://www.chillispot.info/download/ diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 3befb43a3..c58a8ecd6 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 93697dbc043cb4d5c66e15e281f872e5 PKG_DESCR:= CIFS network filesystem utilities PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-cifs kmod-nls-utf8 PKG_BUILDDEP:= autotool PKG_URL:= https://wiki.samba.org/index.php/LinuxCIFS_utils PKG_SITES:= ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/ diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index db0069b8b..4dc988f24 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto PKG_BUILDDEP:= openssl -PKG_DEPENDS:= kmod-crypto-manager2 PKG_URL:= http://home.gna.org/cryptodev-linux/ PKG_SITES:= http://download.gna.org/cryptodev-linux/ diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 0d53188af..2e9d42f78 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -10,8 +10,7 @@ PKG_MD5SUM:= a7aeb549a543eeac433eadfb6bc67837 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt -PKG_DEPENDS+= kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc -PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index e24333e15..7555a0134 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c75f9d7d260e7364362b89beba2b3186 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net/fs -PKG_DEPENDS:= fuse-utils kmod-fuse-fs neon +PKG_DEPENDS:= fuse-utils neon PKG_BUILDDEP:= libiconv-tiny neon fuse PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ PKG_SITES:= http://download.savannah.gnu.org/releases/davfs2/ diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 8d55c6900..15f7ee2fc 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 33cae22ca50311446400daf8a6255c6a PKG_DESCR:= filesystem in userspace utility PKG_SECTION:= fs -PKG_DEPENDS:= kmod-fuse-fs libfuse |