Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 19 insertions, 59 deletions

diff --git a/Config.in b/Config.in
index 8970fc779..298cb2a10 100644
--- a/Config.in
+++ b/Config.in
@@ -110,7 +110,11 @@ config ADK_HOST_OPENBSD
 	boolean
 
 config ADK_HOST_NETBSD
-	prompt "OpenBSD"
+	prompt "NetBSD"
+	boolean
+
+config ADK_HOST_CYGWIN
+	prompt "Cygwin"
 	boolean
 
 endchoice
diff --git a/Makefile b/Makefile
index 392e780e8..ed3ce08c4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ CC?=		gcc
 GMAKE?=		$(PWD)/scripts/make
 GMAKE_FMK=	${GMAKE} -f $(PWD)/mk/build.mk
 GMAKE_INV=	${GMAKE_FMK} --no-print-directory
-_UNLIMIT=	ulimit -dS $$(ulimit -dH);
+
+_UNLIMIT=	ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null;
 
 all: .prereq_done
 	@${_UNLIMIT} ${GMAKE_INV} all
@@ -163,7 +164,7 @@ NO_ERROR=0
 	fi
 	@echo "TOPDIR:=$$(readlink -nf . 2>/dev/null || pwd -P)" >prereq.mk
 	@echo "BASH:=$$(which bash)" >>prereq.mk
-	@if [ -z "$$(which gmake)" ]; then \
+	@if [ -z "$$(which gmake 2>/dev/null )" ]; then \
 		echo "GMAKE:=$$(which make)" >>prereq.mk ;\
 	else \
 		echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\
diff --git a/TODO b/TODO
index f7809cbb1..364a66212 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 - netbsd build
-- win cygwin build
 - macos x build
 - openbsd build
 - make rpm package backend working
diff --git a/mk/build.mk b/mk/build.mk
index d9f369ed2..58c26f11c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -243,6 +243,9 @@ endif
 ifeq (${OStype},NetBSD)
 	@echo ADK_HOST_NETBSD=y > $(TOPDIR)/.defconfig
 endif
+ifneq (,$(filter CYGWIN%,${OStype}))
+	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
+endif
 	@if [ ! -z "$(TARGET)" ];then \
 		grep "^config" target/Config.in \
 			|grep -i "$(TARGET)" \
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 35da4cb09..c3997b060 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -48,6 +48,7 @@ pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		./configure \
 		--with-build-cc=${HOSTCC} \
+		--with-shared \
 		--with-progs \
 	);
 	${MAKE} -C ${WRKBUILD}/include
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index ef6d7babb..70547394e 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -5,10 +5,10 @@ shopt -s extglob
 topdir=$(pwd)
 opath=$PATH
 out=0
-if [ -z $(which gmake) ];then
-	makecmd=$(which make)
+if [ -z $(which gmake 2>/dev/null ) ];then
+	makecmd=$(which make 2>/dev/null )
 else
-	makecmd=$(which gmake)
+	makecmd=$(which gmake 2>/dev/null )
 fi
 
 if [[ $NO_ERROR != @(0|1) ]]; then
diff --git a/target/Config.in b/target/Config.in
index 5eea50e1e..71a44b11d 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -255,6 +255,9 @@ config ADK_LINUX_MIPS_AG241
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_MII
+	select ADK_PACKAGE_KMOD_SANGAM_ATM
+	select ADK_KPACKAGE_KMOD_ATM_BR2684
+	select ADK_PACKAGE_BR2684CTL
 	select ADK_ag241
 	help
 	  Linksys AG241 DSL router.
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 68d8f2d8a..bbee048e7 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -61,6 +61,7 @@ config ADK_KPACKAGE_KMOD_ATM
 config ADK_KPACKAGE_KMOD_ATM_BR2684
 	prompt "kmod-atm-br2684................... BR2684 ATM module"
 	tristate
+	select ADK_KPACKAGE_KMOD_ATM
 	default n
 	help
 
diff --git a/target/linux/patches/2.6.32/cygwin-compat.patch b/target/linux/patches/2.6.32/cygwin-compat.patch
index 8d087dddf..17258e565 100644
--- a/target/linux/patches/2.6.32/cygwin-compat.patch
+++ b/target/linux/patches/2.6.32/cygwin-compat.patch
@@ -12,55 +12,3 @@ diff -Nur linux-2.6.30.orig/scripts/mod/file2alias.c linux-2.6.30/scripts/mod/fi
 +#endif
  typedef uint16_t	__u16;
  typedef unsigned char	__u8;
- 
-diff -Nur linux-2.6.30.orig/scripts/mod/modpost.h linux-2.6.30/scripts/mod/modpost.h
---- linux-2.6.30.orig/scripts/mod/modpost.h	2009-06-10 05:05:27.000000000 +0200
-+++ linux-2.6.30/scripts/mod/modpost.h	2009-06-11 09:17:10.000000000 +0200
-@@ -9,6 +9,11 @@
- #include <unistd.h>
- #include <elf.h>
- 
-+#ifdef __CYGWIN__
-+typedef uint16_t Elf32_Section;
-+typedef uint16_t Elf64_Section;
-+#endif
-+
- #include "elfconfig.h"
- 
- #if KERNEL_ELFCLASS == ELFCLASS32
-@@ -19,13 +24,17 @@
- #define Elf_Addr    Elf32_Addr
- #define Elf_Sword   Elf64_Sword
- #define Elf_Section Elf32_Half
-+#ifndef __CYGWIN__
- #define ELF_ST_BIND ELF32_ST_BIND
- #define ELF_ST_TYPE ELF32_ST_TYPE
-+#endif
- 
- #define Elf_Rel     Elf32_Rel
- #define Elf_Rela    Elf32_Rela
-+#ifndef __CYGWIN__
- #define ELF_R_SYM   ELF32_R_SYM
- #define ELF_R_TYPE  ELF32_R_TYPE
-+#endif
- #else
- 
- #define Elf_Ehdr    Elf64_Ehdr
-@@ -43,6 +52,17 @@
- #define ELF_R_TYPE  ELF64_R_TYPE
- #endif
- 
-+#define R_386_32 1 /* Direct 32 bit */
-+#define R_386_PC32 2 /* PC relative 32 bit */
-+
-+#define R_ARM_PC24 1 /* PC relative 26 bit branch */
-+#define R_ARM_ABS32 2 /* Direct 32 bit */
-+
-+#define R_MIPS_32 2 /* Direct 32 bit */
-+#define R_MIPS_26 4 /* Direct 26 bit shifted */
-+#define R_MIPS_HI16 5 /* High 16 bit */
-+#define R_MIPS_LO16 6 /* Low 16 bit */
-+
- /* The 64-bit MIPS ELF ABI uses an unusual reloc format. */
- typedef struct
- {