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

8 files changed, 36 insertions, 29 deletions

diff --git a/Config.in b/Config.in
index b8a350995..2ac1dce6a 100644
--- a/Config.in
+++ b/Config.in
@@ -53,6 +53,8 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_MICROPERL
 	select ADK_PACKAGE_TAR
 	select ADK_PACKAGE_TSORT
+	select BUSYBOX_STAT
+	select BUSYBOX_FEATURE_STAT_FORMAT
 	select BUSYBOX_TR
 	select BUSYBOX_FEATURE_TR_CLASSES
 	select ADK_PACKAGE_ZLIB
diff --git a/mk/build.mk b/mk/build.mk
index 0569a4570..49b832f72 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -303,6 +303,8 @@ ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
 endif
 ifeq ($(ADKtype),ibm-x40)
+	@echo ADK_ARCH_CHOICE=y >> $(TOPDIR)/.defconfig
+	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_HARDWARE_IBM_X40=y >> $(TOPDIR)/.defconfig
 endif
 ifeq ($(ADKtype),lemote-yeelong)
@@ -313,6 +315,9 @@ endif
 			|grep -i "$(TARGET)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			 >> $(TOPDIR)/.defconfig; \
+		if [ "$(TARGET)" = "native" ];then \
+			echo "ADK_ARCH_CHOICE=y" >> $(TOPDIR)/.defconfig; \
+		fi; \
 	fi
 	@for symbol in ${DEFCONFIG}; do \
 		echo $$symbol >> $(TOPDIR)/.defconfig; \
diff --git a/package/flex/Makefile b/package/flex/Makefile
index d026b2458..f77e4650a 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -16,6 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FLEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
+			ac_cv_func_realloc_0_nonnull=yes
+
 post-install:
 	${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
diff --git a/package/sudo/Makefile b/package/sudo/Makefile
index cdde122fe..4e031c871 100644
--- a/package/sudo/Makefile
+++ b/package/sudo/Makefile
@@ -16,7 +16,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,SUDO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--without-pam
+CONFIGURE_ARGS+=	--without-pam \
+			--with-timedir=/var/run
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_SUDO)/usr/bin
diff --git a/package/xbindkeys/Makefile b/package/xbindkeys/Makefile
index d40bfff35..9c4352cb6 100644
--- a/package/xbindkeys/Makefile
+++ b/package/xbindkeys/Makefile
@@ -18,14 +18,10 @@ $(eval $(call PKG_template,XBINDKEYS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},$
 CONFIGURE_ARGS+=	--disable-guile \
 			--disable-tk
 CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes
-#BUILD_STYLE:=		manual
-#INSTALL_STYLE:=	manual
 
-# please install all files and directories to the package dir
 post-install:
 	$(INSTALL_DIR) $(IDIR_XBINDKEYS)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/xbindkeys \
 		$(IDIR_XBINDKEYS)/usr/bin
 
-# please remove ALL above comments, before commiting
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/Config.in.x86 b/target/Config.in.x86
index db66195a6..e7e98c65a 100644
--- a/target/Config.in.x86
+++ b/target/Config.in.x86
@@ -1,5 +1,5 @@
 choice
-depends on ADK_LINUX_X86
+depends on ADK_LINUX_X86 || ADK_LINUX_NATIVE
 prompt "Hardware model"
 
 config ADK_HARDWARE_GENERIC_X86
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 20e778314..4415489c1 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -53,6 +53,7 @@ config ADK_KERNEL_CONNECTOR
 config ADK_KERNEL_ATA_PIIX
 	boolean
 	select ADK_KERNEL_BLOCK
+	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
 	select ADK_KERNEL_BLK_DEV_SD
diff --git a/target/linux/patches/2.6.36/bsd-compatibility.patch b/target/linux/patches/2.6.36/bsd-compatibility.patch
index 624a845c0..9e91a62de 100644
--- a/target/linux/patches/2.6.36/bsd-compatibility.patch
+++ b/target/linux/patches/2.6.36/bsd-compatibility.patch
@@ -1,23 +1,23 @@
-diff -Nur linux-2.6.32.orig/scripts/Makefile.lib linux-2.6.32/scripts/Makefile.lib
---- linux-2.6.32.orig/scripts/Makefile.lib	Thu Dec  3 04:50:57 2009
-+++ linux-2.6.32/scripts/Makefile.lib	Sat Dec 19 12:21:44 2009
-@@ -211,7 +211,12 @@
- size_append = /bin/echo -ne $(shell					\
+diff -Nur linux-2.6.36.orig/scripts/Makefile.lib linux-2.6.36/scripts/Makefile.lib
+--- linux-2.6.36.orig/scripts/Makefile.lib	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/Makefile.lib	2010-11-28 18:34:22.000000000 +0100
+@@ -216,7 +216,12 @@
+ size_append = printf $(shell						\
  dec_size=0;								\
  for F in $1; do								\
 -	fsize=$$(stat -c "%s" $$F);					\
-+	if stat --help >/dev/null 2>&1; then				\
-+		statcmd='stat -c %s';					\
-+	else								\
++	if stat -qs .>/dev/null 2>&1; then				\
 +		statcmd='stat -f %z';					\
++	else								\
++		statcmd='stat -c %s';					\
 +	fi;								\
 +	fsize=$$($$statcmd $$F);					\
  	dec_size=$$(expr $$dec_size + $$fsize);				\
  done;									\
- printf "%08x" $$dec_size |						\
-diff -Nur linux-2.6.32.orig/scripts/mod/mk_elfconfig.c linux-2.6.32/scripts/mod/mk_elfconfig.c
---- linux-2.6.32.orig/scripts/mod/mk_elfconfig.c	Thu Dec  3 04:50:57 2009
-+++ linux-2.6.32/scripts/mod/mk_elfconfig.c	Sat Dec 19 11:09:24 2009
+ printf "%08x\n" $$dec_size |						\
+diff -Nur linux-2.6.36.orig/scripts/mod/mk_elfconfig.c linux-2.6.36/scripts/mod/mk_elfconfig.c
+--- linux-2.6.36.orig/scripts/mod/mk_elfconfig.c	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/mod/mk_elfconfig.c	2010-11-28 18:33:24.000000000 +0100
 @@ -1,7 +1,18 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -38,15 +38,15 @@ diff -Nur linux-2.6.32.orig/scripts/mod/mk_elfconfig.c linux-2.6.32/scripts/mod/
  
  int
  main(int argc, char **argv)
-diff -Nur linux-2.6.32.orig/scripts/mod/modpost.h linux-2.6.32/scripts/mod/modpost.h
---- linux-2.6.32.orig/scripts/mod/modpost.h	Thu Dec  3 04:50:57 2009
-+++ linux-2.6.32/scripts/mod/modpost.h	Sat Dec 19 11:55:02 2009
-@@ -7,8 +7,2454 @@
+diff -Nur linux-2.6.36.orig/scripts/mod/modpost.h linux-2.6.36/scripts/mod/modpost.h
+--- linux-2.6.36.orig/scripts/mod/modpost.h	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/mod/modpost.h	2010-11-28 18:33:24.000000000 +0100
+@@ -7,7 +7,2453 @@
  #include <sys/mman.h>
  #include <fcntl.h>
  #include <unistd.h>
 -#include <elf.h>
- 
++
 +
 +/* This file defines standard ELF types, structures, and macros.
 +   Copyright (C) 1995-1999,2000,2001,2002,2003 Free Software Foundation, Inc.
@@ -2493,18 +2493,17 @@ diff -Nur linux-2.6.32.orig/scripts/mod/modpost.h linux-2.6.32/scripts/mod/modpo
 +__END_DECLS
 +
 +#endif	/* elf.h */
-+
+ 
  #include "elfconfig.h"
  
- #if KERNEL_ELFCLASS == ELFCLASS32
-@@ -155,3 +2601,4 @@
+@@ -195,3 +2641,4 @@
  void fatal(const char *fmt, ...);
  void warn(const char *fmt, ...);
  void merror(const char *fmt, ...);
 +
-diff -Nur linux-2.6.32.orig/scripts/mod/sumversion.c linux-2.6.32/scripts/mod/sumversion.c
---- linux-2.6.32.orig/scripts/mod/sumversion.c	Thu Dec  3 04:50:57 2009
-+++ linux-2.6.32/scripts/mod/sumversion.c	Sat Dec 19 12:01:07 2009
+diff -Nur linux-2.6.36.orig/scripts/mod/sumversion.c linux-2.6.36/scripts/mod/sumversion.c
+--- linux-2.6.36.orig/scripts/mod/sumversion.c	2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/scripts/mod/sumversion.c	2010-11-28 18:33:24.000000000 +0100
 @@ -1,4 +1,4 @@
 -#include <netinet/in.h>
 +/* #include <netinet/in.h> */