From d23791c20fc823b9dcf9afe322ad948cd9f022d4 Mon Sep 17 00:00:00 2001 From: nynex Date: Fri, 31 Jul 2015 19:26:39 +0000 Subject: [PATCH] Updated a few packages (erlang, dkjson, valgrind, diffutils, kexec-tools --- trunk/package/boot/kexec-tools/Config.in | 5 + trunk/package/boot/kexec-tools/Makefile | 14 +- .../0001-Fix-zlib-lzma-decompression.patch | 171 +++++++++ ...ly-necessary-quotes-to-result-of-mac.patch | 52 +++ ...r-warning-on-printing-64-bit-integer.patch | 35 ++ .../0004-mips-remove-unused-variable.patch | 30 ++ .../patches/0004-mips_regdefs.patch | 103 ------ ...rning-about-implicit-type-conversion.patch | 30 ++ .../kexec-tools/patches/100-reduce_size.patch | 36 -- trunk/package/devel/diffutils/Makefile | 8 +- trunk/package/devel/strace/Makefile | 12 +- .../patches/001-upstream-musl_includes.patch | 53 +++ .../devel/strace/patches/100-musl_fix.patch | 165 --------- trunk/package/devel/valgrind/Makefile | 7 +- ...x-configure-for-Linux-kernel-4.0-rc1.patch | 42 +++ .../devel/valgrind/patches/200-musl_fix.patch | 2 +- .../kernel/linux/modules/001-depends.mk | 18 - trunk/package/kernel/linux/modules/block.mk | 55 ++- trunk/package/kernel/linux/modules/can.mk | 2 +- trunk/package/kernel/linux/modules/crypto.mk | 169 ++++++--- trunk/package/kernel/linux/modules/fs.mk | 45 ++- trunk/package/kernel/linux/modules/hwmon.mk | 25 +- trunk/package/kernel/linux/modules/i2c.mk | 19 +- trunk/package/kernel/linux/modules/input.mk | 47 ++- trunk/package/kernel/linux/modules/leds.mk | 32 +- trunk/package/kernel/linux/modules/lib.mk | 21 +- .../kernel/linux/modules/netdevices.mk | 113 +++++- .../package/kernel/linux/modules/netfilter.mk | 70 ++-- .../kernel/linux/modules/netsupport.mk | 93 +++-- trunk/package/kernel/linux/modules/other.mk | 238 ++++++++----- trunk/package/kernel/linux/modules/sound.mk | 59 +--- trunk/package/kernel/linux/modules/usb.mk | 333 ++++++++++++------ trunk/package/kernel/linux/modules/video.mk | 41 +-- trunk/package/kernel/linux/modules/virtual.mk | 10 +- trunk/package/kernel/linux/modules/w1.mk | 16 + .../package/kernel/linux/modules/wireless.mk | 8 - trunk/package/kernel/linux/modules/wpan.mk | 122 +++++++ trunk/package/lang/dkjson/Makefile | 11 +- trunk/package/lang/erlang/Makefile | 39 +- .../lang/erlang/patches/102-musl_compat.patch | 11 + .../package/luci/modules/luci-base/src/po2lmo | Bin 19168 -> 19269 bytes .../luci/modules/luci-base/src/po2lmo.o | Bin 6008 -> 6296 bytes .../luci/modules/luci-base/src/template_lmo.o | Bin 6672 -> 7088 bytes 43 files changed, 1512 insertions(+), 850 deletions(-) create mode 100644 trunk/package/boot/kexec-tools/patches/0001-Fix-zlib-lzma-decompression.patch create mode 100644 trunk/package/boot/kexec-tools/patches/0002-configure.ac-apply-necessary-quotes-to-result-of-mac.patch create mode 100644 trunk/package/boot/kexec-tools/patches/0003-mips-fix-compiler-warning-on-printing-64-bit-integer.patch create mode 100644 trunk/package/boot/kexec-tools/patches/0004-mips-remove-unused-variable.patch delete mode 100644 trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch create mode 100644 trunk/package/boot/kexec-tools/patches/0005-mips-fix-warning-about-implicit-type-conversion.patch delete mode 100644 trunk/package/boot/kexec-tools/patches/100-reduce_size.patch create mode 100644 trunk/package/devel/strace/patches/001-upstream-musl_includes.patch delete mode 100644 trunk/package/devel/strace/patches/100-musl_fix.patch create mode 100644 trunk/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch delete mode 100644 trunk/package/kernel/linux/modules/wireless.mk create mode 100644 trunk/package/kernel/linux/modules/wpan.mk create mode 100644 trunk/package/lang/erlang/patches/102-musl_compat.patch diff --git a/trunk/package/boot/kexec-tools/Config.in b/trunk/package/boot/kexec-tools/Config.in index 2642171b..6c7558f3 100644 --- a/trunk/package/boot/kexec-tools/Config.in +++ b/trunk/package/boot/kexec-tools/Config.in @@ -23,4 +23,9 @@ config KEXEC_ZLIB prompt "zlib support" default y +config KEXEC_LZMA + bool + prompt "lzma support" + default n + endmenu diff --git a/trunk/package/boot/kexec-tools/Makefile b/trunk/package/boot/kexec-tools/Makefile index 8c1c255c..6f04bce7 100644 --- a/trunk/package/boot/kexec-tools/Makefile +++ b/trunk/package/boot/kexec-tools/Makefile @@ -8,23 +8,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kexec-tools -PKG_VERSION:=2.0.4 +PKG_VERSION:=2.0.9 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec -PKG_MD5SUM:=05992bc8c0673fc55be7b6d27e48a8db +PKG_MD5SUM:=6681319934e22e74c532bd392ccb1bbb PKG_FIXUP:=autoreconf -PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB +PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB CONFIG_KEXEC_LZMA include $(INCLUDE_DIR)/package.mk define Package/kexec-tools SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib + DEPENDS:=@KERNEL_KEXEC @armeb||@arm||@i386||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma TITLE:=Kernel boots kernel URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/ MAINTAINER:=Florian Fainelli @@ -55,7 +55,7 @@ CONFIGURE_ARGS = \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ $(if $(CONFIG_KEXEC_ZLIB),--with,--without)-zlib \ - --without-lzma + $(if $(CONFIG_KEXEC_LZMA),--with,--without)-lzma TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections @@ -81,7 +81,7 @@ define Package/kexec-tools/install # make a link for compatability with other distros $(INSTALL_DIR) $(1)/sbin - ln -s /usr/sbin/kexec $(1)/sbin/kexec + $(LN) ../usr/sbin/kexec $(1)/sbin/kexec endef $(eval $(call BuildPackage,kexec-tools)) diff --git a/trunk/package/boot/kexec-tools/patches/0001-Fix-zlib-lzma-decompression.patch b/trunk/package/boot/kexec-tools/patches/0001-Fix-zlib-lzma-decompression.patch new file mode 100644 index 00000000..06c11ec3 --- /dev/null +++ b/trunk/package/boot/kexec-tools/patches/0001-Fix-zlib-lzma-decompression.patch @@ -0,0 +1,171 @@ +From d606837b56d46eb7f815b5d85f07fcc3f1555d00 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Sun, 1 Feb 2015 00:10:07 +0800 +Subject: [PATCH 1/5] Fix zlib/lzma decompression. + +Let {zlib,lzma}_decompress_file() return NULL if anything wrong happened +to allow the other method to have a chance to run. + +Signed-off-by: Yousong Zhou +Signed-off-by: Simon Horman +--- + kexec/lzma.c | 33 ++++++++++++++++++++++----------- + kexec/zlib.c | 57 +++++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 57 insertions(+), 33 deletions(-) + +diff --git a/kexec/lzma.c b/kexec/lzma.c +index 939aeb3..5bfccb7 100644 +--- a/kexec/lzma.c ++++ b/kexec/lzma.c +@@ -162,13 +162,16 @@ char *lzma_decompress_file(const char *filename, off_t *r_size) + off_t size, allocated; + ssize_t result; + +- if (!filename) { +- *r_size = 0; +- return 0; +- } ++ dbgprintf("Try LZMA decompression.\n"); ++ ++ *r_size = 0; ++ if (!filename) ++ return NULL; ++ + fp = lzopen(filename, "rb"); + if (fp == 0) { +- die("Cannot open `%s'\n", filename); ++ dbgprintf("Cannot open `%s'\n", filename); ++ return NULL; + } + size = 0; + allocated = 65536; +@@ -183,17 +186,25 @@ char *lzma_decompress_file(const char *filename, off_t *r_size) + if ((errno == EINTR) || (errno == EAGAIN)) + continue; + +- die ("read on %s of %ld bytes failed\n", +- filename, (allocated - size) + 0UL); ++ dbgprintf("%s: read on %s of %ld bytes failed\n", ++ __func__, filename, (allocated - size) + 0UL); ++ break; + } + size += result; +- } while(result > 0); +- result = lzclose(fp); +- if (result != LZMA_OK) { +- die ("Close of %s failed\n", filename); ++ } while (result > 0); ++ ++ if (lzclose(fp) != LZMA_OK) { ++ dbgprintf("%s: Close of %s failed\n", __func__, filename); ++ goto fail; + } ++ if (result < 0) ++ goto fail; ++ + *r_size = size; + return buf; ++fail: ++ free(buf); ++ return NULL; + } + #else + char *lzma_decompress_file(const char *UNUSED(filename), off_t *UNUSED(r_size)) +diff --git a/kexec/zlib.c b/kexec/zlib.c +index d44df12..7170ac3 100644 +--- a/kexec/zlib.c ++++ b/kexec/zlib.c +@@ -15,29 +15,39 @@ + #include + #include + ++static void _gzerror(gzFile fp, int *errnum, const char **errmsg) ++{ ++ *errmsg = gzerror(fp, errnum); ++ if (*errnum == Z_ERRNO) { ++ *errmsg = strerror(*errnum); ++ } ++} ++ + char *zlib_decompress_file(const char *filename, off_t *r_size) + { + gzFile fp; + int errnum; + const char *msg; + char *buf; +- off_t size, allocated; ++ off_t size = 0, allocated; + ssize_t result; + ++ dbgprintf("Try gzip decompression.\n"); ++ ++ *r_size = 0; + if (!filename) { +- *r_size = 0; +- return 0; ++ return NULL; + } + fp = gzopen(filename, "rb"); + if (fp == 0) { +- msg = gzerror(fp, &errnum); +- if (errnum == Z_ERRNO) { +- msg = strerror(errno); +- } +- fprintf(stderr, "Cannot open `%s': %s\n", filename, msg); ++ _gzerror(fp, &errnum, &msg); ++ dbgprintf("Cannot open `%s': %s\n", filename, msg); ++ return NULL; ++ } ++ if (gzdirect(fp)) { ++ /* It's not in gzip format */ + return NULL; + } +- size = 0; + allocated = 65536; + buf = xmalloc(allocated); + do { +@@ -49,25 +59,28 @@ char *zlib_decompress_file(const char *filename, off_t *r_size) + if (result < 0) { + if ((errno == EINTR) || (errno == EAGAIN)) + continue; +- +- msg = gzerror(fp, &errnum); +- if (errnum == Z_ERRNO) { +- msg = strerror(errno); +- } +- die ("read on %s of %ld bytes failed: %s\n", +- filename, (allocated - size) + 0UL, msg); ++ _gzerror(fp, &errnum, &msg); ++ dbgprintf("Read on %s of %ld bytes failed: %s\n", ++ filename, (allocated - size) + 0UL, msg); ++ size = 0; ++ goto fail; + } + size += result; + } while(result > 0); ++ ++fail: + result = gzclose(fp); + if (result != Z_OK) { +- msg = gzerror(fp, &errnum); +- if (errnum == Z_ERRNO) { +- msg = strerror(errno); +- } +- die ("Close of %s failed: %s\n", filename, msg); ++ _gzerror(fp, &errnum, &msg); ++ dbgprintf(" Close of %s failed: %s\n", filename, msg); ++ } ++ ++ if (size > 0) { ++ *r_size = size; ++ } else { ++ free(buf); ++ buf = NULL; + } +- *r_size = size; + return buf; + } + #else +-- +1.7.10.4 + diff --git a/trunk/package/boot/kexec-tools/patches/0002-configure.ac-apply-necessary-quotes-to-result-of-mac.patch b/trunk/package/boot/kexec-tools/patches/0002-configure.ac-apply-necessary-quotes-to-result-of-mac.patch new file mode 100644 index 00000000..aba8af74 --- /dev/null +++ b/trunk/package/boot/kexec-tools/patches/0002-configure.ac-apply-necessary-quotes-to-result-of-mac.patch @@ -0,0 +1,52 @@ +From eb20884c9bbc42bdf1ccace4444f3ce72657d7d8 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Tue, 9 Sep 2014 20:15:16 +0800 +Subject: [PATCH 2/5] configure.ac: apply necessary quotes to result of macro + expansion. + +This can fix the following error when searching for lzma support and +while at it also apply the practice to other uses of the same pattern. + + checking for lzma_code in -llzma... ./configure: line 4756: ac_fn_c_try_link: command not found + +Signed-off-by: Yousong Zhou +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index db93331..c410e90 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -152,22 +152,22 @@ AC_CHECK_PROG([DIRNAME], dirname, dirname, "no", [$PATH]) + dnl See if I have a usable copy of zlib available + if test "$with_zlib" = yes ; then + AC_CHECK_HEADER(zlib.h, +- AC_CHECK_LIB(z, inflateInit_, , +- AC_MSG_NOTICE([zlib support disabled]))) ++ [AC_CHECK_LIB(z, inflateInit_, , ++ AC_MSG_NOTICE([zlib support disabled]))]) + fi + + dnl See if I have a usable copy of lzma available + if test "$with_lzma" = yes ; then + AC_CHECK_HEADER(lzma.h, +- AC_CHECK_LIB(lzma, lzma_code, , +- AC_MSG_NOTICE([lzma support disabled]))) ++ [AC_CHECK_LIB(lzma, lzma_code, , ++ AC_MSG_NOTICE([lzma support disabled]))]) + fi + + dnl find Xen control stack libraries + if test "$with_xen" = yes ; then + AC_CHECK_HEADER(xenctrl.h, +- AC_CHECK_LIB(xenctrl, xc_kexec_load, , +- AC_MSG_NOTICE([Xen support disabled]))) ++ [AC_CHECK_LIB(xenctrl, xc_kexec_load, , ++ AC_MSG_NOTICE([Xen support disabled]))]) + fi + + dnl ---Sanity checks +-- +1.7.10.4 + diff --git a/trunk/package/boot/kexec-tools/patches/0003-mips-fix-compiler-warning-on-printing-64-bit-integer.patch b/trunk/package/boot/kexec-tools/patches/0003-mips-fix-compiler-warning-on-printing-64-bit-integer.patch new file mode 100644 index 00000000..f4762e94 --- /dev/null +++ b/trunk/package/boot/kexec-tools/patches/0003-mips-fix-compiler-warning-on-printing-64-bit-integer.patch @@ -0,0 +1,35 @@ +From 89d455d785190203b1d3a8766c8babb8c1688fc3 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Mon, 9 Feb 2015 19:51:25 +0800 +Subject: [PATCH 3/5] mips: fix compiler warning on printing 64-bit integer. + + +Signed-off-by: Yousong Zhou +--- + kexec/arch/mips/crashdump-mips.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/kexec/arch/mips/crashdump-mips.c b/kexec/arch/mips/crashdump-mips.c +index e7840e0..98c9f7c 100644 +--- a/kexec/arch/mips/crashdump-mips.c ++++ b/kexec/arch/mips/crashdump-mips.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -52,7 +53,7 @@ static int get_kernel_paddr(struct crash_elf_info *elf_info) + + if (parse_iomem_single("Kernel code\n", &start, NULL) == 0) { + elf_info->kern_paddr_start = start; +- dbgprintf("kernel load physical addr start = 0x%lx\n", start); ++ dbgprintf("kernel load physical addr start = 0x%" PRIu64 "\n", start); + return 0; + } + +-- +1.7.10.4 + diff --git a/trunk/package/boot/kexec-tools/patches/0004-mips-remove-unused-variable.patch b/trunk/package/boot/kexec-tools/patches/0004-mips-remove-unused-variable.patch new file mode 100644 index 00000000..8626c413 --- /dev/null +++ b/trunk/package/boot/kexec-tools/patches/0004-mips-remove-unused-variable.patch @@ -0,0 +1,30 @@ +From 904e9ae892b0592c916a013869e3be3d830e0155 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Mon, 9 Feb 2015 20:11:04 +0800 +Subject: [PATCH 4/5] mips: remove unused variable. + +Fixes the following compilation warning. + + kexec/arch/mips/crashdump-mips.c:151:6: warning: unused variable 'i' [-Wunused-variable] + +Signed-off-by: Yousong Zhou +--- + kexec/arch/mips/crashdump-mips.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/arch/mips/crashdump-mips.c b/kexec/arch/mips/crashdump-mips.c +index 98c9f7c..dc68cb4 100644 +--- a/kexec/arch/mips/crashdump-mips.c ++++ b/kexec/arch/mips/crashdump-mips.c +@@ -148,7 +148,7 @@ static int exclude_crash_reserve_region(int *nr_ranges) + static int get_crash_memory_ranges(struct memory_range **range, int *ranges) + { + const char iomem[] = "/proc/iomem"; +- int i, memory_ranges = 0; ++ int memory_ranges = 0; + char line[MAX_LINE]; + FILE *fp; + unsigned long long start, end; +-- +1.7.10.4 + diff --git a/trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch b/trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch deleted file mode 100644 index 7e21349a..00000000 --- a/trunk/package/boot/kexec-tools/patches/0004-mips_regdefs.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- /dev/null -+++ b/kexec/arch/mips/regdef.h -@@ -0,0 +1,100 @@ -+/* -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file "COPYING" in the main directory of this archive -+ * for more details. -+ * -+ * Copyright (C) 1985 MIPS Computer Systems, Inc. -+ * Copyright (C) 1994, 95, 99, 2003 by Ralf Baechle -+ * Copyright (C) 1990 - 1992, 1999 Silicon Graphics, Inc. -+ */ -+#ifndef _ASM_REGDEF_H -+#define _ASM_REGDEF_H -+ -+#include -+ -+#if _MIPS_SIM == _MIPS_SIM_ABI32 -+ -+/* -+ * Symbolic register names for 32 bit ABI -+ */ -+#define zero $0 /* wired zero */ -+#define AT $1 /* assembler temp - uppercase because of ".set at" */ -+#define v0 $2 /* return value */ -+#define v1 $3 -+#define a0 $4 /* argument registers */ -+#define a1 $5 -+#define a2 $6 -+#define a3 $7 -+#define t0 $8 /* caller saved */ -+#define t1 $9 -+#define t2 $10 -+#define t3 $11 -+#define t4 $12 -+#define t5 $13 -+#define t6 $14 -+#define t7 $15 -+#define s0 $16 /* callee saved */ -+#define s1 $17 -+#define s2 $18 -+#define s3 $19 -+#define s4 $20 -+#define s5 $21 -+#define s6 $22 -+#define s7 $23 -+#define t8 $24 /* caller saved */ -+#define t9 $25 -+#define jp $25 /* PIC jump register */ -+#define k0 $26 /* kernel scratch */ -+#define k1 $27 -+#define gp $28 /* global pointer */ -+#define sp $29 /* stack pointer */ -+#define fp $30 /* frame pointer */ -+#define s8 $30 /* same like fp! */ -+#define ra $31 /* return address */ -+ -+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ -+ -+#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 -+ -+#define zero $0 /* wired zero */ -+#define AT $at /* assembler temp - uppercase because of ".set at" */ -+#define v0 $2 /* return value - caller saved */ -+#define v1 $3 -+#define a0 $4 /* argument registers */ -+#define a1 $5 -+#define a2 $6 -+#define a3 $7 -+#define a4 $8 /* arg reg 64 bit; caller saved in 32 bit */ -+#define ta0 $8 -+#define a5 $9 -+#define ta1 $9 -+#define a6 $10 -+#define ta2 $10 -+#define a7 $11 -+#define ta3 $11 -+#define t0 $12 /* caller saved */ -+#define t1 $13 -+#define t2 $14 -+#define t3 $15 -+#define s0 $16 /* callee saved */ -+#define s1 $17 -+#define s2 $18 -+#define s3 $19 -+#define s4 $20 -+#define s5 $21 -+#define s6 $22 -+#define s7 $23 -+#define t8 $24 /* caller saved */ -+#define t9 $25 /* callee address for PIC/temp */ -+#define jp $25 /* PIC jump register */ -+#define k0 $26 /* kernel temporary */ -+#define k1 $27 -+#define gp $28 /* global pointer - caller saved for PIC */ -+#define sp $29 /* stack pointer */ -+#define fp $30 /* frame pointer */ -+#define s8 $30 /* callee saved */ -+#define ra $31 /* return address */ -+ -+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */ -+ -+#endif /* _ASM_REGDEF_H */ diff --git a/trunk/package/boot/kexec-tools/patches/0005-mips-fix-warning-about-implicit-type-conversion.patch b/trunk/package/boot/kexec-tools/patches/0005-mips-fix-warning-about-implicit-type-conversion.patch new file mode 100644 index 00000000..008a62dc --- /dev/null +++ b/trunk/package/boot/kexec-tools/patches/0005-mips-fix-warning-about-implicit-type-conversion.patch @@ -0,0 +1,30 @@ +From 00e75179b3b4b80e6e58d29a2bd948f97682fd00 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Mon, 9 Feb 2015 20:28:14 +0800 +Subject: [PATCH 5/5] mips: fix warning about implicit type conversion. + +Fixes the following warning. + + kexec/arch/mips/kexec-elf-mips.c:161:16: warning: assignment makes integer from pointer without a cast [enabled by default] + +Signed-off-by: Yousong Zhou +--- + kexec/arch/mips/kexec-elf-mips.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kexec/arch/mips/kexec-elf-mips.c b/kexec/arch/mips/kexec-elf-mips.c +index a27d986..8a6419a 100644 +--- a/kexec/arch/mips/kexec-elf-mips.c ++++ b/kexec/arch/mips/kexec-elf-mips.c +@@ -158,7 +158,7 @@ int elf_mips_load(int argc, char **argv, const char *buf, off_t len, + if (info->kexec_flags & KEXEC_ON_CRASH) + /* In case of crashdump segment[0] is kernel. + * Put cmdline just after it. */ +- cmdline_addr = info->segment[0].mem + ++ cmdline_addr = (unsigned long)info->segment[0].mem + + info->segment[0].memsz; + else + cmdline_addr = 0; +-- +1.7.10.4 + diff --git a/trunk/package/boot/kexec-tools/patches/100-reduce_size.patch b/trunk/package/boot/kexec-tools/patches/100-reduce_size.patch deleted file mode 100644 index eafca7bf..00000000 --- a/trunk/package/boot/kexec-tools/patches/100-reduce_size.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/kexec/crashdump-xen.c -+++ b/kexec/crashdump-xen.c -@@ -111,6 +111,7 @@ static int xen_detect_pv_guest(void) - * This includes dom0, which is the only PV guest where kexec/kdump works. - * HVM guests have to be handled as native hardware. - */ -+#if defined(__i386__) || defined(__x86_64__) - int xen_present(void) - { - if (!is_dom0) { -@@ -121,6 +122,7 @@ int xen_present(void) - } - return is_dom0 > 0; - } -+#endif - - unsigned long xen_architecture(struct crash_elf_info *elf_info) - { ---- a/kexec/crashdump.h -+++ b/kexec/crashdump.h -@@ -56,7 +56,15 @@ unsigned long crash_architecture(struct - unsigned long phys_to_virt(struct crash_elf_info *elf_info, - unsigned long paddr); - -+#if defined(__i386__) || defined(__x86_64__) - int xen_present(void); -+#else -+static inline int xen_present(void) -+{ -+ return 0; -+} -+#endif -+ - unsigned long xen_architecture(struct crash_elf_info *elf_info); - int xen_get_nr_phys_cpus(void); - int xen_get_note(int cpu, uint64_t *addr, uint64_t *len); diff --git a/trunk/package/devel/diffutils/Makefile b/trunk/package/devel/diffutils/Makefile index 33cdc121..fb00a42d 100644 --- a/trunk/package/devel/diffutils/Makefile +++ b/trunk/package/devel/diffutils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2012 OpenWrt.org +# Copyright (C) 2008-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=diffutils PKG_VERSION:=3.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/diffutils @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/diffutils SECTION:=devel CATEGORY:=Development - DEPENDS:=+USE_EGLIBC:librt + DEPENDS:=+USE_GLIBC:librt TITLE:=diffutils URL:=http://www.gnu.org/software/diffutils/ endef @@ -36,7 +36,7 @@ endef CONFIGURE_VARS += \ ac_cv_func_mempcpy=n -TARGET_CFLAGS += --std=c99 +TARGET_CFLAGS += --std=gnu99 define Package/diffutils/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/trunk/package/devel/strace/Makefile b/trunk/package/devel/strace/Makefile index 4c29d69c..76c140aa 100644 --- a/trunk/package/devel/strace/Makefile +++ b/trunk/package/devel/strace/Makefile @@ -10,9 +10,9 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=4.8 +PKG_VERSION:=4.10 PKG_RELEASE:=1 -PKG_MD5SUM:=c575ef43829586801f514fd91bfe7575 +PKG_MD5SUM:=107a5be455493861189e9b57a3a51912 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -27,6 +27,14 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include + +CONFIGURE_VARS+= \ + LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \ + CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ + CC_FOR_BUILD="$(HOST_CC)" + define Package/strace SECTION:=utils CATEGORY:=Utilities diff --git a/trunk/package/devel/strace/patches/001-upstream-musl_includes.patch b/trunk/package/devel/strace/patches/001-upstream-musl_includes.patch new file mode 100644 index 00000000..a35d7fd5 --- /dev/null +++ b/trunk/package/devel/strace/patches/001-upstream-musl_includes.patch @@ -0,0 +1,53 @@ +--- a/evdev.c ++++ b/evdev.c +@@ -28,6 +28,8 @@ + + #include "defs.h" + ++#include ++ + #ifdef HAVE_LINUX_INPUT_H + #include + #include "xlat/evdev_abs.h" +--- a/ioctl.c ++++ b/ioctl.c +@@ -29,7 +29,7 @@ + */ + + #include "defs.h" +-#include ++#include + #include "xlat/ioctl_dirs.h" + + #ifdef HAVE_LINUX_INPUT_H +--- a/ioctlsort.c ++++ b/ioctlsort.c +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + struct ioctlent { + const char *info; +--- a/mknod.c ++++ b/mknod.c +@@ -1,6 +1,7 @@ + #include "defs.h" + + #include ++#include + + #ifdef MAJOR_IN_SYSMACROS + # include +--- a/printmode.c ++++ b/printmode.c +@@ -1,6 +1,7 @@ + #include "defs.h" + + #include ++#include + + #include "xlat/modetypes.h" + diff --git a/trunk/package/devel/strace/patches/100-musl_fix.patch b/trunk/package/devel/strace/patches/100-musl_fix.patch deleted file mode 100644 index e4105bc5..00000000 --- a/trunk/package/devel/strace/patches/100-musl_fix.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- a/net.c -+++ b/net.c -@@ -50,11 +50,7 @@ - #include - #include - #include --#if defined(__GLIBC__) --# include --#else --# include --#endif -+#include - - #if defined(__GLIBC__) && defined(HAVE_SIN6_SCOPE_ID_LINUX) - # if defined(HAVE_LINUX_IN6_H) -@@ -94,14 +90,6 @@ - # define PF_UNSPEC AF_UNSPEC - #endif - --/* Under Linux these are enums so we can't test for them with ifdef. */ --#define IPPROTO_EGP IPPROTO_EGP --#define IPPROTO_PUP IPPROTO_PUP --#define IPPROTO_IDP IPPROTO_IDP --#define IPPROTO_IGMP IPPROTO_IGMP --#define IPPROTO_RAW IPPROTO_RAW --#define IPPROTO_MAX IPPROTO_MAX -- - static const struct xlat domains[] = { - #ifdef PF_UNSPEC - { PF_UNSPEC, "PF_UNSPEC" }, -@@ -493,24 +481,16 @@ static const struct xlat protocols[] = { - { IPPROTO_ICMP, "IPPROTO_ICMP" }, - { IPPROTO_TCP, "IPPROTO_TCP" }, - { IPPROTO_UDP, "IPPROTO_UDP" }, --#ifdef IPPROTO_IGMP - { IPPROTO_IGMP, "IPPROTO_IGMP" }, --#endif - #ifdef IPPROTO_GGP - { IPPROTO_GGP, "IPPROTO_GGP" }, - #endif - #ifdef IPPROTO_IPIP - { IPPROTO_IPIP, "IPPROTO_IPIP" }, - #endif --#ifdef IPPROTO_EGP - { IPPROTO_EGP, "IPPROTO_EGP" }, --#endif --#ifdef IPPROTO_PUP - { IPPROTO_PUP, "IPPROTO_PUP" }, --#endif --#ifdef IPPROTO_IDP - { IPPROTO_IDP, "IPPROTO_IDP" }, --#endif - #ifdef IPPROTO_TP - { IPPROTO_TP, "IPPROTO_TP" }, - #endif -@@ -571,12 +551,8 @@ static const struct xlat protocols[] = { - #ifdef IPPROTO_UDPLITE - { IPPROTO_UDPLITE, "IPPROTO_UDPLITE" }, - #endif --#ifdef IPPROTO_RAW - { IPPROTO_RAW, "IPPROTO_RAW" }, --#endif --#ifdef IPPROTO_MAX - { IPPROTO_MAX, "IPPROTO_MAX" }, --#endif - { 0, NULL }, - }; - static const struct xlat msg_flags[] = { ---- a/process.c -+++ b/process.c -@@ -55,19 +55,6 @@ - # endif - #endif - --#ifdef HAVE_LINUX_PTRACE_H --# undef PTRACE_SYSCALL --# ifdef HAVE_STRUCT_IA64_FPREG --# define ia64_fpreg XXX_ia64_fpreg --# endif --# ifdef HAVE_STRUCT_PT_ALL_USER_REGS --# define pt_all_user_regs XXX_pt_all_user_regs --# endif --# include --# undef ia64_fpreg --# undef pt_all_user_regs --#endif -- - #if defined(SPARC64) - # define r_pc r_tpc - # undef PTRACE_GETREGS -@@ -94,6 +81,7 @@ - - #include - #include -+#include - #undef GETGROUPS_T - #define GETGROUPS_T __kernel_gid_t - #undef GETGROUPS32_T -@@ -2857,7 +2845,7 @@ sys_sched_setscheduler(struct tcb *tcp) - if (umove(tcp, tcp->u_arg[2], &p) < 0) - tprintf(", %#lx", tcp->u_arg[2]); - else -- tprintf(", { %d }", p.__sched_priority); -+ tprintf(", { %d }", p.sched_priority); - } - return 0; - } -@@ -2872,7 +2860,7 @@ sys_sched_getparam(struct tcb *tcp) - if (umove(tcp, tcp->u_arg[1], &p) < 0) - tprintf("%#lx", tcp->u_arg[1]); - else -- tprintf("{ %d }", p.__sched_priority); -+ tprintf("{ %d }", p.sched_priority); - } - return 0; - } -@@ -2885,7 +2873,7 @@ sys_sched_setparam(struct tcb *tcp) - if (umove(tcp, tcp->u_arg[1], &p) < 0) - tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); - else -- tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority); -+ tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority); - } - return 0; - } ---- a/signal.c -+++ b/signal.c -@@ -35,6 +35,7 @@ - #include - #include - -+#include - #ifdef HAVE_SYS_REG_H - # include - # ifndef PTRACE_PEEKUSR ---- a/time.c -+++ b/time.c -@@ -774,7 +774,7 @@ printsigevent(struct tcb *tcp, long arg) - /* _pad[0] is the _tid field which might not be - present in the userlevel definition of the - struct. */ -- tprintf("{%d}", sev._sigev_un._pad[0]); -+ tprintf("{%d}", *(int *) &sev.sigev_notify_function); - else if (sev.sigev_notify == SIGEV_THREAD) - tprintf("{%p, %p}", sev.sigev_notify_function, - sev.sigev_notify_attributes); ---- a/defs.h -+++ b/defs.h -@@ -27,6 +27,7 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _LARGEFILE64_SOURCE 1 - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif -@@ -222,7 +223,7 @@ extern long ptrace(int, int, char *, lon - # define PTRACE_EVENT_EXIT 6 - #endif - --#if !defined(__GLIBC__) -+#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER) - # define PTRACE_PEEKUSER PTRACE_PEEKUSR - # define PTRACE_POKEUSER PTRACE_POKEUSR - #endif diff --git a/trunk/package/devel/valgrind/Makefile b/trunk/package/devel/valgrind/Makefile index e2c7f672..3abed9c7 100644 --- a/trunk/package/devel/valgrind/Makefile +++ b/trunk/package/devel/valgrind/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=valgrind -PKG_VERSION:=3.10.0 +PKG_VERSION:=3.10.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://valgrind.org/downloads/ -PKG_MD5SUM:=7c311a72a20388aceced1aa5573ce970 +PKG_MD5SUM:=60ddae962bc79e7c95cfc4667245707f PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0+ @@ -101,7 +101,8 @@ CONFIGURE_ARGS += \ --disable-valgrindmi \ --disable-tui \ --disable-valgrindtk \ - --without-included-gettext + --without-included-gettext \ + --with-pagesize=4 \ define Package/valgrind/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/trunk/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch b/trunk/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch new file mode 100644 index 00000000..b833f189 --- /dev/null +++ b/trunk/package/devel/valgrind/patches/120-Fix-configure-for-Linux-kernel-4.0-rc1.patch @@ -0,0 +1,42 @@ +From bf803555d10b5b4c9223b24bf13845ee88d8f3b5 Mon Sep 17 00:00:00 2001 +From: cborntra +Date: Mon, 23 Feb 2015 20:19:03 +0000 +Subject: [PATCH] Fix configure for Linux kernel >= 4.0-rc1 In addition raise + the minimal Linux version to 2.6 as there is almost no test coverage for 2.4 + and 2.6 was released in 2003. + +git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14955 a5019735-40e9-0310-863c-91ae7b9d1cf9 +--- + NEWS | 3 +++ + configure.ac | 18 ++++++------------ + 2 files changed, 9 insertions(+), 12 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -303,20 +303,14 @@ case "${host_os}" in + kernel=${UNAME_R:-`uname -r`} + + case "${kernel}" in +- 2.6.*|3.*) +- AC_MSG_RESULT([2.6.x/3.x family (${kernel})]) +- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x]) +- ;; +- +- 2.4.*) +- AC_MSG_RESULT([2.4 family (${kernel})]) +- AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x]) +- ;; +- +- *) ++ 0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*) + AC_MSG_RESULT([unsupported (${kernel})]) +- AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6]) ++ AC_MSG_ERROR([Valgrind needs a Linux kernel >= 2.6]) + ;; ++ ++ *) ++ AC_MSG_RESULT([2.6 or later (${kernel})]) ++ ;; + esac + + ;; diff --git a/trunk/package/devel/valgrind/patches/200-musl_fix.patch b/trunk/package/devel/valgrind/patches/200-musl_fix.patch index 7bb20296..e61e822b 100644 --- a/trunk/package/devel/valgrind/patches/200-musl_fix.patch +++ b/trunk/package/devel/valgrind/patches/200-musl_fix.patch @@ -34,7 +34,7 @@ #else --- a/configure.ac +++ b/configure.ac -@@ -1031,8 +1031,6 @@ case "${GLIBC_VERSION}" in +@@ -1025,8 +1025,6 @@ case "${GLIBC_VERSION}" in *) AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) diff --git a/trunk/package/kernel/linux/modules/001-depends.mk b/trunk/package/kernel/linux/modules/001-depends.mk index d0ad0836..806c3dcf 100644 --- a/trunk/package/kernel/linux/modules/001-depends.mk +++ b/trunk/package/kernel/linux/modules/001-depends.mk @@ -5,19 +5,6 @@ # See /LICENSE for more information. # -define AddDepends/crc16 - DEPENDS+= +kmod-lib-crc16 $(1) -endef - -define AddDepends/hid - DEPENDS+= +kmod-hid $(1) -endef - -define AddDepends/input - DEPENDS+= +kmod-input-core $(1) -endef - - define AddDepends/nls DEPENDS+= +kmod-nls-base $(foreach cp,$(1),+kmod-nls-$(cp)) endef @@ -25,8 +12,3 @@ endef define AddDepends/rfkill DEPENDS+= +USE_RFKILL:kmod-rfkill $(1) endef - - -define AddDepends/rtc - DEPENDS+= @RTC_SUPPORT $(1) -endef diff --git a/trunk/package/kernel/linux/modules/block.mk b/trunk/package/kernel/linux/modules/block.mk index 8a84aa4e..ccbb0805 100644 --- a/trunk/package/kernel/linux/modules/block.mk +++ b/trunk/package/kernel/linux/modules/block.mk @@ -56,6 +56,23 @@ endef $(eval $(call KernelPackage,ata-ahci)) +define KernelPackage/ata-ahci-platform + TITLE:=AHCI Serial ATA Platform support + KCONFIG:=CONFIG_SATA_AHCI_PLATFORM + FILES:= \ + $(LINUX_DIR)/drivers/ata/ahci_platform.ko \ + $(LINUX_DIR)/drivers/ata/libahci_platform.ko + AUTOLOAD:=$(call AutoLoad,40,libahci_platform ahci_platform,1) + $(call AddDepends/ata,@TARGET_ipq806x||TARGET_mvebu +kmod-ata-ahci) +endef + +define KernelPackage/ata-ahci-platform/description + Platform support for AHCI Serial ATA controllers +endef + +$(eval $(call KernelPackage,ata-ahci-platform)) + + define KernelPackage/ata-artop TITLE:=ARTOP 6210/6260 PATA support KCONFIG:=CONFIG_PATA_ARTOP @@ -105,6 +122,22 @@ endef $(eval $(call KernelPackage,ata-marvell-sata)) +define KernelPackage/ata-mvebu-ahci + TITLE:=Marvell EBU AHCI support + DEPENDS:=@TARGET_mvebu +kmod-ata-ahci-platform + KCONFIG:=CONFIG_AHCI_MVEBU + FILES:=$(LINUX_DIR)/drivers/ata/ahci_mvebu.ko + AUTOLOAD:=$(call AutoLoad,41,ahci_mvebu,1) + $(call AddDepends/ata) +endef + +define KernelPackage/ata-mvebu-ahci/description + AHCI support for Marvell EBU SoCs +endef + +$(eval $(call KernelPackage,ata-mvebu-ahci)) + + define KernelPackage/ata-nvidia-sata TITLE:=Nvidia Serial ATA support KCONFIG:=CONFIG_SATA_NV @@ -116,6 +149,22 @@ endef $(eval $(call KernelPackage,ata-nvidia-sata)) +define KernelPackage/ata-oxnas-sata + TITLE:=oxnas Serial ATA support + KCONFIG:=CONFIG_SATA_OXNAS + DEPENDS:=@TARGET_oxnas + FILES:=$(LINUX_DIR)/drivers/ata/sata_oxnas.ko + AUTOLOAD:=$(call AutoLoad,41,sata_oxnas,1) + $(call AddDepends/ata) +endef + +define KernelPackage/ata-oxnas-sata/description + SATA support for OX934 core found in the OX82x/PLX782x SoCs +endef + +$(eval $(call KernelPackage,ata-oxnas-sata)) + + define KernelPackage/ata-pdc202xx-old SUBMENU:=$(BLOCK_MENU) TITLE:=Older Promise PATA controller support @@ -218,6 +267,8 @@ define KernelPackage/dm CONFIG_DM_DEBUG=n \ CONFIG_DM_UEVENT=n \ CONFIG_DM_DELAY=n \ + CONFIG_DM_LOG_WRITES=n \ + CONFIG_DM_MQ_DEFAULT=n \ CONFIG_DM_MULTIPATH=n \ CONFIG_DM_ZERO=n \ CONFIG_DM_SNAPSHOT=n \ @@ -565,9 +616,9 @@ define KernelPackage/scsi-core CONFIG_SCSI \ CONFIG_BLK_DEV_SD FILES:= \ - $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.ko) \ + $(LINUX_DIR)/drivers/scsi/scsi_mod.ko \ $(LINUX_DIR)/drivers/scsi/sd_mod.ko - AUTOLOAD:=$(call AutoLoad,40,sd_mod,1) + AUTOLOAD:=$(call AutoLoad,40,scsi_mod sd_mod,1) endef $(eval $(call KernelPackage,scsi-core)) diff --git a/trunk/package/kernel/linux/modules/can.mk b/trunk/package/kernel/linux/modules/can.mk index 9245490a..f9490b40 100644 --- a/trunk/package/kernel/linux/modules/can.mk +++ b/trunk/package/kernel/linux/modules/can.mk @@ -240,7 +240,7 @@ $(eval $(call KernelPackage,can-c-can)) define KernelPackage/can-c-can-platform TITLE:=Platform Bus based BOSCH C_CAN/D_CAN driver KCONFIG:=CONFIG_CAN_C_CAN_PLATFORM - DEPENDS:=kmod-can-c-can + DEPENDS:=kmod-can-c-can +LINUX_4_1:kmod-regmap FILES:=$(LINUX_DIR)/drivers/net/can/c_can/c_can_platform.ko AUTOLOAD:=$(call AutoProbe,c_can_platform) $(call AddDepends/can) diff --git a/trunk/package/kernel/linux/modules/crypto.mk b/trunk/package/kernel/linux/modules/crypto.mk index d9d673c1..84e5147b 100644 --- a/trunk/package/kernel/linux/modules/crypto.mk +++ b/trunk/package/kernel/linux/modules/crypto.mk @@ -11,10 +11,6 @@ CRYPTO_MODULES = \ ALGAPI2=crypto_algapi \ BLKCIPHER2=crypto_blkcipher -CRYPTOMGR_MODULES = \ - AEAD2=aead \ - MANAGER2=cryptomgr \ - crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1)))) @@ -39,6 +35,19 @@ define AddDepends/crypto DEPENDS+=+kmod-crypto-core $(1) endef +define KernelPackage/crypto-aead + TITLE:=CryptoAPI AEAD support + KCONFIG:= \ + CONFIG_CRYPTO_AEAD \ + CONFIG_CRYPTO_AEAD2 + FILES:=$(LINUX_DIR)/crypto/aead.ko + AUTOLOAD:=$(call AutoLoad,09,crypto_aead,1) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-aead)) + + define KernelPackage/crypto-hash TITLE:=CryptoAPI hash support KCONFIG:=CONFIG_CRYPTO_HASH @@ -52,12 +61,11 @@ $(eval $(call KernelPackage,crypto-hash)) define KernelPackage/crypto-manager TITLE:=CryptoAPI algorithm manager - DEPENDS:=+kmod-crypto-hash +kmod-crypto-pcompress + DEPENDS:=+kmod-crypto-aead +kmod-crypto-hash +kmod-crypto-pcompress KCONFIG:= \ - CONFIG_CRYPTO_AEAD \ CONFIG_CRYPTO_MANAGER \ - $(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod))) - FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod))) + CONFIG_CRYPTO_MANAGER2 + FILES:=$(LINUX_DIR)/crypto/cryptomgr.ko $(call AddDepends/crypto) endef @@ -130,10 +138,21 @@ endef $(eval $(call KernelPackage,crypto-iv)) +define KernelPackage/crypto-seqiv + TITLE:=CryptoAPI Sequence Number IV Generator + DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng + KCONFIG:=CONFIG_CRYPTO_SEQIV + FILES:=$(LINUX_DIR)/crypto/seqiv.ko + AUTOLOAD:=$(call AutoLoad,09,seqiv) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-seqiv)) + define KernelPackage/crypto-hw-talitos TITLE:=Freescale integrated security engine (SEC) driver - DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc + DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc KCONFIG:= \ CONFIG_CRYPTO_DEV_TALITOS FILES:= \ @@ -147,7 +166,7 @@ $(eval $(call KernelPackage,crypto-hw-talitos)) define KernelPackage/crypto-hw-padlock TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager + DEPENDS:=+kmod-crypto-manager KCONFIG:= \ CONFIG_CRYPTO_DEV_PADLOCK \ CONFIG_CRYPTO_DEV_PADLOCK_AES \ @@ -235,22 +254,6 @@ endef $(eval $(call KernelPackage,crypto-hw-omap)) -define KernelPackage/crypto-aes - TITLE:=AES cipher CryptoAPI module - KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/crypto/aes_generic.ko - AUTOLOAD:=$(call AutoLoad,09,aes_generic) - $(call AddDepends/crypto) -endef - -define KernelPackage/crypto-aes/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko - AUTOLOAD:=$(call AutoLoad,09,aes-i586) -endef - -$(eval $(call KernelPackage,crypto-aes)) - - define KernelPackage/crypto-arc4 TITLE:=ARC4 (RC4) cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_ARC4 @@ -284,6 +287,28 @@ endef $(eval $(call KernelPackage,crypto-cbc)) +define KernelPackage/crypto-ctr + TITLE:=Counter Mode CryptoAPI module + DEPENDS:=+kmod-crypto-manager +kmod-crypto-seqiv +kmod-crypto-iv + KCONFIG:=CONFIG_CRYPTO_CTR + FILES:=$(LINUX_DIR)/crypto/ctr.ko + AUTOLOAD:=$(call AutoLoad,09,ctr) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-ctr)) + +define KernelPackage/crypto-ccm + TITLE:=Support for Counter with CBC MAC (CCM) + DEPENDS:=+kmod-crypto-ctr +kmod-crypto-aead + KCONFIG:=CONFIG_CRYPTO_CCM + FILES:=$(LINUX_DIR)/crypto/ccm.ko + AUTOLOAD:=$(call AutoLoad,09,ccm) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-ccm)) + define KernelPackage/crypto-pcbc TITLE:=Propagating Cipher Block Chaining CryptoAPI module DEPENDS:=+kmod-crypto-manager @@ -299,13 +324,8 @@ define KernelPackage/crypto-crc32c TITLE:=CRC32c CRC module DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_CRC32C -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.15.0)),1) FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1) -else - FILES:=$(LINUX_DIR)/crypto/crc32c.ko - AUTOLOAD:=$(call AutoLoad,04,crc32c,1) -endif $(call AddDepends/crypto) endef @@ -370,6 +390,53 @@ endef $(eval $(call KernelPackage,crypto-hmac)) +define KernelPackage/crypto-cmac + TITLE:=Support for Cipher-based Message Authentication Code (CMAC) + DEPENDS:=+kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_CMAC + FILES:=$(LINUX_DIR)/crypto/cmac.ko + AUTOLOAD:=$(call AutoLoad,09,cmac) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-cmac)) + + +define KernelPackage/crypto-gcm + TITLE:=GCM/GMAC CryptoAPI module + DEPENDS:=+kmod-crypto-ctr +kmod-crypto-ghash +kmod-crypto-null + KCONFIG:=CONFIG_CRYPTO_GCM + FILES:=$(LINUX_DIR)/crypto/gcm.ko + AUTOLOAD:=$(call AutoLoad,09,gcm) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-gcm)) + + +define KernelPackage/crypto-gf128 + TITLE:=GF(2^128) multiplication functions CryptoAPI module + KCONFIG:=CONFIG_CRYPTO_GF128MUL + FILES:=$(LINUX_DIR)/crypto/gf128mul.ko + AUTOLOAD:=$(call AutoLoad,09,gf128mul) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-gf128)) + + +define KernelPackage/crypto-ghash + TITLE:=GHASH digest CryptoAPI module + DEPENDS:=+kmod-crypto-gf128 +kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_GHASH + FILES:=$(LINUX_DIR)/crypto/ghash-generic.ko + AUTOLOAD:=$(call AutoLoad,09,ghash-generic) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-ghash)) + + define KernelPackage/crypto-md4 TITLE:=MD4 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash @@ -430,13 +497,6 @@ endef $(eval $(call KernelPackage,crypto-sha256)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) -camellia_mod_suffix=_generic -endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) -cast56_mod_suffix=_generic -endif - define KernelPackage/crypto-misc TITLE:=Other CryptoAPI modules DEPENDS:=+kmod-crypto-manager @@ -458,10 +518,10 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_WP512 FILES:= \ $(LINUX_DIR)/crypto/anubis.ko \ - $(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \ - $(if $(call kernel_patchver_ge,3.7),$(LINUX_DIR)/crypto/cast_common.ko) \ - $(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \ - $(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \ + $(LINUX_DIR)/crypto/camellia_generic.ko \ + $(LINUX_DIR)/crypto/cast_common.ko \ + $(LINUX_DIR)/crypto/cast5_generic.ko \ + $(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/khazad.ko \ $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ @@ -475,9 +535,11 @@ define KernelPackage/crypto-misc $(call AddDepends/crypto) endef -define KernelPackage/crypto-misc/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko -endef +ifndef CONFIG_TARGET_x86_64 + define KernelPackage/crypto-misc/x86 + FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko + endef +endif $(eval $(call KernelPackage,crypto-misc)) @@ -553,17 +615,10 @@ $(eval $(call KernelPackage,crypto-test)) define KernelPackage/crypto-xts TITLE:=XTS cipher CryptoAPI module - DEPENDS:=+kmod-crypto-manager - KCONFIG:= \ - CONFIG_CRYPTO_GF128MUL \ - CONFIG_CRYPTO_XTS - FILES:= \ - $(LINUX_DIR)/crypto/xts.ko \ - $(LINUX_DIR)/crypto/gf128mul.ko - AUTOLOAD:=$(call AutoLoad,09, \ - gf128mul \ - xts \ - ) + DEPENDS:=+kmod-crypto-gf128 +kmod-crypto-manager + KCONFIG:=CONFIG_CRYPTO_XTS + FILES:=$(LINUX_DIR)/crypto/xts.ko + AUTOLOAD:=$(call AutoLoad,09,xts) $(call AddDepends/crypto) endef @@ -572,7 +627,7 @@ $(eval $(call KernelPackage,crypto-xts)) define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion||TARGET_mvebu + DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko AUTOLOAD:=$(call AutoLoad,09,mv_cesa) diff --git a/trunk/package/kernel/linux/modules/fs.mk b/trunk/package/kernel/linux/modules/fs.mk index c1174154..e702a3d9 100644 --- a/trunk/package/kernel/linux/modules/fs.mk +++ b/trunk/package/kernel/linux/modules/fs.mk @@ -62,7 +62,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-raid6 +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8):kmod-lib-xor + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +kmod-lib-raid6 +kmod-lib-xor KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_POSIX_ACL=n \ @@ -96,7 +96,7 @@ define KernelPackage/fs-cifs +kmod-crypto-md4 \ +kmod-crypto-des \ +kmod-crypto-ecb \ - +!LINUX_3_3&&!LINUX_3_6:kmod-crypto-sha256 + +kmod-crypto-sha256 endef define KernelPackage/fs-cifs/description @@ -155,15 +155,18 @@ $(eval $(call KernelPackage,fs-exportfs)) define KernelPackage/fs-ext4 SUBMENU:=$(FS_MENU) TITLE:=EXT4 filesystem support + DEPENDS := \ + +kmod-lib-crc16 \ + +kmod-crypto-hash KCONFIG:= \ CONFIG_EXT4_FS \ + CONFIG_EXT4_ENCRYPTION=n \ CONFIG_JBD2 FILES:= \ $(LINUX_DIR)/fs/ext4/ext4.ko \ $(LINUX_DIR)/fs/jbd2/jbd2.ko \ $(LINUX_DIR)/fs/mbcache.ko AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1) - $(call AddDepends/crc16, +!LINUX_3_3:kmod-crypto-hash) endef define KernelPackage/fs-ext4/description @@ -173,6 +176,27 @@ endef $(eval $(call KernelPackage,fs-ext4)) +define KernelPackage/fs-f2fs + SUBMENU:=$(FS_MENU) + TITLE:=F2FS filesystem support + KCONFIG:= \ + CONFIG_F2FS_FS \ + CONFIG_F2FS_STAT_FS=y \ + CONFIG_F2FS_FS_XATTR=y \ + CONFIG_F2FS_FS_POSIX_ACL=n \ + CONFIG_F2FS_FS_SECURITY=n \ + CONFIG_F2FS_CHECK_FS=n + FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko + AUTOLOAD:=$(call AutoLoad,30,f2fs,1) +endef + +define KernelPackage/fs-f2fs/description + Kernel module for F2FS filesystem support +endef + +$(eval $(call KernelPackage,fs-f2fs)) + + define KernelPackage/fuse SUBMENU:=$(FS_MENU) TITLE:=FUSE (Filesystem in Userspace) support @@ -277,14 +301,9 @@ define KernelPackage/fs-nfs CONFIG_NFS_FS \ CONFIG_NFS_USE_LEGACY_DNS=n \ CONFIG_NFS_USE_NEW_IDMAPPER=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) FILES:= \ $(LINUX_DIR)/fs/nfs/nfs.ko \ $(LINUX_DIR)/fs/nfs/nfsv3.ko -else - FILES:= \ - $(LINUX_DIR)/fs/nfs/nfs.ko -endif AUTOLOAD:=$(call AutoLoad,40,nfs nfsv3) endef @@ -300,11 +319,13 @@ define KernelPackage/fs-nfs-common TITLE:=Common NFS filesystem modules KCONFIG:= \ CONFIG_LOCKD \ - CONFIG_SUNRPC + CONFIG_SUNRPC \ + CONFIG_GRACE_PERIOD FILES:= \ $(LINUX_DIR)/fs/lockd/lockd.ko \ - $(LINUX_DIR)/net/sunrpc/sunrpc.ko - AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd) + $(LINUX_DIR)/net/sunrpc/sunrpc.ko \ + $(LINUX_DIR)/fs/nfs_common/grace.ko + AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd) endef $(eval $(call KernelPackage,fs-nfs-common)) @@ -419,7 +440,7 @@ define KernelPackage/fs-xfs SUBMENU:=$(FS_MENU) TITLE:=XFS filesystem support KCONFIG:=CONFIG_XFS_FS - DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c @!avr32 + DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko AUTOLOAD:=$(call AutoLoad,30,xfs,1) endef diff --git a/trunk/package/kernel/linux/modules/hwmon.mk b/trunk/package/kernel/linux/modules/hwmon.mk index 5b7936a9..c649847a 100644 --- a/trunk/package/kernel/linux/modules/hwmon.mk +++ b/trunk/package/kernel/linux/modules/hwmon.mk @@ -46,7 +46,6 @@ $(eval $(call KernelPackage,hwmon-vid)) define KernelPackage/hwmon-adt7410 TITLE:=ADT7410 monitoring support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.10.0)),1) KCONFIG:= \ CONFIG_SENSORS_ADT7X10 \ CONFIG_SENSORS_ADT7410 @@ -54,12 +53,7 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.10.0)),1) $(LINUX_DIR)/drivers/hwmon/adt7x10.ko \ $(LINUX_DIR)/drivers/hwmon/adt7410.ko AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410) -else - KCONFIG:=CONFIG_SENSORS_ADT7410 - FILES:=$(LINUX_DIR)/drivers/hwmon/adt7410.ko - AUTOLOAD:=$(call AutoLoad,60,adt7410) -endif - $(call AddDepends/hwmon,+kmod-i2c-core @!(LINUX_3_3||LINUX_3_6)) + $(call AddDepends/hwmon,+kmod-i2c-core) endef define KernelPackage/hwmon-adt7410/description @@ -290,12 +284,27 @@ endef $(eval $(call KernelPackage,hwmon-gpiofan)) +define KernelPackage/hwmon-pwmfan + TITLE:=Generic PWM FAN support + KCONFIG:=CONFIG_SENSORS_PWM_FAN + FILES:=$(LINUX_DIR)/drivers/hwmon/pwm-fan.ko + AUTOLOAD:=$(call AutoLoad,60,pwm-fan) + $(call AddDepends/hwmon,) +endef + +define KernelPackage/hwmon-pwmfan/description + Kernel module for PWM controlled FANs +endef + +$(eval $(call KernelPackage,hwmon-pwmfan)) + + define KernelPackage/hwmon-k10temp TITLE:=AMD Family 10h+ temperature sensor KCONFIG:=CONFIG_SENSORS_K10TEMP FILES:=$(LINUX_DIR)/drivers/hwmon/k10temp.ko AUTOLOAD:=$(call AutoLoad,60,k10temp) - $(call AddDepends/hwmon,@PCI_SUPPORT @(x86||x86_64)) + $(call AddDepends/hwmon,@PCI_SUPPORT @TARGET_x86) endef define KernelPackage/hwmon-k10temp/description diff --git a/trunk/package/kernel/linux/modules/i2c.mk b/trunk/package/kernel/linux/modules/i2c.mk index 76431380..d4effee1 100644 --- a/trunk/package/kernel/linux/modules/i2c.mk +++ b/trunk/package/kernel/linux/modules/i2c.mk @@ -24,10 +24,8 @@ I2C_CORE_MODULES:= \ CONFIG_I2C:drivers/i2c/i2c-core \ CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1) - ifeq ($(CONFIG_OF),y) - I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c - endif +ifeq ($(CONFIG_OF),y) + I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c@lt3.12 endif define KernelPackage/i2c-core @@ -206,13 +204,8 @@ endef $(eval $(call KernelPackage,i2c-mux)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) I2C_MUX_GPIO_MODULES:= \ CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/i2c-mux-gpio -else -I2C_MUX_GPIO_MODULES:= \ - CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/gpio-i2cmux -endif define KernelPackage/i2c-mux-gpio $(call i2c_defaults,$(I2C_MUX_GPIO_MODULES),51) @@ -226,12 +219,8 @@ endef $(eval $(call KernelPackage,i2c-mux-gpio)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) -I2C_MUX_PREFIX:=i2c-mux- -endif - I2C_MUX_PCA954x_MODULES:= \ - CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca954x + CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/i2c-mux-pca954x define KernelPackage/i2c-mux-pca954x $(call i2c_defaults,$(I2C_MUX_PCA954x_MODULES),51) @@ -247,7 +236,7 @@ $(eval $(call KernelPackage,i2c-mux-pca954x)) I2C_MUX_PCA9541_MODULES:= \ - CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca9541 + CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/i2c-mux-pca9541 define KernelPackage/i2c-mux-pca9541 $(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51) diff --git a/trunk/package/kernel/linux/modules/input.mk b/trunk/package/kernel/linux/modules/input.mk index 32adc1ec..0539493c 100644 --- a/trunk/package/kernel/linux/modules/input.mk +++ b/trunk/package/kernel/linux/modules/input.mk @@ -10,10 +10,10 @@ INPUT_MODULES_MENU:=Input modules define KernelPackage/hid SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=HID Devices - KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y + DEPENDS:=+kmod-input-core +kmod-input-evdev + KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y CONFIG_HID_BATTERY_STRENGTH=y FILES:=$(LINUX_DIR)/drivers/hid/hid.ko AUTOLOAD:=$(call AutoLoad,61,hid) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/hid/description @@ -25,10 +25,10 @@ $(eval $(call KernelPackage,hid)) define KernelPackage/hid-generic SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Generic HID device support + DEPENDS:=+kmod-hid KCONFIG:=CONFIG_HID_GENERIC FILES:=$(LINUX_DIR)/drivers/hid/hid-generic.ko AUTOLOAD:=$(call AutoProbe,hid-generic) - $(call AddDepends/hid) endef define KernelPackage/hid/description @@ -54,10 +54,10 @@ $(eval $(call KernelPackage,input-core)) define KernelPackage/input-evdev SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Input event device + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_EVDEV FILES:=$(LINUX_DIR)/drivers/input/evdev.ko AUTOLOAD:=$(call AutoLoad,60,evdev) - $(call AddDepends/input) endef define KernelPackage/input-evdev/description @@ -70,18 +70,20 @@ $(eval $(call KernelPackage,input-evdev)) define KernelPackage/input-gpio-keys SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=GPIO key support - DEPENDS:= @GPIO_SUPPORT + DEPENDS:= @GPIO_SUPPORT +kmod-input-core KCONFIG:= \ CONFIG_KEYBOARD_GPIO \ CONFIG_INPUT_KEYBOARD=y FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko AUTOLOAD:=$(call AutoProbe,gpio_keys) - $(call AddDepends/input) endef define KernelPackage/input-gpio-keys/description This driver implements support for buttons connected to GPIO pins of various CPUs (and some other chips). + + See also gpio-button-hotplug which is an alternative, lower overhead + implementation that generates uevents instead of kernel input events. endef $(eval $(call KernelPackage,input-gpio-keys)) @@ -96,11 +98,13 @@ define KernelPackage/input-gpio-keys-polled CONFIG_INPUT_KEYBOARD=y FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys_polled.ko AUTOLOAD:=$(call AutoProbe,gpio_keys_polled,1) - $(call AddDepends/input) endef define KernelPackage/input-gpio-keys-polled/description Kernel module for support polled GPIO keys input device + + See also gpio-button-hotplug which is an alternative, lower overhead + implementation that generates uevents instead of kernel input events. endef $(eval $(call KernelPackage,input-gpio-keys-polled)) @@ -109,10 +113,10 @@ $(eval $(call KernelPackage,input-gpio-keys-polled)) define KernelPackage/input-gpio-encoder SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=GPIO rotay encoder + DEPENDS:=@GPIO_SUPPORT +kmod-input-core KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko AUTOLOAD:=$(call AutoProbe,rotary_encoder) - $(call AddDepends/input,@GPIO_SUPPORT) endef define KernelPackage/gpio-encoder/description @@ -125,10 +129,10 @@ $(eval $(call KernelPackage,input-gpio-encoder)) define KernelPackage/input-joydev SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Joystick device support + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_JOYDEV FILES:=$(LINUX_DIR)/drivers/input/joydev.ko AUTOLOAD:=$(call AutoProbe,joydev) - $(call AddDepends/input) endef define KernelPackage/input-joydev/description @@ -141,9 +145,9 @@ $(eval $(call KernelPackage,input-joydev)) define KernelPackage/input-polldev SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Polled Input device support + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_POLLDEV FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko - $(call AddDepends/input) endef define KernelPackage/input-polldev/description @@ -156,11 +160,10 @@ $(eval $(call KernelPackage,input-polldev)) define KernelPackage/input-matrixkmap SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Input matrix devices support + DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_MATRIXKMAP - DEPENDS:=@!LINUX_3_3 FILES:=$(LINUX_DIR)/drivers/input/matrix-keymap.ko AUTOLOAD:=$(call AutoProbe,matrix-keymap) - $(call AddDepends/input) endef define KernelPackage/input-matrix/description @@ -173,7 +176,7 @@ $(eval $(call KernelPackage,input-matrixkmap)) define KernelPackage/acpi-button SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=ACPI Button Support - DEPENDS:=@(TARGET_x86_generic||TARGET_x86_kvm_guest||TARGET_x86_xen_domu) +kmod-input-evdev + DEPENDS:=@(TARGET_x86_generic||TARGET_x86_kvm_guest||TARGET_x86_xen_domu||TARGET_x86_64) +kmod-input-evdev KCONFIG:=CONFIG_ACPI_BUTTON FILES:=$(LINUX_DIR)/drivers/acpi/button.ko AUTOLOAD:=$(call AutoLoad,06,button) @@ -202,3 +205,21 @@ define KernelPackage/keyboard-imx/description endef $(eval $(call KernelPackage,keyboard-imx)) + + +define KernelPackage/input-uinput + SUBMENU:=$(INPUT_MODULES_MENU) + TITLE:=user input module + DEPENDS:=+kmod-input-core + KCONFIG:= \ + CONFIG_INPUT_MISC=y \ + CONFIG_INPUT_UINPUT + FILES:=$(LINUX_DIR)/drivers/input/misc/uinput.ko + AUTOLOAD:=$(call AutoProbe,uinput) +endef + +define KernelPackage/input-uinput/description + user input modules needed for bluez +endef + +$(eval $(call KernelPackage,input-uinput)) diff --git a/trunk/package/kernel/linux/modules/leds.mk b/trunk/package/kernel/linux/modules/leds.mk index 9c54c781..996deb37 100644 --- a/trunk/package/kernel/linux/modules/leds.mk +++ b/trunk/package/kernel/linux/modules/leds.mk @@ -22,12 +22,13 @@ endef $(eval $(call KernelPackage,leds-gpio)) +LED_TRIGGER_DIR=$(LINUX_DIR)/drivers/leds/trigger define KernelPackage/ledtrig-heartbeat SUBMENU:=$(LEDS_MENU) TITLE:=LED Heartbeat Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-heartbeat.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-heartbeat.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat) endef @@ -42,7 +43,7 @@ define KernelPackage/ledtrig-gpio SUBMENU:=$(LEDS_MENU) TITLE:=LED GPIO Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-gpio.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-gpio.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio) endef @@ -124,7 +125,7 @@ define KernelPackage/ledtrig-default-on SUBMENU:=$(LEDS_MENU) TITLE:=LED Default ON Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-default-on.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on,1) endef @@ -139,7 +140,7 @@ define KernelPackage/ledtrig-timer SUBMENU:=$(LEDS_MENU) TITLE:=LED Timer Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-timer.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer,1) endef @@ -155,7 +156,7 @@ define KernelPackage/ledtrig-transient SUBMENU:=$(LEDS_MENU) TITLE:=LED Transient Trigger KCONFIG:=CONFIG_LEDS_TRIGGER_TRANSIENT - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-transient.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-transient.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-transient,1) endef @@ -169,9 +170,8 @@ $(eval $(call KernelPackage,ledtrig-transient)) define KernelPackage/ledtrig-oneshot SUBMENU:=$(LEDS_MENU) TITLE:=LED One-Shot Trigger - DEPENDS:=@!LINUX_3_3 KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT - FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko + FILES:=$(LED_TRIGGER_DIR)/ledtrig-oneshot.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot) endef @@ -183,10 +183,26 @@ endef $(eval $(call KernelPackage,ledtrig-oneshot)) +define KernelPackage/leds-pca963x + SUBMENU:=$(LEDS_MENU) + TITLE:=PCA963x LED support + DEPENDS:=+kmod-i2c-core + KCONFIG:=CONFIG_LEDS_PCA963X + FILES:=$(LINUX_DIR)/drivers/leds/leds-pca963x.ko + AUTOLOAD:=$(call AutoLoad,60,leds-pca963x,1) +endef + +define KernelPackage/leds-pca963x/description + Driver for the NXP PCA963x I2C LED controllers. +endef + +$(eval $(call KernelPackage,leds-pca963x)) + + define KernelPackage/leds-tlc59116 SUBMENU:=$(LEDS_MENU) TITLE:=TLC59116 LED support - DEPENDS:=@TARGET_mvebu kmod-i2c-core + DEPENDS:=@TARGET_mvebu +kmod-i2c-core +kmod-regmap KCONFIG:=CONFIG_LEDS_TLC59116 FILES:=$(LINUX_DIR)/drivers/leds/leds-tlc59116.ko AUTOLOAD:=$(call AutoLoad,60,leds-tlc59116,1) diff --git a/trunk/package/kernel/linux/modules/lib.mk b/trunk/package/kernel/linux/modules/lib.mk index cd919ba6..9d35e42e 100644 --- a/trunk/package/kernel/linux/modules/lib.mk +++ b/trunk/package/kernel/linux/modules/lib.mk @@ -72,7 +72,7 @@ define KernelPackage/lib-crc16 TITLE:=CRC16 support KCONFIG:=CONFIG_CRC16 FILES:=$(LINUX_DIR)/lib/crc16.ko - AUTOLOAD:=$(call AutoProbe,crc16) + AUTOLOAD:=$(call AutoLoad,20,crc16,1) endef define KernelPackage/lib-crc16/description @@ -117,6 +117,25 @@ endef $(eval $(call KernelPackage,lib-lzo)) +define KernelPackage/lib-lz4 + SUBMENU:=$(LIB_MENU) + TITLE:=LZ4 support + KCONFIG:= \ + CONFIG_LZ4_COMPRESS \ + CONFIG_LZ4_DECOMPRESS + FILES:= \ + $(LINUX_DIR)/lib/lz4/lz4_compress.ko \ + $(LINUX_DIR)/lib/lz4/lz4_decompress.ko + AUTOLOAD:=$(call AutoProbe,lz4_compress lz4_decompress) +endef + +define KernelPackage/lib-lz4/description + Kernel module for LZ4 compression/decompression support +endef + +$(eval $(call KernelPackage,lib-lz4)) + + define KernelPackage/lib-raid6 SUBMENU:=$(LIB_MENU) TITLE:=RAID6 algorithm support diff --git a/trunk/package/kernel/linux/modules/netdevices.mk b/trunk/package/kernel/linux/modules/netdevices.mk index 4f1a82a7..9efac98a 100644 --- a/trunk/package/kernel/linux/modules/netdevices.mk +++ b/trunk/package/kernel/linux/modules/netdevices.mk @@ -114,7 +114,8 @@ define KernelPackage/et131x SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Agere ET131x Gigabit Ethernet driver URL:=http://sourceforge.net/projects/et131x - FILES:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX) + FILES:= \ + $(LINUX_DIR)/drivers/net/ethernet/agere/et131x.ko KCONFIG:= \ CONFIG_ET131X \ CONFIG_ET131X_DEBUG=n @@ -147,6 +148,23 @@ endef $(eval $(call KernelPackage,gw16083)) +define KernelPackage/phy-broadcom + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Broadcom Ethernet PHY driver + KCONFIG:=CONFIG_BROADCOM_PHY + DEPENDS:=+kmod-libphy + FILES:=$(LINUX_DIR)/drivers/net/phy/broadcom.ko + AUTOLOAD:=$(call AutoLoad,18,broadcom) +endef + +define KernelPackage/phy-broadcom/description + Currently supports the BCM5411, BCM5421, BCM5461, BCM5464, BCM5481, + BCM5482 and BCM57780 PHYs. +endef + +$(eval $(call KernelPackage,phy-broadcom)) + + define KernelPackage/swconfig SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=switch configuration API @@ -403,6 +421,64 @@ endef $(eval $(call KernelPackage,ne2k-pci)) + +define KernelPackage/e100 + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Intel(R) PRO/100+ cards kernel support + DEPENDS:=@PCI_SUPPORT +kmod-mii + KCONFIG:=CONFIG_E100 + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e100.ko + AUTOLOAD:=$(call AutoProbe,e100) +endef + +define KernelPackage/e100/description + Kernel modules for Intel(R) PRO/100+ Ethernet adapters +endef + +define KernelPackage/e100/install + $(INSTALL_DIR) $(1)/lib/firmware/e100 + $(foreach file,d101m_ucode.bin d101s_ucode.bin d102e_ucode.bin, \ + $(TARGET_CROSS)objcopy -Iihex -Obinary $(LINUX_DIR)/firmware/e100/$(file).ihex $(1)/lib/firmware/e100/$(file); \ + ) +endef + +$(eval $(call KernelPackage,e100)) + + +define KernelPackage/e1000 + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Intel(R) PRO/1000 PCI cards kernel support + DEPENDS:=@PCI_SUPPORT + KCONFIG:=CONFIG_E1000 \ + CONFIG_E1000_DISABLE_PACKET_SPLIT=n \ + CONFIG_E1000_NAPI=y + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko + AUTOLOAD:=$(call AutoLoad,35,e1000) +endef + +define KernelPackage/e1000/description + Kernel modules for Intel(R) PRO/1000 PCI Ethernet adapters. +endef + +$(eval $(call KernelPackage,e1000)) + + +define KernelPackage/e1000e + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Intel(R) PRO/1000 PCIe cards kernel support + DEPENDS:=@PCIE_SUPPORT +kmod-ptp + KCONFIG:=CONFIG_E1000E + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko + AUTOLOAD:=$(call AutoProbe,e1000e) +endef + +define KernelPackage/e1000e/description + Kernel modules for Intel(R) PRO/1000 PCIe Ethernet adapters. +endef + +$(eval $(call KernelPackage,e1000e)) + + define KernelPackage/igb SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support @@ -421,6 +497,22 @@ endef $(eval $(call KernelPackage,igb)) +define KernelPackage/b44 + TITLE:=Broadcom 44xx driver + KCONFIG:=CONFIG_B44 + DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +kmod-libphy + SUBMENU:=$(NETWORK_DEVICES_MENU) + FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko + AUTOLOAD:=$(call AutoLoad,19,b44,1) +endef + +define KernelPackage/b44/description + Kernel modules for Broadcom 44xx Ethernet adapters. +endef + +$(eval $(call KernelPackage,b44)) + + define KernelPackage/3c59x SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang @@ -462,7 +554,7 @@ $(eval $(call KernelPackage,pcnet32)) define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet KCONFIG:=CONFIG_TIGON3 - DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(!LINUX_3_3&&!LINUX_3_6):kmod-ptp + DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +kmod-hwmon-core +kmod-ptp SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko AUTOLOAD:=$(call AutoLoad,19,tg3,1) @@ -734,3 +826,20 @@ define KernelPackage/vmxnet3/description endef $(eval $(call KernelPackage,vmxnet3)) + + +define KernelPackage/spi-ks8995 + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Micrel/Kendin KS8995 Ethernet switch control + FILES:=$(LINUX_DIR)/drivers/net/phy/spi_ks8995.ko + KCONFIG:=CONFIG_MICREL_KS8995MA \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y + AUTOLOAD:=$(call AutoLoad,50,spi_ks8995) +endef + +define KernelPackage/spi-ks8995/description + Kernel module for Micrel/Kendin KS8995 ethernet switch +endef + +$(eval $(call KernelPackage,spi-ks8995)) diff --git a/trunk/package/kernel/linux/modules/netfilter.mk b/trunk/package/kernel/linux/modules/netfilter.mk index 2cb769de..3a436ac0 100644 --- a/trunk/package/kernel/linux/modules/netfilter.mk +++ b/trunk/package/kernel/linux/modules/netfilter.mk @@ -171,7 +171,6 @@ endef define KernelPackage/ipt-filter/description Netfilter (IPv4) kernel modules for packet content inspection Includes: - - layer7 - string endef @@ -223,6 +222,54 @@ endef $(eval $(call KernelPackage,ipt-ipsec)) +IPSET_MODULES:= \ + ipset/ip_set \ + ipset/ip_set_bitmap_ip \ + ipset/ip_set_bitmap_ipmac \ + ipset/ip_set_bitmap_port \ + ipset/ip_set_hash_ip \ + ipset/ip_set_hash_ipmark \ + ipset/ip_set_hash_ipport \ + ipset/ip_set_hash_ipportip \ + ipset/ip_set_hash_ipportnet \ + ipset/ip_set_hash_mac \ + ipset/ip_set_hash_netportnet \ + ipset/ip_set_hash_net \ + ipset/ip_set_hash_netnet \ + ipset/ip_set_hash_netport \ + ipset/ip_set_hash_netiface \ + ipset/ip_set_list_set \ + xt_set + +define KernelPackage/ipt-ipset + SUBMENU:=Netfilter Extensions + TITLE:=IPset netfilter modules + DEPENDS+= +kmod-ipt-core +kmod-nfnetlink + KCONFIG:= \ + CONFIG_IP_SET \ + CONFIG_IP_SET_MAX=256 \ + CONFIG_NETFILTER_XT_SET \ + CONFIG_IP_SET_BITMAP_IP \ + CONFIG_IP_SET_BITMAP_IPMAC \ + CONFIG_IP_SET_BITMAP_PORT \ + CONFIG_IP_SET_HASH_IP \ + CONFIG_IP_SET_HASH_IPMARK \ + CONFIG_IP_SET_HASH_IPPORT \ + CONFIG_IP_SET_HASH_IPPORTIP \ + CONFIG_IP_SET_HASH_IPPORTNET \ + CONFIG_IP_SET_HASH_MAC \ + CONFIG_IP_SET_HASH_NET \ + CONFIG_IP_SET_HASH_NETNET \ + CONFIG_IP_SET_HASH_NETIFACE \ + CONFIG_IP_SET_HASH_NETPORT \ + CONFIG_IP_SET_HASH_NETPORTNET \ + CONFIG_IP_SET_LIST_SET \ + CONFIG_NET_EMATCH_IPSET=n + FILES:=$(foreach mod,$(IPSET_MODULES),$(LINUX_DIR)/net/netfilter/$(mod).ko) + AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPSET_MODULES))) +endef +$(eval $(call KernelPackage,ipt-ipset)) + define KernelPackage/ipt-nat TITLE:=Basic NAT targets @@ -322,24 +369,6 @@ endef $(eval $(call KernelPackage,nf-nathelper-extra)) -define KernelPackage/ipt-queue - TITLE:=Module for user-space packet queueing - KCONFIG:=$(KCONFIG_IPT_QUEUE) - DEPENDS:=@!LINUX_3_6 - FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko) - AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_QUEUE-m))) - $(call AddDepends/ipt) -endef - -define KernelPackage/ipt-queue/description - Netfilter (IPv4) module for user-space packet queueing - Includes: - - QUEUE -endef - -$(eval $(call KernelPackage,ipt-queue)) - - define KernelPackage/ipt-ulog TITLE:=Module for user-space packet logging KCONFIG:=$(KCONFIG_IPT_ULOG) @@ -431,7 +460,6 @@ define KernelPackage/ipt-tproxy CONFIG_NETFILTER_XT_MATCH_SOCKET \ CONFIG_NETFILTER_XT_TARGET_TPROXY FILES:= \ - $(if $(call kernel_patchver_lt,3.12),$(LINUX_DIR)/net/netfilter/nf_tproxy_core.ko) \ $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir nf_tproxy_core $(IPT_TPROXY-m))) $(call AddDepends/ipt) @@ -746,7 +774,7 @@ $(eval $(call KernelPackage,nfnetlink-queue)) define KernelPackage/nf-conntrack-netlink TITLE:=Connection tracking netlink interface FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.ko - KCONFIG:=CONFIG_NF_CT_NETLINK + KCONFIG:=CONFIG_NF_CT_NETLINK CONFIG_NF_CONNTRACK_EVENTS=y AUTOLOAD:=$(call AutoProbe,nf_conntrack_netlink) $(call AddDepends/nfnetlink,+kmod-ipt-conntrack) endef diff --git a/trunk/package/kernel/linux/modules/netsupport.mk b/trunk/package/kernel/linux/modules/netsupport.mk index 8671df13..adfdace3 100644 --- a/trunk/package/kernel/linux/modules/netsupport.mk +++ b/trunk/package/kernel/linux/modules/netsupport.mk @@ -144,10 +144,36 @@ endef $(eval $(call KernelPackage,8021q)) + +define KernelPackage/udptunnel4 + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=IPv4 UDP tunneling support + KCONFIG:=CONFIG_NET_UDP_TUNNEL + FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko + AUTOLOAD:=$(call AutoLoad,32,udp_tunnel) +endef + + +$(eval $(call KernelPackage,udptunnel4)) + +define KernelPackage/udptunnel6 + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=IPv6 UDP tunneling support + KCONFIG:=CONFIG_NET_UDP_TUNNEL + FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko + AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel) +endef + +$(eval $(call KernelPackage,udptunnel6)) + + define KernelPackage/vxlan SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Native VXLAN Kernel support - DEPENDS:=+kmod-iptunnel + DEPENDS:= \ + +kmod-iptunnel \ + +kmod-udptunnel4 \ + +IPV6:kmod-udptunnel6 KCONFIG:=CONFIG_VXLAN FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko AUTOLOAD:=$(call AutoLoad,13,vxlan) @@ -251,7 +277,7 @@ $(eval $(call KernelPackage,ipip)) IPSEC-m:= \ - $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \ + xfrm/xfrm_algo \ xfrm/xfrm_ipcomp \ xfrm/xfrm_user \ key/af_key \ @@ -377,6 +403,22 @@ endef $(eval $(call KernelPackage,iptunnel)) +define KernelPackage/ipvti + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=IP VTI (Virtual Tunnel Interface) + DEPENDS:=+kmod-iptunnel +kmod-iptunnel4 +kmod-ipsec4 + KCONFIG:=CONFIG_NET_IPVTI + FILES:=$(LINUX_DIR)/net/ipv4/ip_vti.ko + AUTOLOAD:=$(call AutoLoad,33,ip_vti) +endef + +define KernelPackage/ipvti/description + Kernel modules for IP VTI (Virtual Tunnel Interface) +endef + +$(eval $(call KernelPackage,ipvti)) + + define KernelPackage/iptunnel4 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv4 tunneling @@ -484,7 +526,7 @@ $(eval $(call KernelPackage,gre)) define KernelPackage/gre6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=GRE support over IPV6 - DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6 + DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel KCONFIG:=CONFIG_IPV6_GRE FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko AUTOLOAD:=$(call AutoLoad,39,ip6_gre) @@ -760,6 +802,8 @@ define KernelPackage/sched CONFIG_NET_SCH_TBF \ CONFIG_NET_SCH_SFQ \ CONFIG_NET_SCH_TEQL \ + CONFIG_NET_SCH_FQ \ + CONFIG_NET_SCH_PIE \ CONFIG_NET_CLS_BASIC \ CONFIG_NET_ACT_POLICE \ CONFIG_NET_ACT_IPT \ @@ -781,14 +825,15 @@ $(eval $(call KernelPackage,sched)) define KernelPackage/ax25 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=AX25 support + DEPENDS:=+kmod-lib-crc16 KCONFIG:= \ + CONFIG_HAMRADIO=y \ CONFIG_AX25 \ CONFIG_MKISS FILES:= \ $(LINUX_DIR)/net/ax25/ax25.ko \ $(LINUX_DIR)/drivers/net/hamradio/mkiss.ko AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss) - $(call AddDepends/crc16) endef define KernelPackage/ax25/description @@ -798,33 +843,6 @@ endef $(eval $(call KernelPackage,ax25)) -define KernelPackage/mp-alg - SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=ECMP caching algorithms - KCONFIG:= \ - CONFIG_IP_ROUTE_MULTIPATH_RR \ - CONFIG_IP_ROUTE_MULTIPATH_RANDOM \ - CONFIG_IP_ROUTE_MULTIPATH_WRANDOM \ - CONFIG_IP_ROUTE_MULTIPATH_DRR - FILES:= \ - $(LINUX_DIR)/net/ipv4/multipath_rr.ko \ - $(LINUX_DIR)/net/ipv4/multipath_random.ko \ - $(LINUX_DIR)/net/ipv4/multipath_wrandom.ko \ - $(LINUX_DIR)/net/ipv4/multipath_drr.ko - AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr) -endef - -define KernelPackage/mp-alg/description - Kernel modules that provide several different algorithms for multipath - route selection from the route cache. The iproute "mpath" argument allows - specifying which algorithm to use for routes. - quagga (at least <=0.99.6) requires a multipath patch to support this - cached mp route feature. -endef - -$(eval $(call KernelPackage,mp-alg)) - - define KernelPackage/pktgen SUBMENU:=$(NETWORK_SUPPORT_MENU) DEPENDS:=@!TARGET_uml @@ -843,7 +861,10 @@ $(eval $(call KernelPackage,pktgen)) define KernelPackage/l2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Layer Two Tunneling Protocol (L2TP) - DEPENDS:=+IPV6:kmod-ipv6 + DEPENDS:= \ + +IPV6:kmod-ipv6 \ + +kmod-udptunnel4 \ + +IPV6:kmod-udptunnel6 KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ CONFIG_L2TP_DEBUGFS=n @@ -877,10 +898,12 @@ $(eval $(call KernelPackage,l2tp-eth)) define KernelPackage/l2tp-ip SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=L2TP IP encapsulation for L2TPv3 - DEPENDS:=+kmod-l2tp + DEPENDS:=+kmod-l2tp +IPV6:kmod-ipv6 KCONFIG:=CONFIG_L2TP_IP - FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko - AUTOLOAD:=$(call AutoLoad,33,l2tp_ip) + FILES:= \ + $(LINUX_DIR)/net/l2tp/l2tp_ip.ko \ + $(if $(CONFIG_IPV6),$(LINUX_DIR)/net/l2tp/l2tp_ip6.ko) + AUTOLOAD:=$(call AutoLoad,33,l2tp_ip $(if $(CONFIG_IPV6),l2tp_ip6)) endef define KernelPackage/l2tp-ip/description diff --git a/trunk/package/kernel/linux/modules/other.mk b/trunk/package/kernel/linux/modules/other.mk index 001f7873..4a65a03e 100644 --- a/trunk/package/kernel/linux/modules/other.mk +++ b/trunk/package/kernel/linux/modules/other.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,26 +10,27 @@ OTHER_MENU:=Other modules WATCHDOG_DIR:=watchdog -define KernelPackage/6lowpan-iphc - USBMENU:=$(OTHER_MENU) - TITLE:=6lowpan shared code - DEPENDS:=@!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10 @!LINUX_3_13 - KCONFIG:=CONFIG_6LOWPAN_IPHC - HIDDEN:=1 - FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko - AUTOLOAD:=$(call Autoprobe,6lowpan_iphc) +define KernelPackage/6lowpan + SUBMENU:=$(OTHER_MENU) + TITLE:=6LoWPAN shared code + KCONFIG:= \ + CONFIG_6LOWPAN \ + CONFIG_6LOWPAN_NHC=n + FILES:=$(LINUX_DIR)/net/6lowpan/6lowpan.ko + AUTOLOAD:=$(call AutoProbe,6lowpan) endef -define KernelPackage/6lowpan-iphc/description +define KernelPackage/6lowpan/description Shared 6lowpan code for IEEE 802.15.4 and Bluetooth. endef -$(eval $(call KernelPackage,6lowpan-iphc)) +$(eval $(call KernelPackage,6lowpan)) + define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +(!LINUX_3_3&&!LINUX_3_8&&!LINUX_3_10&&!LINUX_3_13):kmod-6lowpan-iphc + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +!LINUX_3_18:kmod-crypto-cmac KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -40,18 +41,22 @@ define KernelPackage/bluetooth CONFIG_BLUEZ_HCIUSB \ CONFIG_BLUEZ_HIDP \ CONFIG_BT \ + CONFIG_BT_BREDR=y \ + CONFIG_BT_DEBUGFS=n \ CONFIG_BT_L2CAP=y \ + CONFIG_BT_LE=y \ CONFIG_BT_SCO=y \ CONFIG_BT_RFCOMM \ CONFIG_BT_BNEP \ CONFIG_BT_HCIBTUSB \ + CONFIG_BT_HCIBTUSB_BCM=n \ CONFIG_BT_HCIUSB \ CONFIG_BT_HCIUART \ + CONFIG_BT_HCIUART_BCM=n \ + CONFIG_BT_HCIUART_INTEL=n \ CONFIG_BT_HCIUART_H4 \ CONFIG_BT_HIDP \ CONFIG_HID_SUPPORT=y - $(call AddDepends/crc16) - $(call AddDepends/hid) $(call AddDepends/rfkill) FILES:= \ $(LINUX_DIR)/net/bluetooth/bluetooth.ko \ @@ -60,6 +65,10 @@ define KernelPackage/bluetooth $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ $(LINUX_DIR)/drivers/bluetooth/btusb.ko +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.1.0)),1) + FILES+= \ + $(LINUX_DIR)/drivers/bluetooth/btintel.ko +endif AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) endef @@ -70,6 +79,22 @@ endef $(eval $(call KernelPackage,bluetooth)) +define KernelPackage/bluetooth_6lowpan + SUBMENU:=$(OTHER_MENU) + TITLE:=Bluetooth 6LoWPAN support + DEPENDS:=+kmod-6lowpan +kmod-bluetooth + KCONFIG:=CONFIG_BT_6LOWPAN + FILES:=$(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko + AUTOLOAD:=$(call AutoProbe,bluetooth_6lowpan) +endef + +define KernelPackage/bluetooth_6lowpan/description + Kernel support for 6LoWPAN over Bluetooth Low Energy devices +endef + +$(eval $(call KernelPackage,bluetooth_6lowpan)) + + define KernelPackage/bluetooth-hci-h4p SUBMENU:=$(OTHER_MENU) TITLE:=HCI driver with H4 Nokia extensions @@ -211,7 +236,6 @@ $(eval $(call KernelPackage,gpio-pcf857x)) define KernelPackage/iio-core SUBMENU:=$(OTHER_MENU) - DEPENDS:=@!LINUX_3_3 @!LINUX_3_6 TITLE:=Industrial IO core KCONFIG:= \ CONFIG_IIO \ @@ -242,11 +266,7 @@ define KernelPackage/iio-ad799x KCONFIG:= \ CONFIG_AD799X_RING_BUFFER=y \ CONFIG_AD799X -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1) FILES:=$(LINUX_DIR)/drivers/iio/adc/ad799x.ko -else - FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/ad799x.ko -endif AUTOLOAD:=$(call AutoLoad,56,ad799x) endef @@ -281,7 +301,6 @@ $(eval $(call KernelPackage,iio-dht11)) define KernelPackage/lp SUBMENU:=$(OTHER_MENU) TITLE:=Parallel port and line printer support - DEPENDS:=@BROKEN KCONFIG:= \ CONFIG_PARPORT \ CONFIG_PRINTER \ @@ -290,7 +309,7 @@ define KernelPackage/lp $(LINUX_DIR)/drivers/parport/parport.ko \ $(LINUX_DIR)/drivers/char/lp.ko \ $(LINUX_DIR)/drivers/char/ppdev.ko - AUTOLOAD:=$(call AutoLoad,50,parport lp) + AUTOLOAD:=$(call AutoLoad,50,parport lp ppdev) endef $(eval $(call KernelPackage,lp)) @@ -395,13 +414,65 @@ endef $(eval $(call KernelPackage,softdog)) +define KernelPackage/ssb + SUBMENU:=$(OTHER_MENU) + TITLE:=Silicon Sonics Backplane glue code + DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_brcm63xx + KCONFIG:=\ + CONFIG_SSB \ + CONFIG_SSB_B43_PCI_BRIDGE=y \ + CONFIG_SSB_DRIVER_MIPS=n \ + CONFIG_SSB_DRIVER_PCICORE=y \ + CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y \ + CONFIG_SSB_PCIHOST=y \ + CONFIG_SSB_PCIHOST_POSSIBLE=y \ + CONFIG_SSB_POSSIBLE=y \ + CONFIG_SSB_SPROM=y \ + CONFIG_SSB_SILENT=y + FILES:=$(LINUX_DIR)/drivers/ssb/ssb.ko + AUTOLOAD:=$(call AutoLoad,18,ssb,1) +endef + +define KernelPackage/ssb/description + Silicon Sonics Backplane glue code. +endef + +$(eval $(call KernelPackage,ssb)) + + +define KernelPackage/bcma + SUBMENU:=$(OTHER_MENU) + TITLE:=BCMA support + DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_bcm53xx + KCONFIG:=\ + CONFIG_BCMA \ + CONFIG_BCMA_POSSIBLE=y \ + CONFIG_BCMA_BLOCKIO=y \ + CONFIG_BCMA_HOST_PCI_POSSIBLE=y \ + CONFIG_BCMA_HOST_PCI=y \ + CONFIG_BCMA_HOST_SOC=n \ + CONFIG_BCMA_DRIVER_MIPS=n \ + CONFIG_BCMA_DRIVER_PCI_HOSTMODE=n \ + CONFIG_BCMA_DRIVER_GMAC_CMN=n \ + CONFIG_BCMA_DEBUG=n + FILES:=$(LINUX_DIR)/drivers/bcma/bcma.ko + AUTOLOAD:=$(call AutoLoad,29,bcma) +endef + +define KernelPackage/bcma/description + Bus driver for Broadcom specific Advanced Microcontroller Bus Architecture +endef + +$(eval $(call KernelPackage,bcma)) + + define KernelPackage/wdt-omap SUBMENU:=$(OTHER_MENU) TITLE:=OMAP Watchdog timer DEPENDS:=@(TARGET_omap24xx||TARGET_omap35xx) KCONFIG:=CONFIG_OMAP_WATCHDOG FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/omap_wdt.ko - AUTOLOAD:=$(call AutoLoad,50,omap_wdt.ko) + AUTOLOAD:=$(call AutoLoad,50,omap_wdt.ko,1) endef define KernelPackage/wdt-omap/description @@ -417,7 +488,7 @@ define KernelPackage/wdt-orion DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu KCONFIG:=CONFIG_ORION_WATCHDOG FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko - AUTOLOAD:=$(call AutoLoad,50,orion_wdt) + AUTOLOAD:=$(call AutoLoad,50,orion_wdt,1) endef define KernelPackage/wdt-orion/description @@ -433,7 +504,7 @@ define KernelPackage/booke-wdt DEPENDS:=@(TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x) KCONFIG:=CONFIG_BOOKE_WDT FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko - AUTOLOAD:=$(call AutoLoad,50,booke_wdt) + AUTOLOAD:=$(call AutoLoad,50,booke_wdt,1) endef define KernelPackage/booke-wdt/description @@ -443,25 +514,10 @@ endef $(eval $(call KernelPackage,booke-wdt)) -define KernelPackage/pwm - SUBMENU:=$(OTHER_MENU) - TITLE:=PWM generic API - KCONFIG:=CONFIG_GENERIC_PWM - FILES:=$(LINUX_DIR)/drivers/pwm/pwm.ko -endef - -define KernelPackage/pwm/description - Kernel module that implement a generic PWM API -endef - -$(eval $(call KernelPackage,pwm)) - - define KernelPackage/rtc-ds1307 SUBMENU:=$(OTHER_MENU) TITLE:=Dallas/Maxim DS1307 (and compatible) RTC support - $(call AddDepends/rtc) - DEPENDS+=+kmod-i2c-core + DEPENDS:=@RTC_SUPPORT +kmod-i2c-core KCONFIG:=CONFIG_RTC_DRV_DS1307 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-ds1307.ko AUTOLOAD:=$(call AutoProbe,rtc-ds1307) @@ -478,8 +534,7 @@ $(eval $(call KernelPackage,rtc-ds1307)) define KernelPackage/rtc-ds1672 SUBMENU:=$(OTHER_MENU) TITLE:=Dallas/Maxim DS1672 RTC support - $(call AddDepends/rtc) - DEPENDS+=+kmod-i2c-core + DEPENDS:=@RTC_SUPPORT +kmod-i2c-core KCONFIG:=CONFIG_RTC_DRV_DS1672 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-ds1672.ko AUTOLOAD:=$(call AutoProbe,rtc-ds1672) @@ -495,8 +550,7 @@ $(eval $(call KernelPackage,rtc-ds1672)) define KernelPackage/rtc-isl1208 SUBMENU:=$(OTHER_MENU) TITLE:=Intersil ISL1208 RTC support - $(call AddDepends/rtc) - DEPENDS+=+kmod-i2c-core + DEPENDS:=@RTC_SUPPORT +kmod-i2c-core KCONFIG:=CONFIG_RTC_DRV_ISL1208 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-isl1208.ko AUTOLOAD:=$(call AutoProbe,rtc-isl1208) @@ -512,8 +566,7 @@ $(eval $(call KernelPackage,rtc-isl1208)) define KernelPackage/rtc-marvell SUBMENU:=$(OTHER_MENU) TITLE:=Marvell SoC built-in RTC support - $(call AddDepends/rtc) - DEPENDS+=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu + DEPENDS:=@RTC_SUPPORT @TARGET_kirkwood||TARGET_orion||TARGET_mvebu KCONFIG:=CONFIG_RTC_DRV_MV FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko AUTOLOAD:=$(call AutoProbe,rtc-mv) @@ -525,10 +578,27 @@ endef $(eval $(call KernelPackage,rtc-marvell)) + +define KernelPackage/rtc-armada38x + SUBMENU:=$(OTHER_MENU) + TITLE:=Marvell Armada 38x SoC built-in RTC support + DEPENDS:=@RTC_SUPPORT @TARGET_mvebu + KCONFIG:=CONFIG_RTC_DRV_ARMADA38X + FILES:=$(LINUX_DIR)/drivers/rtc/rtc-armada38x.ko + AUTOLOAD:=$(call AutoProbe,rtc-armada38x) +endef + +define KernelPackage/rtc-armada38x/description + Kernel module for Marvell Armada 38x SoC built-in RTC. +endef + +$(eval $(call KernelPackage,rtc-armada38x)) + + define KernelPackage/rtc-pcf8563 SUBMENU:=$(OTHER_MENU) TITLE:=Philips PCF8563/Epson RTC8564 RTC support - $(call AddDepends/rtc,+kmod-i2c-core) + DEPENDS:=@RTC_SUPPORT +kmod-i2c-core KCONFIG:=CONFIG_RTC_DRV_PCF8563 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.ko AUTOLOAD:=$(call AutoProbe,rtc-pcf8563) @@ -545,7 +615,7 @@ $(eval $(call KernelPackage,rtc-pcf8563)) define KernelPackage/rtc-pcf2123 SUBMENU:=$(OTHER_MENU) TITLE:=Philips PCF2123 RTC support - $(call AddDepends/rtc) + DEPENDS:=@RTC_SUPPORT KCONFIG:=CONFIG_RTC_DRV_PCF2123 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf2123.ko AUTOLOAD:=$(call AutoProbe,rtc-pcf2123) @@ -560,7 +630,7 @@ $(eval $(call KernelPackage,rtc-pcf2123)) define KernelPackage/rtc-pt7c4338 SUBMENU:=$(OTHER_MENU) TITLE:=Pericom PT7C4338 RTC support - $(call AddDepends/rtc,+kmod-i2c-core) + DEPENDS:=@RTC_SUPPORT +kmod-i2c-core KCONFIG:=CONFIG_RTC_DRV_PT7C4338 FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pt7c4338.ko AUTOLOAD:=$(call AutoProbe,rtc-pt7c4338) @@ -577,7 +647,6 @@ define KernelPackage/mtdtests SUBMENU:=$(OTHER_MENU) TITLE:=MTD subsystem tests KCONFIG:=CONFIG_MTD_TESTS - DEPENDS:=+kmod-nand FILES:=\ $(LINUX_DIR)/drivers/mtd/tests/mtd_nandecctest.ko \ $(LINUX_DIR)/drivers/mtd/tests/mtd_oobtest.ko \ @@ -596,40 +665,6 @@ endef $(eval $(call KernelPackage,mtdtests)) -define KernelPackage/nand - SUBMENU:=$(OTHER_MENU) - TITLE:=NAND flash support - KCONFIG:=CONFIG_MTD_NAND \ - CONFIG_MTD_NAND_IDS \ - CONFIG_MTD_NAND_ECC - FILES:= \ - $(LINUX_DIR)/drivers/mtd/nand/nand_ids.ko \ - $(LINUX_DIR)/drivers/mtd/nand/nand_ecc.ko \ - $(LINUX_DIR)/drivers/mtd/nand/nand.ko - AUTOLOAD:=$(call AutoLoad,20,nand_ids nand_ecc nand) -endef - -define KernelPackage/nand/description - Kernel module for NAND support -endef - -$(eval $(call KernelPackage,nand)) - - -define KernelPackage/nandsim - SUBMENU:=$(OTHER_MENU) - TITLE:=NAND simulator - DEPENDS:=+kmod-nand - KCONFIG:=CONFIG_MTD_NAND_NANDSIM - FILES:=$(LINUX_DIR)/drivers/mtd/nand/nandsim.ko -endef - -define KernelPackage/nandsim/description - Kernel module for NAND flash simulation. -endef - -$(eval $(call KernelPackage,nandsim)) - define KernelPackage/serial-8250 SUBMENU:=$(OTHER_MENU) TITLE:=8250 UARTs @@ -641,7 +676,7 @@ define KernelPackage/serial-8250 CONFIG_SERIAL_8250_SHARE_IRQ=y \ CONFIG_SERIAL_8250_DETECT_IRQ=n \ CONFIG_SERIAL_8250_RSA=n - FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(call kernel_patchver_ge,3.7),$(if $(call kernel_patchver_le,3.8),_core)).ko + FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko endef define KernelPackage/serial-8250/description @@ -656,14 +691,16 @@ define KernelPackage/regmap TITLE:=Generic register map support DEPENDS:=+kmod-lib-lzo +kmod-i2c-core KCONFIG:=CONFIG_REGMAP \ + CONFIG_REGMAP_MMIO \ CONFIG_REGMAP_SPI \ CONFIG_REGMAP_I2C \ CONFIG_SPI=y FILES:= \ $(LINUX_DIR)/drivers/base/regmap/regmap-core.ko \ $(LINUX_DIR)/drivers/base/regmap/regmap-i2c.ko \ + $(LINUX_DIR)/drivers/base/regmap/regmap-mmio.ko \ $(if $(CONFIG_SPI),$(LINUX_DIR)/drivers/base/regmap/regmap-spi.ko) - AUTOLOAD:=$(call AutoLoad,21,regmap-core regmap-i2c regmap-spi) + AUTOLOAD:=$(call AutoLoad,21,regmap-core regmap-i2c regmap-mmio regmap-spi) endef define KernelPackage/regmap/description @@ -691,22 +728,17 @@ $(eval $(call KernelPackage,ikconfig)) define KernelPackage/zram SUBMENU:=$(OTHER_MENU) TITLE:=ZRAM - DEPENDS:=@!LINUX_3_3 +kmod-lib-lzo + DEPENDS:=+kmod-lib-lzo +kmod-lib-lz4 KCONFIG:= \ CONFIG_ZSMALLOC \ CONFIG_ZRAM \ CONFIG_ZRAM_DEBUG=n \ CONFIG_PGTABLE_MAPPING=n \ + CONFIG_ZSMALLOC_STAT=n \ CONFIG_ZRAM_LZ4_COMPRESS=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1) - FILES:=\ + FILES:= \ $(LINUX_DIR)/mm/zsmalloc.ko \ $(LINUX_DIR)/drivers/block/zram/zram.ko -else - FILES:= \ - $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \ - $(LINUX_DIR)/drivers/staging/zram/zram.ko -endif AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) endef @@ -903,13 +935,13 @@ $(eval $(call KernelPackage,thermal-kirkwood)) define KernelPackage/gpio-beeper SUBMENU:=$(OTHER_MENU) TITLE:=GPIO beeper support + DEPENDS:=+kmod-input-core KCONFIG:= \ CONFIG_INPUT_MISC=y \ CONFIG_INPUT_GPIO_BEEPER FILES:= \ $(LINUX_DIR)/drivers/input/misc/gpio-beeper.ko AUTOLOAD:=$(call AutoLoad,50,gpio-beeper) - $(call AddDepends/input) endef define KernelPackage/gpio-beeper/description @@ -917,3 +949,19 @@ define KernelPackage/gpio-beeper/description endef $(eval $(call KernelPackage,gpio-beeper)) + + +define KernelPackage/echo + SUBMENU:=$(OTHER_MENU) + TITLE:=Line Echo Canceller + KCONFIG:=CONFIG_ECHO + FILES:=$(LINUX_DIR)/drivers/misc/echo/echo.ko + AUTOLOAD:=$(call AutoLoad,50,echo) +endef + +define KernelPackage/echo/description + This driver provides line echo cancelling support for mISDN and + DAHDI drivers +endef + +$(eval $(call KernelPackage,echo)) diff --git a/trunk/package/kernel/linux/modules/sound.mk b/trunk/package/kernel/linux/modules/sound.mk index be016381..ab83103b 100644 --- a/trunk/package/kernel/linux/modules/sound.mk +++ b/trunk/package/kernel/linux/modules/sound.mk @@ -17,7 +17,8 @@ SOUNDCORE_LOAD ?= \ snd-timer \ snd-pcm \ snd-mixer-oss \ - snd-pcm-oss + snd-pcm-oss \ + snd-compress SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/soundcore.ko \ @@ -28,36 +29,19 @@ SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/core/snd-timer.ko \ $(LINUX_DIR)/sound/core/snd-pcm.ko \ $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \ - $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko - -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3.0)),1) -SOUNDCORE_LOAD += \ - snd-compress - -SOUNDCORE_FILES += \ + $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko \ $(LINUX_DIR)/sound/core/snd-compress.ko -endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.12.0)),1) SOUNDCORE_LOAD += \ $(if $(CONFIG_SND_DMAENGINE_PCM),snd-pcm-dmaengine) SOUNDCORE_FILES += \ $(if $(CONFIG_SND_DMAENGINE_PCM),$(LINUX_DIR)/sound/core/snd-pcm-dmaengine.ko) -endif - -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.14.0)),1) -SOUNDCORE_LOAD += \ - snd-page-alloc - -SOUNDCORE_FILES += \ - $(LINUX_DIR)/sound/core/snd-page-alloc.ko -endif define KernelPackage/sound-core SUBMENU:=$(SOUND_MENU) TITLE:=Sound support - DEPENDS:=@AUDIO_SUPPORT + DEPENDS:=@AUDIO_SUPPORT +kmod-input-core KCONFIG:= \ CONFIG_SOUND \ CONFIG_SND \ @@ -76,7 +60,6 @@ define KernelPackage/sound-core CONFIG_SND_COMPRESS_OFFLOAD FILES:=$(SOUNDCORE_FILES) AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD)) - $(call AddDepends/input) endef define KernelPackage/sound-core/uml @@ -151,22 +134,6 @@ endef $(eval $(call KernelPackage,sound-i8x0)) -define KernelPackage/sound-cs5535audio - TITLE:=CS5535 PCI Controller - DEPENDS:=+kmod-ac97 - KCONFIG:=CONFIG_SND_CS5535AUDIO - FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko - AUTOLOAD:=$(call AutoLoad,36,snd-cs5535audio) - $(call AddDepends/sound) -endef - -define KernelPackage/sound-cs5535audio/description - Support for the integrated AC97 sound device on olpc -endef - -$(eval $(call KernelPackage,sound-cs5535audio)) - - define KernelPackage/sound-soc-core TITLE:=SoC sound support DEPENDS:=+kmod-regmap +kmod-ac97 @@ -187,7 +154,7 @@ define KernelPackage/sound-soc-ac97 KCONFIG:=CONFIG_SND_SOC_AC97_CODEC FILES:=$(LINUX_DIR)/sound/soc/codecs/snd-soc-ac97.ko AUTOLOAD:=$(call AutoLoad,57,snd-soc-ac97) - DEPENDS:=+kmod-ac97 +kmod-sound-soc-core +TARGET_ep93xx:kmod-sound-soc-ep93xx-ac97 + DEPENDS:=+kmod-ac97 +kmod-sound-soc-core $(call AddDepends/sound) endef @@ -196,18 +163,6 @@ $(eval $(call KernelPackage,sound-soc-ac97)) define KernelPackage/sound-soc-imx TITLE:=IMX SoC support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1) - KCONFIG:=\ - CONFIG_SND_IMX_SOC \ - CONFIG_SND_SOC_IMX_AUDMUX \ - CONFIG_SND_SOC_FSL_SSI \ - CONFIG_SND_SOC_IMX_PCM - FILES:= \ - $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \ - $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \ - $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko - AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm) -else KCONFIG:=\ CONFIG_SND_IMX_SOC \ CONFIG_SND_SOC_IMX_AUDMUX \ @@ -218,7 +173,6 @@ else $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \ $(LINUX_DIR)/sound/soc/fsl/imx-pcm-dma.ko AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm) -endif DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core $(call AddDepends/sound) endef @@ -268,7 +222,7 @@ $(eval $(call KernelPackage,sound-soc-gw_avila)) define KernelPackage/pcspkr - DEPENDS:=@TARGET_x86 + DEPENDS:=@TARGET_x86 +kmod-input-core TITLE:=PC speaker support KCONFIG:= \ CONFIG_INPUT_PCSPKR \ @@ -277,7 +231,6 @@ define KernelPackage/pcspkr $(LINUX_DIR)/drivers/input/misc/pcspkr.ko \ $(LINUX_DIR)/sound/drivers/pcsp/snd-pcsp.ko AUTOLOAD:=$(call AutoLoad,50,pcspkr snd-pcsp) - $(call AddDepends/input) $(call AddDepends/sound) endef diff --git a/trunk/package/kernel/linux/modules/usb.mk b/trunk/package/kernel/linux/modules/usb.mk index 4644cbbe..8f6013c3 100644 --- a/trunk/package/kernel/linux/modules/usb.mk +++ b/trunk/package/kernel/linux/modules/usb.mk @@ -16,15 +16,9 @@ define KernelPackage/usb-core TITLE:=Support for USB DEPENDS:=@USB_SUPPORT KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.16.0)),1) FILES:= \ $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ $(LINUX_DIR)/drivers/usb/common/usb-common.ko -else - FILES:= \ - $(LINUX_DIR)/drivers/usb/core/usbcore.ko \ - $(LINUX_DIR)/drivers/usb/usb-common.ko -endif AUTOLOAD:=$(call AutoLoad,20,usb-common usbcore,1) $(call AddDepends/nls) endef @@ -109,18 +103,8 @@ define KernelPackage/usb-phy-nop TITLE:=Support for USB NOP transceiver KCONFIG:=CONFIG_NOP_USB_XCEIV HIDDEN:=1 -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-generic.ko),) FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-generic.ko AUTOLOAD:=$(call AutoLoad,43,phy-generic) -else -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/phy/phy-nop.ko),) - FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-nop.ko - AUTOLOAD:=$(call AutoLoad,43,phy-nop) -else - FILES:=$(LINUX_DIR)/drivers/usb/otg/nop-usb-xceiv.ko - AUTOLOAD:=$(call AutoLoad,43,nop-usb-xceiv) -endif -endif $(call AddDepends/usb) endef @@ -155,11 +139,11 @@ define KernelPackage/usb-phy-omap-usb2 TITLE:=Support for OMAP2 USB PHY KCONFIG:= \ CONFIG_OMAP_USB2 \ - CONFIG_OMAP_CONTROL_USB + CONFIG_OMAP_CONTROL_PHY DEPENDS:=@TARGET_omap FILES:= \ $(LINUX_DIR)/drivers/phy/phy-omap-usb2.ko \ - $(LINUX_DIR)/drivers/usb/phy/phy-omap-control.ko + $(LINUX_DIR)/drivers/phy/phy-omap-control.ko AUTOLOAD:=$(call AutoLoad,45,phy-omap-control phy-omap-usb2) $(call AddDepends/usb) endef @@ -222,7 +206,8 @@ $(eval $(call KernelPackage,usb-phy-twl6030)) define KernelPackage/usb-gadget TITLE:=USB Gadget support KCONFIG:=CONFIG_USB_GADGET - FILES:=$(LINUX_DIR)/drivers/usb/gadget/udc-core.ko + FILES:=\ + $(LINUX_DIR)/drivers/usb/gadget/udc/udc-core.ko AUTOLOAD:=$(call AutoLoad,45,udc-core) DEPENDS:=@USB_GADGET_SUPPORT $(call AddDepends/usb) @@ -237,7 +222,7 @@ $(eval $(call KernelPackage,usb-gadget)) define KernelPackage/usb-lib-composite TITLE:=USB lib composite KCONFIG:=CONFIG_USB_LIBCOMPOSITE - DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs @!LINUX_3_3 @!LINUX_3_6 + DEPENDS:=+kmod-usb-gadget +kmod-fs-configfs FILES:=$(LINUX_DIR)/drivers/usb/gadget/libcomposite.ko AUTOLOAD:=$(call AutoLoad,50,libcomposite) $(call AddDepends/usb) @@ -256,22 +241,14 @@ define KernelPackage/usb-eth-gadget CONFIG_USB_ETH \ CONFIG_USB_ETH_RNDIS=y \ CONFIG_USB_ETH_EEM=n - DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko),) + DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite FILES:= \ - $(LINUX_DIR)/drivers/usb/gadget/u_ether.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_ecm_subset.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_rndis.ko \ - $(LINUX_DIR)/drivers/usb/gadget/g_ether.ko - ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko),) - FILES+=$(LINUX_DIR)/drivers/usb/gadget/u_rndis.ko - endif + $(LINUX_DIR)/drivers/usb/gadget/function/u_ether.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_ecm_subset.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_rndis.ko \ + $(LINUX_DIR)/drivers/usb/gadget/legacy/g_ether.ko AUTOLOAD:=$(call AutoLoad,52,usb_f_ecm g_ether) -else - FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_ether.ko - AUTOLOAD:=$(call AutoLoad,52,g_ether) -endif $(call AddDepends/usb) endef @@ -285,19 +262,14 @@ $(eval $(call KernelPackage,usb-eth-gadget)) define KernelPackage/usb-serial-gadget TITLE:=USB Serial Gadget support KCONFIG:=CONFIG_USB_G_SERIAL - DEPENDS:=+kmod-usb-gadget +(!LINUX_3_3&&!LINUX_3_6):kmod-usb-lib-composite -ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko),) + DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite FILES:= \ - $(LINUX_DIR)/drivers/usb/gadget/u_serial.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_acm.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_obex.ko \ - $(LINUX_DIR)/drivers/usb/gadget/usb_f_serial.ko \ - $(LINUX_DIR)/drivers/usb/gadget/g_serial.ko + $(LINUX_DIR)/drivers/usb/gadget/function/u_serial.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_acm.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_obex.ko \ + $(LINUX_DIR)/drivers/usb/gadget/function/usb_f_serial.ko \ + $(LINUX_DIR)/drivers/usb/gadget/legacy/g_serial.ko AUTOLOAD:=$(call AutoLoad,52,usb_f_acm g_serial) -else - FILES:=$(LINUX_DIR)/drivers/usb/gadget/g_serial.ko - AUTOLOAD:=$(call AutoLoad,52,g_serial) -endif $(call AddDepends/usb) endef @@ -327,7 +299,10 @@ $(eval $(call KernelPackage,usb-uhci,1)) define KernelPackage/usb-ohci TITLE:=Support for OHCI controllers - DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx + DEPENDS:= \ + +TARGET_bcm53xx:kmod-usb-bcma \ + +TARGET_brcm47xx:kmod-usb-bcma \ + +TARGET_brcm47xx:kmod-usb-ssb KCONFIG:= \ CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ @@ -337,11 +312,13 @@ define KernelPackage/usb-ohci CONFIG_USB_OCTEON_OHCI=y \ CONFIG_USB_OHCI_HCD_OMAP3=y \ CONFIG_USB_OHCI_HCD_PLATFORM=y - FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.11.0)),1) - FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-platform.ko -endif - AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform,1) + FILES:= \ + $(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko \ + $(LINUX_DIR)/drivers/usb/host/ohci-platform.ko + ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ohci-at91.ko),) + FILES+=$(LINUX_DIR)/drivers/usb/host/ohci-at91.ko + endif + AUTOLOAD:=$(call AutoLoad,50,ohci-hcd ohci-platform ohci-at91,1) $(call AddDepends/usb) endef @@ -352,6 +329,22 @@ endef $(eval $(call KernelPackage,usb-ohci,1)) +define KernelPackage/usb-ohci-pci + TITLE:=Support for PCI OHCI controllers + DEPENDS:=@PCI_SUPPORT +kmod-usb-ohci + KCONFIG:=CONFIG_USB_OHCI_HCD_PCI + FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-pci.ko + AUTOLOAD:=$(call AutoLoad,51,ohci-pci,1) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-ohci-pci/description + Kernel support for PCI OHCI controllers +endef + +$(eval $(call KernelPackage,usb-ohci-pci)) + + define KernelPackage/usb2-fsl TITLE:=Support for Freescale USB2 controllers DEPENDS:=@TARGET_mpc85xx @@ -373,7 +366,9 @@ $(eval $(call KernelPackage,usb2-fsl)) define KernelPackage/usb2-omap TITLE:=Support for USB2 for OMAP DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-phy-am335x +kmod-usb2 - KCONFIG:=CONFIG_USB_EHCI_HCD_OMAP + KCONFIG:=\ + CONFIG_MFD_OMAP_USB_HOST=y \ + CONFIG_USB_EHCI_HCD_OMAP FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-omap.ko AUTOLOAD:=$(call AutoLoad,39,ehci-omap) $(call AddDepends/usb) @@ -385,11 +380,36 @@ endef $(eval $(call KernelPackage,usb2-omap)) +define KernelPackage/usb-bcma + TITLE:=Support for BCMA USB controllers + DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx||TARGET_bcm53xx + HIDDEN:=1 + KCONFIG:=CONFIG_USB_HCD_BCMA + FILES:= \ + $(if $(CONFIG_USB_HCD_BCMA),$(LINUX_DIR)/drivers/usb/host/bcma-hcd.ko) + AUTOLOAD:=$(call AutoLoad,19,$(if $(CONFIG_USB_HCD_BCMA),bcma-hcd),1) + $(call AddDepends/usb) +endef +$(eval $(call KernelPackage,usb-bcma)) + +define KernelPackage/usb-ssb + TITLE:=Support for SSB USB controllers + DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx + HIDDEN:=1 + KCONFIG:=CONFIG_USB_HCD_SSB + FILES:= \ + $(if $(CONFIG_USB_HCD_SSB),$(LINUX_DIR)/drivers/usb/host/ssb-hcd.ko) + AUTOLOAD:=$(call AutoLoad,19,$(if $(CONFIG_USB_HCD_SSB),ssb-hcd),1) + $(call AddDepends/usb) +endef +$(eval $(call KernelPackage,usb-ssb)) define KernelPackage/usb2 TITLE:=Support for USB2 controllers DEPENDS:=\ - +TARGET_brcm47xx:kmod-usb-brcm47xx \ + +TARGET_brcm47xx:kmod-usb-bcma \ + +TARGET_brcm47xx:kmod-usb-ssb \ + +TARGET_bcm53xx:kmod-usb-bcma \ +TARGET_mpc85xx:kmod-usb2-fsl KCONFIG:=\ CONFIG_USB_EHCI_HCD \ @@ -399,19 +419,18 @@ define KernelPackage/usb2 CONFIG_USB_EHCI_MXC=y \ CONFIG_USB_OCTEON_EHCI=y \ CONFIG_USB_EHCI_HCD_ORION=y \ - CONFIG_USB_EHCI_HCD_PLATFORM=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1) + CONFIG_USB_EHCI_HCD_PLATFORM=y \ + CONFIG_USB_EHCI_HCD_AT91=y FILES:= \ $(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \ $(LINUX_DIR)/drivers/usb/host/ehci-platform.ko ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-orion.ko),) FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-orion.ko endif - AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion,1) -else - FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko - AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1) -endif + ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),) + FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko + endif + AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel,1) $(call AddDepends/usb) endef @@ -424,7 +443,7 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb2-pci TITLE:=Support for PCI USB2 controllers - DEPENDS:=@PCI_SUPPORT @(!LINUX_3_3&&!LINUX_3_6) +kmod-usb2 + DEPENDS:=@PCI_SUPPORT +kmod-usb2 KCONFIG:=CONFIG_USB_EHCI_PCI FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1) @@ -440,21 +459,17 @@ $(eval $(call KernelPackage,usb2-pci)) define KernelPackage/usb-dwc2 TITLE:=DWC2 USB controller driver - DEPENDS:=@(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_8&&!LINUX_3_9) + DEPENDS:=+(TARGET_brcm2708||TARGET_at91||TARGET_brcm63xx||TARGET_mxs||TARGET_imx6):kmod-usb-gadget KCONFIG:= \ CONFIG_USB_DWC2 \ + CONFIG_USB_DWC2_PCI \ + CONFIG_USB_DWC2_PLATFORM \ CONFIG_USB_DWC2_DEBUG=n \ CONFIG_USB_DWC2_VERBOSE=n \ CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.14.0)),1) FILES:= \ $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \ $(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko -else - FILES:= \ - $(LINUX_DIR)/drivers/staging/dwc2/dwc2.ko \ - $(LINUX_DIR)/drivers/staging/dwc2/dwc2_platform.ko -endif AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform,1) $(call AddDepends/usb) endef @@ -484,6 +499,28 @@ endef $(eval $(call KernelPackage,usb2-oxnas)) +define KernelPackage/usb-dwc3 + TITLE:=DWC3 USB controller driver + KCONFIG:= \ + CONFIG_USB_DWC3 \ + CONFIG_USB_DWC3_HOST=y \ + CONFIG_USB_DWC3_GADGET=n \ + CONFIG_USB_DWC3_DUAL_ROLE=n \ + CONFIG_USB_DWC3_DEBUG=n \ + CONFIG_USB_DWC3_VERBOSE=n + FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3.ko + AUTOLOAD:=$(call AutoLoad,54,dwc3,1) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-dwc3/description + This driver provides support for the Dual Role SuperSpeed + USB Controller based on the Synopsys DesignWare USB3 IP Core +endef + +$(eval $(call KernelPackage,usb-dwc3)) + + define KernelPackage/usb-acm TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM @@ -522,18 +559,10 @@ define KernelPackage/usb-audio CONFIG_SND_USB_AUDIO $(call AddDepends/usb) $(call AddDepends/sound) -# For Linux 2.6.35+ -ifneq ($(wildcard $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko),) FILES:= \ $(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \ $(LINUX_DIR)/sound/usb/snd-usb-audio.ko AUTOLOAD:=$(call AutoProbe,snd-usbmidi-lib snd-usb-audio) -else - FILES:= \ - $(LINUX_DIR)/sound/usb/snd-usb-lib.ko \ - $(LINUX_DIR)/sound/usb/snd-usb-audio.ko - AUTOLOAD:=$(call AutoProbe,snd-usb-lib snd-usb-audio) -endif endef define KernelPackage/usb-audio/description @@ -624,6 +653,49 @@ endef $(eval $(call KernelPackage,usb-serial-ftdi)) +define KernelPackage/usb-serial-garmin + TITLE:=Support for Garmin GPS devices + KCONFIG:=CONFIG_USB_SERIAL_GARMIN + FILES:=$(LINUX_DIR)/drivers/usb/serial/garmin_gps.ko + AUTOLOAD:=$(call AutoProbe,garmin_gps) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-garmin/description + Should work with most Garmin GPS devices which have a native USB port. +endef + +$(eval $(call KernelPackage,usb-serial-garmin)) + + +define KernelPackage/usb-serial-simple + TITLE:=USB Serial Simple (Motorola phone) + KCONFIG:=CONFIG_USB_SERIAL_SIMPLE + FILES:=$(LINUX_DIR)/drivers/usb/serial/usb-serial-simple.ko + AUTOLOAD:=$(call AutoProbe,usb-serial-simple) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-simple/description + Kernel support for "very simple devices". + +Specifically, it supports: + - Suunto ANT+ USB device. + - Medtronic CareLink USB device (3.18) + - Fundamental Software dongle. + - Google USB serial devices (3.19) + - HP4x calculators + - a number of Motorola phones + - Novatel Wireless GPS receivers (3.18) + - Siemens USB/MPI adapter. + - ViVOtech ViVOpay USB device. + - Infineon Modem Flashloader USB interface + - ZIO Motherboard USB serial interface +endef + +$(eval $(call KernelPackage,usb-serial-simple)) + + define KernelPackage/usb-serial-ti-usb TITLE:=Support for TI USB 3410/5052 KCONFIG:=CONFIG_USB_SERIAL_TI @@ -755,21 +827,6 @@ endef $(eval $(call KernelPackage,usb-serial-sierrawireless)) -define KernelPackage/usb-serial-motorola-phone - TITLE:=Support for Motorola usb phone - KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA - FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.ko - AUTOLOAD:=$(call AutoProbe,moto_modem) - $(call AddDepends/usb-serial) -endef - -define KernelPackage/usb-serial-motorola-phone/description - Kernel support for Motorola usb phone -endef - -$(eval $(call KernelPackage,usb-serial-motorola-phone)) - - define KernelPackage/usb-serial-visor TITLE:=Support for Handspring Visor devices KCONFIG:=CONFIG_USB_SERIAL_VISOR @@ -1004,7 +1061,8 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net TITLE:=Kernel modules for USB-to-Ethernet convertors DEPENDS:=+kmod-mii - KCONFIG:=CONFIG_USB_USBNET + KCONFIG:=CONFIG_USB_USBNET \ + CONFIG_USB_NET_DRIVERS AUTOLOAD:=$(call AutoProbe,usbnet) FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko $(call AddDepends/usb) @@ -1025,7 +1083,7 @@ endef define KernelPackage/usb-net-asix TITLE:=Kernel module for USB-to-Ethernet Asix convertors - DEPENDS:=+!LINUX_3_3:kmod-libphy + DEPENDS:=+kmod-libphy KCONFIG:=CONFIG_USB_NET_AX8817X FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko AUTOLOAD:=$(call AutoProbe,asix) @@ -1039,6 +1097,23 @@ endef $(eval $(call KernelPackage,usb-net-asix)) +define KernelPackage/usb-net-asix-ax88179 + TITLE:=Kernel module for USB-to-Gigabit-Ethernet Asix convertors + DEPENDS:=+kmod-libphy + KCONFIG:=CONFIG_USB_NET_AX88179_178A + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/ax88179_178a.ko + AUTOLOAD:=$(call AutoProbe,ax88179_178a) + $(call AddDepends/usb-net) +endef + +define KernelPackage/usb-net-asix-ax88179/description + Kernel module for USB-to-Ethernet ASIX AX88179 based USB 3.0/2.0 + to Gigabit Ethernet adapters. +endef + +$(eval $(call KernelPackage,usb-net-asix-ax88179)) + + define KernelPackage/usb-net-hso TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO @@ -1106,7 +1181,7 @@ define KernelPackage/usb-net-smsc95xx KCONFIG:=CONFIG_USB_NET_SMSC95XX FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc95xx.ko AUTOLOAD:=$(call AutoProbe,smsc95xx) - $(call AddDepends/usb-net, +(!LINUX_3_3&&!LINUX_3_6):kmod-lib-crc16) + $(call AddDepends/usb-net, +kmod-lib-crc16) endef define KernelPackage/usb-net-smsc95xx/description @@ -1192,6 +1267,36 @@ endef $(eval $(call KernelPackage,usb-net-qmi-wwan)) +define KernelPackage/usb-net-rtl8150 + TITLE:=Kernel module for USB-to-Ethernet Realtek convertors + KCONFIG:=CONFIG_USB_RTL8150 + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/rtl8150.ko + AUTOLOAD:=$(call AutoProbe,rtl8150) + $(call AddDepends/usb-net) +endef + +define KernelPackage/usb-net-rtl8150/description + Kernel module for USB-to-Ethernet Realtek 8150 convertors +endef + +$(eval $(call KernelPackage,usb-net-rtl8150)) + + +define KernelPackage/usb-net-rtl8152 + TITLE:=Kernel module for USB-to-Ethernet Realtek convertors + KCONFIG:=CONFIG_USB_RTL8152 + FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko + AUTOLOAD:=$(call AutoProbe,r8152) + $(call AddDepends/usb-net) +endef + +define KernelPackage/usb-net-rtl8152/description + Kernel module for USB-to-Ethernet Realtek 8152 USB2.0/3.0 convertors +endef + +$(eval $(call KernelPackage,usb-net-rtl8152)) + + define KernelPackage/usb-net-rndis TITLE:=Support for RNDIS connections KCONFIG:=CONFIG_USB_NET_RNDIS_HOST @@ -1244,7 +1349,7 @@ define KernelPackage/usb-net-huawei-cdc-ncm KCONFIG:=CONFIG_USB_NET_HUAWEI_CDC_NCM FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/huawei_cdc_ncm.ko AUTOLOAD:=$(call AutoProbe,huawei_cdc_ncm) - $(call AddDepends/usb-net,+kmod-usb-wdm @!LINUX_3_3 @!LINUX_3_8 @!LINUX_3_10) + $(call AddDepends/usb-net,+kmod-usb-net-cdc-ncm +kmod-usb-wdm) endef define KernelPackage/usb-net-huawei-cdc-ncm/description @@ -1302,11 +1407,10 @@ $(eval $(call KernelPackage,usb-net-kalmia)) define KernelPackage/usb-hid TITLE:=Support for USB Human Input Devices KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID CONFIG_USB_HIDDEV=y + DEPENDS:=+kmod-hid +kmod-hid-generic +kmod-input-evdev FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoProbe,usbhid) $(call AddDepends/usb) - $(call AddDepends/hid,+kmod-hid-generic) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-hid/description @@ -1318,11 +1422,11 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink TITLE:=USB Yealink VOIP phone + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko AUTOLOAD:=$(call AutoProbe,yealink) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-yealink/description @@ -1334,11 +1438,11 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 TITLE:=Support for CM109 device + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko AUTOLOAD:=$(call AutoProbe,cm109) $(call AddDepends/usb) - $(call AddDepends/input,+kmod-input-evdev) endef define KernelPackage/usb-cm109/description @@ -1368,7 +1472,7 @@ define KernelPackage/usbip KCONFIG:= \ CONFIG_USBIP_CORE \ CONFIG_USBIP_DEBUG=n - FILES:=$(LINUX_DIR)/drivers/staging/usbip/usbip-core.ko + FILES:=$(LINUX_DIR)/drivers/usb/usbip/usbip-core.ko AUTOLOAD:=$(call AutoProbe,usbip-core) $(call AddDepends/usb) endef @@ -1380,7 +1484,7 @@ define KernelPackage/usbip-client TITLE := USB-over-IP client driver DEPENDS := +kmod-usbip KCONFIG := CONFIG_USBIP_VHCI_HCD - FILES := $(LINUX_DIR)/drivers/staging/usbip/vhci-hcd.$(LINUX_KMOD_SUFFIX) + FILES :=$(LINUX_DIR)/drivers/usb/usbip/vhci-hcd.ko AUTOLOAD := $(call AutoProbe,vhci-hcd) $(call AddDepends/usb) endef @@ -1393,7 +1497,7 @@ $(call KernelPackage/usbip/Default) TITLE := USB-over-IP host driver DEPENDS := +kmod-usbip KCONFIG := CONFIG_USBIP_HOST - FILES := $(LINUX_DIR)/drivers/staging/usbip/usbip-host.ko + FILES :=$(LINUX_DIR)/drivers/usb/usbip/usbip-host.ko AUTOLOAD := $(call AutoProbe,usbip-host) $(call AddDepends/usb) endef @@ -1401,35 +1505,27 @@ endef $(eval $(call KernelPackage,usbip-server)) -define KernelPackage/usb-chipidea +define KernelPackage/usb-chipidea-imx TITLE:=Support for ChipIdea controllers - DEPENDS:=+kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget + DEPENDS:=@TARGET_imx6||TARGET_mxs +kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget KCONFIG:=\ CONFIG_USB_CHIPIDEA \ CONFIG_USB_CHIPIDEA_HOST=y \ CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1) - FILES:=\ - $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ - $(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko) \ - $(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q).ko) - AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF_DEVICE),ci13xxx_imx usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q)),1) -else FILES:=\ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \ $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko) AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1) -endif $(call AddDepends/usb) endef - -define KernelPackage/usb-chipidea/description + +define KernelPackage/usb-chipidea-imx/description Kernel support for USB ChipIdea controllers endef -$(eval $(call KernelPackage,usb-chipidea,1)) +$(eval $(call KernelPackage,usb-chipidea-imx,1)) define KernelPackage/usb-mxs-phy @@ -1463,16 +1559,19 @@ endef $(eval $(call KernelPackage,usbmon)) -XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,xhci-hcd xhci-pci xhci-plat)) +XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,xhci-hcd xhci-pci xhci-plat-hcd)) XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES)) define KernelPackage/usb3 TITLE:=Support for USB3 controllers - DEPENDS:=+TARGET_omap:kmod-usb-phy-omap-usb3 + DEPENDS:= \ + +TARGET_bcm53xx:kmod-usb-bcma \ + +TARGET_omap:kmod-usb-phy-omap-usb3 KCONFIG:= \ CONFIG_USB_XHCI_HCD \ CONFIG_USB_XHCI_PCI \ CONFIG_USB_XHCI_PLATFORM \ + CONFIG_USB_XHCI_MVEBU=y \ CONFIG_USB_XHCI_HCD_DEBUGGING=n FILES:= \ $(XHCI_FILES) diff --git a/trunk/package/kernel/linux/modules/video.mk b/trunk/package/kernel/linux/modules/video.mk index 0681b0e7..3b06a143 100644 --- a/trunk/package/kernel/linux/modules/video.mk +++ b/trunk/package/kernel/linux/modules/video.mk @@ -8,21 +8,15 @@ VIDEO_MENU:=Video Support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) V4L2_DIR=v4l2-core V4L2_USB_DIR=usb -else -V4L2_DIR=video -V4L2_USB_DIR=video -endif - define KernelPackage/fb SUBMENU:=$(VIDEO_MENU) TITLE:=Framebuffer support DEPENDS:=@DISPLAY_SUPPORT KCONFIG:=CONFIG_FB - FILES:=$(LINUX_DIR)/drivers/video/fb.ko + FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb.ko AUTOLOAD:=$(call AutoLoad,06,fb) endef @@ -42,7 +36,7 @@ define KernelPackage/fb-cfb-fillrect TITLE:=Framebuffer software rectangle filling support DEPENDS:=+kmod-fb KCONFIG:=CONFIG_FB_CFB_FILLRECT - FILES:=$(LINUX_DIR)/drivers/video/cfbfillrect.ko + FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/cfbfillrect.ko AUTOLOAD:=$(call AutoLoad,07,cfbfillrect) endef @@ -58,7 +52,7 @@ define KernelPackage/fb-cfb-copyarea TITLE:=Framebuffer software copy area support DEPENDS:=+kmod-fb KCONFIG:=CONFIG_FB_CFB_COPYAREA - FILES:=$(LINUX_DIR)/drivers/video/cfbcopyarea.ko + FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/cfbcopyarea.ko AUTOLOAD:=$(call AutoLoad,07,cfbcopyarea) endef @@ -73,7 +67,7 @@ define KernelPackage/fb-cfb-imgblt TITLE:=Framebuffer software image blit support DEPENDS:=+kmod-fb KCONFIG:=CONFIG_FB_CFB_IMAGEBLIT - FILES:=$(LINUX_DIR)/drivers/video/cfbimgblt.ko + FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/cfbimgblt.ko AUTOLOAD:=$(call AutoLoad,07,cfbimgblt) endef @@ -99,18 +93,10 @@ define KernelPackage/video-core CONFIG_V4L_PCI_DRIVERS=y \ CONFIG_V4L_PLATFORM_DRIVERS=y \ CONFIG_V4L_ISA_PARPORT_DRIVERS=y -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) FILES:= \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common) -else - FILES:= \ - $(if $(CONFIG_COMPAT),$(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-compat-ioctl32.ko) \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \ - $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko - AUTOLOAD:=$(call AutoLoad,60, $(if $(CONFIG_COMPAT),v4l2-compat-ioctl32) videodev v4l2-common) -endif endef define KernelPackage/video-core/description @@ -170,22 +156,6 @@ endef $(eval $(call KernelPackage,video-cpia2)) -define KernelPackage/video-sn9c102 - TITLE:=SN9C102 Camera Chip support - DEPENDS:=@USB_SUPPORT +kmod-usb-core - KCONFIG:=CONFIG_USB_SN9C102 - FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/sn9c102/sn9c102.ko - AUTOLOAD:=$(call AutoProbe,gspca_sn9c20x) - $(call AddDepends/camera) -endef - -define KernelPackage/video-sn9c102/description - Kernel modules for supporting SN9C102 camera chips -endef - -$(eval $(call KernelPackage,video-sn9c102)) - - define KernelPackage/video-pwc TITLE:=Philips USB webcam support DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 @@ -206,12 +176,11 @@ $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc TITLE:=USB Video Class (UVC) support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 +kmod-input-core KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko AUTOLOAD:=$(call AutoProbe,uvcvideo) $(call AddDepends/camera) - $(call AddDepends/input) endef define KernelPackage/video-uvc/description diff --git a/trunk/package/kernel/linux/modules/virtual.mk b/trunk/package/kernel/linux/modules/virtual.mk index 190d8446..4464fe9d 100644 --- a/trunk/package/kernel/linux/modules/virtual.mk +++ b/trunk/package/kernel/linux/modules/virtual.mk @@ -117,11 +117,11 @@ define KernelPackage/xen-fbdev CONFIG_FB_SYS_IMAGEBLIT \ CONFIG_FIRMWARE_EDID=n FILES:= \ - $(LINUX_DIR)/drivers/video/xen-fbfront.ko \ - $(LINUX_DIR)/drivers/video/syscopyarea.ko \ - $(LINUX_DIR)/drivers/video/sysfillrect.ko \ - $(LINUX_DIR)/drivers/video/fb_sys_fops.ko \ - $(LINUX_DIR)/drivers/video/sysimgblt.ko + $(LINUX_DIR)/drivers/video/fbdev/xen-fbfront.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/syscopyarea.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/sysfillrect.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/fb_sys_fops.ko \ + $(LINUX_DIR)/drivers/video/fbdev/core/sysimgblt.ko AUTOLOAD:=$(call AutoLoad,07, \ fb \ syscopyarea \ diff --git a/trunk/package/kernel/linux/modules/w1.mk b/trunk/package/kernel/linux/modules/w1.mk index c2fc6495..196fe675 100644 --- a/trunk/package/kernel/linux/modules/w1.mk +++ b/trunk/package/kernel/linux/modules/w1.mk @@ -174,3 +174,19 @@ define KernelPackage/w1-slave-ds2760/description endef $(eval $(call KernelPackage,w1-slave-ds2760)) + + +define KernelPackage/w1-slave-ds2413 + TITLE:=DS2413 2 Ch. Addressable Switch + KCONFIG:= \ + CONFIG_W1_SLAVE_DS2413 + FILES:=$(W1_SLAVES_DIR)/w1_ds2413.ko + AUTOLOAD:=$(call AutoProbe,w1_ds2413) + $(call AddDepends/w1) +endef + +define KernelPackage/w1-slave-ds2413/description + Kernel module for 1-wire DS2413 Dual Channel Addressable Switch support +endef + +$(eval $(call KernelPackage,w1-slave-ds2413)) diff --git a/trunk/package/kernel/linux/modules/wireless.mk b/trunk/package/kernel/linux/modules/wireless.mk deleted file mode 100644 index f1c1d4ba..00000000 --- a/trunk/package/kernel/linux/modules/wireless.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -WIRELESS_MENU:=Wireless Drivers diff --git a/trunk/package/kernel/linux/modules/wpan.mk b/trunk/package/kernel/linux/modules/wpan.mk new file mode 100644 index 00000000..8cb1bfce --- /dev/null +++ b/trunk/package/kernel/linux/modules/wpan.mk @@ -0,0 +1,122 @@ +# +# Copyright (C) 2015 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. + +WPAN_MENU:=WPAN 802.15.4 Support + +define KernelPackage/ieee802154 + SUBMENU:=$(WPAN_MENU) + TITLE:=IEEE-802.15.4 support + DEPENDS:=@!LINUX_3_18 + KCONFIG:= \ + CONFIG_IEEE802154 \ + CONFIG_IEEE802154_SOCKET=y + FILES:= \ + $(LINUX_DIR)/net/ieee802154/ieee802154.ko \ + $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko@ge4.0 + AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket) +endef + +define KernelPackage/ieee802154/description + IEEE Std 802.15.4 defines a low data rate, low power and low + complexity short range wireless personal area networks. It was + designed to organise networks of sensors, switches, etc automation + devices. Maximum allowed data rate is 250 kb/s and typical personal + operating space around 10m. +endef + +$(eval $(call KernelPackage,ieee802154)) + +define KernelPackage/mac802154 + SUBMENU:=$(WPAN_MENU) + TITLE:=MAC-802.15.4 support + DEPENDS:=+kmod-ieee802154 +kmod-crypto-aead +kmod-lib-crc-ccitt @!LINUX_3_18 + KCONFIG:= \ + CONFIG_MAC802154 \ + CONFIG_IEEE802154_DRIVERS=y + FILES:=$(LINUX_DIR)/net/mac802154/mac802154.ko + AUTOLOAD:=$(call AutoLoad,91,mac802154) +endef + +define KernelPackage/mac802154/description + This option enables the hardware independent IEEE 802.15.4 + networking stack for SoftMAC devices (the ones implementing + only PHY level of IEEE 802.15.4 standard). + + Note: this implementation is neither certified, nor feature + complete! Compatibility with other implementations hasn't + been tested yet! +endef + +$(eval $(call KernelPackage,mac802154)) + +define KernelPackage/fakelb + SUBMENU:=$(WPAN_MENU) + TITLE:=Fake LR-WPAN driver + DEPENDS:=+kmod-mac802154 @!LINUX_3_18 + KCONFIG:=CONFIG_IEEE802154_FAKELB + FILES:=$(LINUX_DIR)/drivers/net/ieee802154/fakelb.ko + AUTOLOAD:=$(call AutoLoad,92,fakelb) +endef + +define KernelPackage/fakelb/description + Say Y here to enable the fake driver that can emulate a net + of several interconnected radio devices. +endef + +$(eval $(call KernelPackage,fakelb)) + +define KernelPackage/at86rf230 + SUBMENU:=$(WPAN_MENU) + TITLE:=AT86RF230 transceiver driver + DEPENDS:=+kmod-mac802154 +kmod-regmap + KCONFIG:=CONFIG_IEEE802154_AT86RF230 \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y + FILES:=$(LINUX_DIR)/drivers/net/ieee802154/at86rf230.ko +endef + +$(eval $(call KernelPackage,at86rf230)) + +define KernelPackage/mrf24j40 + SUBMENU:=$(WPAN_MENU) + TITLE:=MRF24J40 transceiver driver + DEPENDS:=+kmod-mac802154 + KCONFIG:=CONFIG_IEEE802154_MRF24J40 \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y + FILES:=$(LINUX_DIR)/drivers/net/ieee802154/mrf24j40.ko +endef + +$(eval $(call KernelPackage,mrf24j40)) + +define KernelPackage/cc2520 + SUBMENU:=$(WPAN_MENU) + TITLE:=CC2520 transceiver driver + DEPENDS:=+kmod-mac802154 + KCONFIG:=CONFIG_IEEE802154_CC2520 \ + CONFIG_SPI=y \ + CONFIG_SPI_MASTER=y + FILES:=$(LINUX_DIR)/drivers/net/ieee802154/cc2520.ko +endef + +$(eval $(call KernelPackage,cc2520)) + +define KernelPackage/ieee802154_6lowpan + SUBMENU:=$(WPAN_MENU) + TITLE:= 6LoWPAN support over IEEE-802.15.4 + DEPENDS:=@!LINUX_3_18 +kmod-6lowpan +kmod-ieee802154 + KCONFIG:=CONFIG_IEEE802154_6LOWPAN + FILES:= \ + $(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko@ge4.0 \ + $(LINUX_DIR)/net/ieee802154/ieee802154_6lowpan.ko@lt4.0 + AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan) +endef + +define KernelPackage/ieee802154_6lowpan/description + IPv6 compression over IEEE 802.15.4 +endef + +$(eval $(call KernelPackage,ieee802154_6lowpan)) diff --git a/trunk/package/lang/dkjson/Makefile b/trunk/package/lang/dkjson/Makefile index 4a642287..efb0012d 100644 --- a/trunk/package/lang/dkjson/Makefile +++ b/trunk/package/lang/dkjson/Makefile @@ -9,12 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dkjson PKG_VERSION:=2.5 -PKG_RELEASE:=1 +PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://dkolf.de/src/dkjson-lua.fsl/tarball/ -PKG_MD5SUM:=dbe706722dd64308172cf8e37395e762 +PKG_SOURCE_URL:=https://github.com/LuaDist/dkjson.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=e72ba0c9f5d8b8746fc306f6189a819dbb5cd0be PKG_LICENSE:=MIT +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.bz2 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) include $(INCLUDE_DIR)/package.mk diff --git a/trunk/package/lang/erlang/Makefile b/trunk/package/lang/erlang/Makefile index b6193af7..47c8b119 100644 --- a/trunk/package/lang/erlang/Makefile +++ b/trunk/package/lang/erlang/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2014 OpenWrt.org +# Copyright (C) 2009-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=erlang -PKG_VERSION:=17.3 -PKG_RELEASE:=1 +PKG_VERSION:=17.5 +PKG_RELEASE:=2 PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= http://www.erlang.org/download/ \ http://erlang.mirror.su.se/ -PKG_MD5SUM:=1d0bb2d54dfe1bb6844756b99902ba20 +PKG_MD5SUM:=346dd0136bf1cc28cebc140e505206bb PKG_LICENSE:=ErlPL-1.1 PKG_LICENSE_FILES:=EPLICENCE @@ -45,7 +45,7 @@ endef define Package/erlang $(call Package/erlang/Default) DEPENDS+= +libncurses +librt +zlib - PROVIDES:= erlang-erts=6.1 erlang-kernel=3.0.1 erlang-sasl=2.4 erlang-stdlib=2.1 + PROVIDES:= erlang-erts=6.4 erlang-kernel=3.2 erlang-sasl=2.4.1 erlang-stdlib=2.4 endef define Package/erlang/description @@ -59,7 +59,7 @@ endef define Package/erlang-asn1 $(call Package/erlang/Default) TITLE:=Abstract Syntax Notation One (ASN.1) support - VERSION:=3.0.1 + VERSION:=3.0.4 DEPENDS+= +erlang +erlang-syntax-tools endef @@ -74,7 +74,7 @@ endef define Package/erlang-compiler $(call Package/erlang/Default) TITLE:=Byte code compiler - VERSION:=5.0.1 + VERSION:=5.0.4 DEPENDS+= +erlang +erlang-hipe endef @@ -89,7 +89,7 @@ endef define Package/erlang-crypto $(call Package/erlang/Default) TITLE:=Cryptography support - VERSION:=3.4 + VERSION:=3.5 DEPENDS+= +erlang +libopenssl endef @@ -104,7 +104,7 @@ endef define Package/erlang-hipe $(call Package/erlang/Default) TITLE:=High Performance Erlang - VERSION:=3.11 + VERSION:=3.11.3 DEPENDS+= +erlang endef @@ -119,7 +119,7 @@ endef define Package/erlang-inets $(call Package/erlang/Default) TITLE:=Internet clients and servers - VERSION:=5.10.2 + VERSION:=5.10.6 DEPENDS+= +erlang endef @@ -135,7 +135,7 @@ endef define Package/erlang-mnesia $(call Package/erlang/Default) TITLE:=Distributed database - VERSION:=4.12.1 + VERSION:=4.12.5 DEPENDS+= +erlang endef @@ -152,7 +152,7 @@ endef define Package/erlang-runtime-tools $(call Package/erlang/Default) TITLE:=Low-profile debugging/tracing tools - VERSION:=1.8.14 + VERSION:=1.8.16 DEPENDS+= +erlang endef @@ -167,7 +167,7 @@ endef define Package/erlang-snmp $(call Package/erlang/Default) TITLE:=Simple Network Management Protocol (SNMP) support - VERSION:=4.25.1 + VERSION:=5.1.1 DEPENDS+= +erlang +erlang-asn1 endef @@ -183,7 +183,7 @@ endef define Package/erlang-ssh $(call Package/erlang/Default) TITLE:=Secure Shell (SSH) support - VERSION:=3.0.3 + VERSION:=3.2 DEPENDS+= +erlang +erlang-crypto endef @@ -198,7 +198,7 @@ endef define Package/erlang-ssl $(call Package/erlang/Default) TITLE:=Secure Sockets Layer (SSL) support - VERSION:=5.3.5 + VERSION:=6.0 DEPENDS+= +erlang +erlang-crypto endef @@ -213,7 +213,7 @@ endef define Package/erlang-syntax-tools $(call Package/erlang/Default) TITLE:=Abstract Erlang syntax trees handling support - VERSION:=1.6.15 + VERSION:=1.6.18 DEPENDS+= +erlang endef @@ -232,6 +232,8 @@ HOST_CONFIGURE_ARGS += \ --disable-smp-support \ --without-javac +HOST_CFLAGS += -D_GNU_SOURCE + define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) all endef @@ -257,6 +259,7 @@ CONFIGURE_VARS += \ erl_xcomp_getaddrinfo=no \ erl_xcomp_sysroot="$(STAGING_DIR)" +EXTRA_CFLAGS+=-D_GNU_SOURCE EXTRA_LDFLAGS+=-lz define Build/Compile @@ -300,9 +303,9 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/erl_interface/obj/*/*.a $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/erl_interface/obj/*/*.a $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/lib/erl_interface/include/*.h $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/lib/erl_interface/include/*.h $(1)/usr/include/ endef define BuildModule diff --git a/trunk/package/lang/erlang/patches/102-musl_compat.patch b/trunk/package/lang/erlang/patches/102-musl_compat.patch new file mode 100644 index 00000000..d23900ed --- /dev/null +++ b/trunk/package/lang/erlang/patches/102-musl_compat.patch @@ -0,0 +1,11 @@ +--- a/lib/erl_interface/src/connect/ei_resolve.c ++++ b/lib/erl_interface/src/connect/ei_resolve.c +@@ -642,7 +642,7 @@ struct hostent *ei_gethostbyname_r(const + #ifndef HAVE_GETHOSTBYNAME_R + return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop); + #else +-#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__)) ++#if (defined(_GNU_SOURCE) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__)) + struct hostent *result; + + gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop); diff --git a/trunk/package/luci/modules/luci-base/src/po2lmo b/trunk/package/luci/modules/luci-base/src/po2lmo index 611ff7978280d0dbaa3eae26f127a188779fd0de..3c2436ca948b71773a8cf9d2807cfda38ca2b61a 100755 GIT binary patch literal 19269 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 B1z`XH literal 19168 zcmeHPeRP!7nZGlWK!lJ9pf-S&Ap*q@V)&2~Me76@e6c|zCf2RsFeDR5O=i-WcQClc zVux7AF`8|)wcWNy+g)q-^z6y@prsszAQaNAwZXM++I8FL((VisYpN8dEt>s3&%Jl% zeTSLW{bT>xs(k|R|3DH z1b(ap{$dII?h^PzCGc$}@J%J~Qzh^VOW@QF#pc(J zbpQ`!g<%jtv2tZg;1`#`?=69^D}jHv1m08v|5yopaS6Py1U|h4{(}|J;9KO znvqajcaLc63P*zk$3mDi?jo(Ou5g>^i0%rtiSF(|kLU=7J4DC!pcy5rE*N(QyQ4vq zIQ$nK>_c=*Lm+JdQ&1x0*6(jKcl8AQ+x+A;YPJU>5z!q(p5V9>&cdSO?ntK@6dgU0 z&XCz5J`)W`OgIghU9hGi`J-kaV*0xSogoo2!#lb}G^CU}BEcZEdZA&0Zto6( zk-c&&sqx%NbFB`#9qAcL^QaCr^;@$H`PMU40zButM@A}o54cp8G~5#~QnJPp0{5cBsCPeU#}$b5u&8fxh$nEy2K z<-`v#zm0erTIoH^e~Ngju5=Icn~0~Ol-|nxjl|OsN;fmVhIkq}X)p8F5KluUUC;b- z;%TU)Jgwqym_J24b@B87^KTGOT|2#p`Ck%GT{_*v{L92sS59wb{$Giw zE}U*={srQx>!!WTA0VE(Y`UKL?-Ng5HSJ;kpNOX}nyzO4Tf|e>Obh0}Mm%-N^u&8q z{x1^mA%2Yc2Z^UHm>yyN^TgK@KLmc+n;Q}*?lcl_81a)6%`F>_4-G8v3gh@;50m46 zp6L~-uOOk*9q#$-gxG&QI%=!2v;oA3XRD0FZ+6bx4{zK(XKpz}g2^!`?UzU*%sBDBc|p$GbnVSOpZsw8d#-!E)`Q2>%vKnt zLMZT-W92Uaa=ded`u`yhHdIFZdJ!wnd=^##}) z$=2+_5h`@zI2)x7qk0a}z)5`pU-Dk=Qt9BOF3fAg%<9E zL-A~_Ssu@Bj+MuKCmjROxZHPAx*ahbFR;b1Ok)^nJm6HhNn#we0a`p&NQWusHsB6GfEcTU~U z6{5Rynd^8`p?k3EV!qW_*GVjTC4 zD#{fUXG2%4$w>B*tq~tWZp6V0Yk6d*UZZj)&_40qBf?yq*QzG18m0BD)Eb7?u!zml zTBrgPe)(Cr=B34*l8MPq4P#KOw!!MQ3M zpW|%2pkU+b7f`JJ{z3S+rf(!(qHI+oTk-6qIR%gT%FIU&)xt^YR&+sBA9aR-G_B3S zIKiY{h$B&lISt=Vci+4B zlyB+o^(+n8@iKQ`A1Z^gg`_YG?HzLOy+$F>R>+dP4&`OtyBKlYGBA?`1X+_ zPULuMeohI1RHAdogl{nE+qc>`=-&G>vPV-R4a3Kc!((LzoYI^twSNZ(=&d|TrMSPD z1}n|U!1tqnjtb2AjkRcN?qx~e{$%UE1bQP7=>vB>wF>qik8sKoTJZ;TzFMuY2%Mf3;zKldklD{p zvkRX5UC`he$++(*&1ja{A5$;d8}l_yefLg9Bc{-ZtelRbe?W)|$HaSh_ep1_3u&e> zjXBT}-Ommk9;--D7fDIhG2-AS2x+(qGyplZ*5R?~D|}}YzSDTB93HD);X6&wi?}aU zMnGyhywHrylkvlt+2dKKxh0-;nN{(u!@ai;&6)ltwdr5Yj7(rzE?1m|gUI(RV7bIH zEg#U+bZs>gSbZK~xQ9E}^C@(+ z#4{)HZN!-o=8R+?@z+gaudq|K);zS0Wi-boAOxP<@-)2=(Xnogkyj-XeyA&nQ8vV@j^qSD7Q)`*`%XPbqr zARFi8#4I=B-B||)4zeSQed!BEVg$WXvU2KjW62>GpvHaUL#PZR@w_ofPa}-U+%p}I zZ>}z*|1sL#p`u7f&3*&e72;vy-Wx_WE0KQK@@PrD|2CS5#?e`5H9_l8JyrX60HZA? zFtR3un#@u710>WAQZN6W((_FuThH=zxrc|<1kIC#ii2<`^jdxql;gt=sR9{2L$&NY z?T9AbiKMq8G1T}&$VFpfs}9AXEDQ)Rk@ShP{1)+BO< z9+G7`2QpI!GGzl9#{eo<^iIR5LF)fJfxJ_tnro#C`&B z$G8mreIv-kh6J9ACl1_E3%~05D-+*LiAx=->`HpzCVXQk?wF800sV|d)EGMD5>WIz zY*OSX%aX|{@{piM93F%2zRf%h$W86dBuZY;Fxw*sh3eKuqI?lU<%@|R*VEZ?qWnVe zoUhCk16<=Kb{*1}i+pj{B?v3=3E`JirGSM2T?X4zTPCs_2NCJ5NV;1DPM`K_Q6;EMPjqP9da^Kk#sRZ`L zXB{K_tj@0XosG~4$3n$hooqdA9DXA=7c`?t=s_sWYTwBiEq)5LGE1dw=gj!-)54sS z^qrPTWxhmF+RC5JJV1k-^PfL2Fi;P}iP%v*Yxd*BVGv~*7F3tz`)0}-pSB;{-O2P< zQHo^iQ6xPqhv73=RO5gEnh%mDMk?wemD!POr4?98D!oOA6bfkTF0i_(915l>mAJv z?qvBJ)!fDt>A$Bzz#VhrsI{4AX1JN}VwWbhHqDuol@v{|8Mj2JwaXtPXRN>l&SpH| zXnLYdjd2`#pM{MH;^_Xmd;EfpAliEh%ggzaqh_SExF4y9Sl_2m-I%@_KiPO&V`8$g zwXvnCf6=chJva>OUrO}W4T&=w5}ZV!wg-v#bcT9jW?fI%6ONe_>*@|q6YB%`U98<> zhCTelmbDK~IBz1(W3YSQYeQ8Fek_1=u=l2E7YAxX*$OFl?v9f?st zD+p+;s=nX3b_Pv{6iD8V&w{@o-wXLl$k%}8>~|yMU>D-^5BS^$`2gxMC-=o&uKOKQ z2{5JeB0dMv4r@VkdiP2dlGCR1b;z%^%J0t0E8+h=$Y~#wvv+=#6(}E9K>oLwUS2P= z$PMJmCTA;TQ>#%QF^Xqz?GfVj}f&a@plasgEjjJSTT{avn(j3glO#UtMUkpP92i4f&PmX91i2=A1qC(;mp5vdN!hIn~2T z$j?CjbE_Qf;rt1!5X$-73_aR4|J17I9A>3;z&;CkGp4*C$=6g>KjK_dRr9dRSLNw1 zTT`{

m_D{{AUORYQF0#wu^5s-dx}zOib_nkoqiDNs8BDS+X-2iFSrVHpUNGB-j-o0~PD(GDTfy2=D6FnZaIscYuK`+#WCk zqAs|@-w_FP2mL$RVXHZ5;SWS2fnCx<$3NW$HFytnceWwvFdX8mj#H5yw?(6(t}Wc% z9SoV=7fOA(aEj63^qwQ8_g-6y;x1tp#mjQ@h1Ho0v&T?T{V77vCwBd*qS!ceVRq8v z*RFq_(DQ&DpC2p4g;tBKc(`?XG*|+r0`!9;6G7# zrQ3@bjuH4Cg89pM`SK+nW^h`r~23oioG}3fE^Xk174TRXqgQ3g@MaE5<_T zH_%xYUPtMtv|{*w0rzMn3!P;A+;KMz8K(UIY>t<;`D_ib*^FBpsOVzgwMEKxc?tcG z1Fse}Vx<}{+M|#4XNX-jUWWM04>7uDSFBw0=5#T9H{<8dpYam7mMPG{j%|Aq7IXG-YbUjly|xQ8mB zAbbb-Os886FYwwV`v@2L=U17M9sypgT>oAIA1{GB;E?)l;3AnWpXnlvSqi7us3`>b z8-12>#aPHHrT@-6FQXwP^D6wc3nk8H){t!gUXA&G>$0s%Q<9sMzP@j(e@kd(+@{LR zrsDR8d?h>=QS#Grg zk9BwNf{BIm(>}tc+7n)m-~5p2_RgS)(T|RTug&3hpcx6YnYby3D|g!k?g7HMJ=iP7 z{unkvE0!xp3d|t#8Zd)?=@8$Pvv!pyzkmIv#*IF|@1}LA6@UQ!un;JK6 zSPLzSgfI9B{|!wyuW4-Z-@JbPt-cn2OXHd*AGzZ@fNjwjR|a^#>_=H>+YtzD5BhQ6 zFwhm=j;aX;y@Xm`Q6;%kd`+#lqv7w0z+!u>?vHOfnqc1?9>(hkZ(Bh$DmX_wIDOgo~lMcPqH z8SNd4QUmJipmr6$DQbu09Zx&P7d?wWxaes|&$+j07xQIOJA~e!uV!@>)UH9-Q0+*; zeNVWEhEcnrb~KuQ!_8>3_Rf$$hWoARs%fD)UmLZ9>Xxh>q#EoB2ikKz&C(~S7puFk z=NieIvC)nlve7YIFal&}R~K#VHhw=g=t@CelC{hE3M}^|y0)9k4qw)_YtlgVV~lt1 z%&SrVvTN~OU_0c$ai@Qin!?t01)@<*Y3xjmGQI?ixZR5G8`}|itJjYC{TNt!mY@-* z=Stgn<14-ehFr@S1o&SdvEDDvi&m(s#(6~D{VnoX`CmhHZi*#%ZhxT9N%Y^%(C4Pw zG3i>vC1B{R63a*q`aFf!%M?8Po&Un)*%p?8v)b!(7gO0Uv}w~`${yB%#ZT*Do&Mua zFDpD=V2{Tk2feOPthfmgI?L7eLryO^f%6 zZ2v@oy*}USQTAS4Fz8Xx`&~^R1!hfOuagI7uzLOl9mQ%p#fq;L+N<^b-~y>}o>o+} zF#k^gr}T9;^|{)RvVT(9X`<^-^G_pUwQsNWvPl1Zm*<$ve-)Hs1X>KF2((4qY6^!53g=L6dR zCv2(jX?uN+sQ(_%2sua4{Zpr}`@wG^v!<{AE<*N7HY=Hb?I%-UpF5YVm-h84eaYqP zL))J&u-E(PdYV`f3fsHDo%j=U$d@j^{`(CpmAwZtYw%bZ#Oa`ue5&l`q}u+993mq+ zeNATq)@fT+x2p6jw4xFgu(rNywcoK^a!b@a@KLa<@X__A=Pw$c#nKAM9t+;wp&XU$SA5(C@QFx;6tIbn5a&Uq{RkR;C^WF2b5Z1BwJ@hK}bEoVE)g% z+>JN4sHzy*J2SuMWuBSYd3Nq>_|SnG!(gfy>|R#sDazP|4^-OiyxGpyvNf#Ra{pxI z7F#U$bjkASNn&~3r7OJQPL5MOPminQmABr%iOENCop&s^d){(CKWlmPkG2Qqg-ez@ z$%nA=1!v7w8g~Bp^78VpuG5%Zh;t7-%vi27?RLLD8J;7J$uKvW3@<`+S;B=jgqu6P zxa_og;W;Zh4ev9SG2Q$!+u!Omf#nK@8(v&kf(Pia<_mx0t$D*a>bGdVQplBB?fP8l zgj1gjFB+p>c+u;g+j`BN7Otl);~KY`65~u^oC`HFvW1KA?Dx6lxL$N0Sv}6@RnOls=_0pi zx~CV(3nG@mzyaQoS!)Ef`^IH5x>AP+Me^*w)!TuWV>?CQI&*ltX84@wotpnSRN3Vg zX+RyK7UCAKP|UjkS%L6U#K)^ zWHZM-*E+{6FHg>`TmjKCb&kcUa`RJMG(i=!w^ejos_0G&U8z*{SAfnCc?^< zmhDyfg56l$Br?cGK(V;=>WnVjiAwZq&|lbqt{B>|*NR3>bN68L0Zq%I8G%8Mo!@B1DG!}`bhcS`b&KH``pOXXzk_=UJR8a0UX;g9P z=ErFt;foI?^1aXl(Dhz{p2xNK<*D6#zKOOfPY1#9cx7F*elc5T!QA7ALJQq;Ia#4M z(us^96b&S@JRKe@H^GmS`rZ^vU>+BFV-%{3vmv__h1*%@jnVm()a`7zc{0Ml?QHam zuKU2dGr8GXW5&(XIrsR}iXzA{e)!ZPiKIu1`XZteY6edd;?=+=s@{?Mi0{) zIKeaAnR`7x3pHP!ga7^yZon5nI+YdN=(M=S2hbg*(Q*Y!XXTJr2FSlQmiN$npSA0D zo__6mksTj@l~Oc5W;Bm*CX>$GV{XZ=p&n!1*+_qk`eq_EG0l;Gdp&Nw(s65sECfS^|E0+c7z$jEym`? z)eWOKE*rpam$F?{-`CXgjhc?NtI#Cb9%3kd8QC1=5|~h}?7j}i=$iPq@lWL$j8m3} zbG5bKHn&IlhQA198oj~+_?NJTzF9OY?xD0$6Au3!R{h@qsLMW;enC!5isWbQ9*w+ixt z6w=QC8i)3f$_7!fPogGHA0@pU^^L1!q^p;0=#bC%Yrg}w4?&;*b9bgw^(M<~Ctf zkjAusWUK7e{(TV4zxHHe%HMqv>S)Cm4xf)dc2b{e5=O()c_X@Xm-dfO%Uo^z_I1Mk z527kR{o|Jfz6R;lvA^+?O<9JqLr|f8^_MPyYW#Qr|4IPw58$Z)PT!Vl<30wy4(rn^UpAii!6-je)6WO+ zCj*>uKc$w(r_;^`q^TzaxGo0RZJRWyQLe4u9_k{w`~SY&W89cA(Un4M+u zSUS$)xNW77MAo$(}fFWtcaWW>Mj6iS@@7l^2yi z>AdS%V2h?txmD@kt#L|iir=qs+F!*#C%N*k_Wqcrulw)SxbFX(8ow27<^Pi8%D;+l zoy-$dQEpQDp9$dK)%b@r{Xa@h{;8?*)jOL0hc*3Kc`j8v2Oy&|FFBdfnyYvkWlC21 z7Ad2wm)x)4squ}_Q+^Tw{9FLPB)J;*0X`~Y-`DghcPsxleELVE{vGnAQGNy_-zGW5 zulspT<8)_J{x`{sAL;A-%Np1BF{yF7M=L+)G_LE9XikjEMkWo1- zImM~_|7rmLS^&SHaeW`(4d5;E!a?Ke`k&VLM4{1SaxdpS`_#Kz z_ii_FikzsrT-DXqk_AEv2vwEZN|D+>LKTXM+Qdygo zy-`}}G~Dr;;kA**@DjDlyyMPJQM*KsE98~;Zrw!Vv$)Qm4L7l5xcv);M?dsEV4hwx z+*v+_QJ!|%uh6thN9*q(=~FFI-d%*O_+{@6PHgM48pO&8)r%YF&WKn-Onm ze6j9ydHRZxnuq&}5t)y@!S;4J>w%S~Bd)%9{9%#+0{WqC++4uf$ z^XjGmXZ}ZUc7I7M~2SxJwzgD*ccEb(|!F3j~pDG^ZgLcu<55Z-ZI)w!d2sIE_ z^%#0J590(j(fjasl3t0hzSahKd=*^R0Q*dNo#iIh1Jda%*x|^ zjJa>Ub_G+o-+vKJaL3M2aM-xi7_)jsw0wa|+%W1KGQ2X`8l`DO!{o{I&xwotl*Z?o zy|uyWY{HrYYmPY^BnwM`m+!d_w-eBCJxaZm%g%+a1-r{5o*tpM3dfGfXbW&|ocFFj$VF zk4YnTJDx4E@_AZI|E0pGx7QHa*-1g*U77^pVLk-mv|}FHe3R7y^zeeLdXTIrBg)c= z&=bPyHW6KQi!t#n$)&e--(NjX{nbYiMAXs4-K|mFQ4rO;6?YVO!yR0;#>!HqR^+@ zfpx}Bk%8n6bOiBh0pO!bX(1Y^xcZEz&+uxIm|Lazm4=q2AM=9{(U*`$yq8?k=7$6; z(p>RjQ-zn9rzxSlOlMA}09RhDe1&#C_VVeChEjP+^9mhRFEQu!FG5xE56a*ELG&ed zx`*l;w0=!{2{1?)iNuLZRe`EqDnV9-(lpf$X{Lt2E0Xcd3{^B#f5!Ae!7A+5?kl#_ z`Y@I#CWlQLYnlA0W5-7=&2nt&Wph?LJCMv|%^}UUw3CI5ZE8h(2x?YfCt0pIoEg%( z*pX9tJ2|GA)Fx$ z$c~-ez1p_Jn8--lKED0)5AgWp=TGG6!z?n^8QIdYcHJZn!e(ec$r+42OzjufcRt&) z|MoTLlCGC9NKi*Mk8urS`>2(6<8X|jhM$ce3C**r*Gtjpvk^`rALobw*-sDYS@Pd4-w!XYovL+V?;%?TQy8sU)NQTdR112O!f)prsvp32$D<1CJ4_S+HJ zE1212+&0H-79UF5Nftj|EV6jP@&_p^moxLwAGfK4Smn>sZ{56v(JT;RjDD3PxkgL7j__W(qaZxLXvrVpUl%yfE3iI+|3Kh8pTJ0>Y^~o3JfnGA47V8ne+t2Imv!w~$QP zgE-Zh{4h)9Mh7$bA#==E4?5sH+#?3Q0>v3sn5DUW8V)ixOY^$T;3RA2*@$iBv+Sv& zRj^qunaQ)XH3}HTxoFx%!ar(KNsQ7XgCoh}2rHP$Y}QJ#^ss3cS=zMHER9dLOs{cm? zF8#~B^ti%T{U29w)&DmX{Nw1$c)lxe>0ibdrNAN7P|cD2ts(fNf^SmzzZ5w6r>?9+ zA1M4g75?kuyvcYDKu2;(;ABQ?F5{^L_y&<73nBbFMQJ8KcjG7hJQRW(A^4!cWt?B4 zNg=}upK7x7|8jtTn6nxCO#mMe_#Z<2oDiFg;@_h9ej55WKA5pGJIg9bQ!M z&nWnUf@=!?M+N_^g8x;)yA(Vku1tzw#qUz^dlddX3a;`sa7f4x{iMkIT;g=!lc;rr zbZL$Az1^3C2%#v|0Yf=#qm>^Cx4JKeCnfGJkY;2G^cU`lxV0l76%L4208k?TLI|*gqkh ZcL1ZiJ2*eRX0!R%iT(E;^r{5s{||mi?a2TD diff --git a/trunk/package/luci/modules/luci-base/src/template_lmo.o b/trunk/package/luci/modules/luci-base/src/template_lmo.o index 1b2f55878c53ef6c4fd6b2c3b8072bf614982ecd..0c1ee31f4cc6b5bbf3f811c6b148a3076ccb7785 100644 GIT binary patch literal 7088 zcmb_geT-CB6~8mHzzPd9ELf?9GFH)LYsX!o(gHP0>9e;+%m!U0wqzJ)XFD5aW;Z); z_)ww6$27b=w;!gPXw`}ljWL=KV_QnfG7E&=R%{nzEgDTW?V1c7QrCt*CMglmIrrX~ zvyYwVAKozU-ut`f{?6C^S{}2$^o3v`AWR8}&x?A`phBEnTyJ+#vr8-%3q_A~{~_Ij zWw$WxS<|j{%{e$N4lR(*!LleUJc*K5@<0fK&Q!>?s$&PIgO!Z*tg>`Uf$)nW{9miadOEhdQTziQC?N;TTl>pen;bHC{XcD9(arsotEZH&2?TS5!nQX2p`Zjl!_p zV1XmO2p@S(EpY7BcBxBRK!%iskNg5;&a42XW{;o_7$#M)hn`Rz*gb_}{!K#S-iR{i z(kV25bUu7QA%)wlUlJHDPLeHJ4ni_pjt*N$8hS5>~4*lob79HJdgV{UgH9nlDGe~cgFA(NfcSc!1) z9<|M8$#@^e;1~^RQ;{-vo*GaUIJcxGL=eTXvccrc4*Rw1Y|(&XRO{j-SOL3zXBp1r zmHb?mhtK1Bd|2P2&ebSBbEKy%fP1sDQLXlEr8C>$(4oBnTMBC2QiU_5 zytdg$0lcHetr_L4Rrb1?oN@qOHJ&x&^;}zf)}6dmcF#gDFbOnp?QgPX^1;e3AP3vJ zB3@5bj=eqmK*RUZ^-b1vVfoEcl{?kg-eqJ_uyPAnsZ>@xY?eU#OyzNkui2^2RSB_} za0}<9+jCO7+fIN#6T)sW(V@-uZwTy_AAl!b&v{ThQ9lw~>u*L9P7R31R3+{80A@`o zp$g0e7+#3*inP0MKzchcf)J5reSW~9IlMds7+8RJ4-B=KAv}mqxDmA~a30L>YC}yx zIVB3usI)uhWj((g;L~L|lyvY-p37H$NJ|pqyY2EEson#WGs4DMDn$FldZ|V-?!wSj1&gGxRUSp@%A~RS)=U%s`1j3Kzct;ePd;Sd$m+u{HTv zCOZJ_&p=l^xOMBsXj{+jLe4Hk*T?ROt-tHD1?qJk>Rcb|Sie@Gxah=k`U(;F=5`U- z9|_#nvY`2CINw$Rjz26vhQ8RcB=SUX>*D#L?*~AH#x~Qa5O`kJ$A4NIe?*Tzix+-v z{!>9S|J!;zi?taKrg2zA0s0Z*P=3PaOD7ci9#N1DC6W*#fpv}J5#m@0&=lfOeubaf z_|I!P%pX5*@^Q-v1%FQ>q~jClAC!yusd0=efmr@P)=umevAjK`>a=MMr80?_o!W1U zSZ~5kh}iCYUc`n5R3|x*&8BiNmK(5Bu?N50b64I@B=>*-PD`cZeM5C&C27I9R`a^yDXG;u(;C+GwhB0~E|2&6$hkU}aebp1)F5fACUsowDEHMkDB z>55N73pxGsC-ro65{C|md|x`APUO>sClk4Woa)BoN&CQHD!x0O8AytFoUY7xGQB6>m*~%s z^uS;$CjhqvwX%r}ie^*Ue99Jm$()@L*=%A^`IN{OatQSerBX^Gp=eq> z2{(6U;L*IGULtAt?@bwyWHSSa-dR90oya{}mq9Cf`-en6H#pRvv-?CJ=(3Y(F_cR5 z;sBXI682ConH?lndnl31V|?oN)RbTd7wU@uD?Br=-XA zgAeL`iu|`Q{4~Qq!tjd>$Ggz*tkU}wdANK#!#V%w7|wZ)Gkg`}e}mz-GyFY<^LVb( zR|eX{okdM1Nmne9%VeQ_;~a)MZC`Bx!%7sdthUmh~alIyqn?pv@w45H^2uOj&EEe?=--F#&E9p6^8TtzR7UDkKSiEw=<&8 zPxSZW%%0T@=XO5NaK6qX`n*LRF5kg$e7YKcH!_^d?`1gWf2INcSB7)HK43Wa>r?vu zjCOMQZ4AGa*_mcIk8>1cupkfqOzF}MgPV8HE+1~*F^~IjbFUxs;pUz`@59YKJ?+EI UJFf}uLoCJ~b6>XkaC2Y&2LMtY)c^nh literal 6672 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 -- 2.25.1