From 2201693a65fe75c107239efc0dccb7a853bff99c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 4 Mar 2014 21:05:02 +0100
Subject: remove ADK_NATIVE checks, need to find a better solution

---
 scripts/scan-pkgs.sh | 174 ---------------------------------------------------
 1 file changed, 174 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 13f5deec7..5563dcca2 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -23,44 +23,6 @@ out=0
 
 . $topdir/.config
 
-if [[ -n $ADK_NATIVE ]];then
-	if [[ -n $ADK_PACKAGE_NEON ]];then
-		NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon"
-	fi
-	if [[ -n $ADK_PACKAGE_LZOP ]];then
-		NEED_LZODEV="$NEED_LZODEV lzop"
-	fi
-	if [[ -n $ADK_PACKAGE_LIBIMAGEMAGICK ]];then
-		NEED_JPEGDEV="$NEED_JPEGDEV libimagemagick"
-		NEED_TIFFDEV="$NEED_TIFFDEV libimagemagick"
-	fi
-	if [[ -n $ADK_PACKAGE_DISPLAY ]];then
-		NEED_X11DEV="$NEED_X11DEV display"
-		NEED_XEXTDEV="$NEED_XEXTDEV display"
-	fi
-	if [[ -n $ADK_PACKAGE_GIT ]];then
-		NEED_CURLDEV="$NEED_CURLDEV git"
-	fi
-	if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then
-		NEED_RPM="$NEED_RPM rpm"
-	fi
-	if [[ -n $ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL ]]; then
-		NEED_LIBSSLDEV="$NEED_LIBSSLDEV wpa_supplicant"
-	fi
-	if [[ -n $ADK_COMPILE_BIND ]]; then
-		NEED_LIBSSLDEV="$NEED_LIBSSLDEV bind"
-	fi
-	if [[ -n $ADK_PACKAGE_IW ]]; then
-		NEED_LIBNLDEV="$NEED_LIBNLDEV iw"
-	fi
-	if [[ -n $ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS ]]; then
-		NEED_LIBKRB5DEV="$NEED_LIBKRB5DEV nfs-utils"
-	fi
-	if [[ -n $ADK_PACKAGE_NFS_UTILS_WITH_TIRPC ]]; then
-		NEED_LIBTIRPCDEV="$NEED_LIBTIRPCDEV nfs-utils"
-	fi
-fi
-
 if [[ -n $ADK_PACKAGE_XBMC ]]; then
 	NEED_JAVA="$NEED_JAVA xbmc"
 fi
@@ -73,10 +35,6 @@ if [[ -n $ADK_COMPILE_COROSYNC ]]; then
 	NEED_GROFF="$NEED_GROFF corosync"
 fi
 
-if [[ -n $ADK_PACKAGE_SQUID ]]; then
-	NEED_GXX="$NEED_GXX squid"
-fi
-
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
@@ -97,99 +55,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi"
 fi
 
-if [[ -n $NEED_LIBTIRPCDEV ]];then
-	if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then
-		echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBXML2_DEV ]];then
-	if ! test -f /usr/include/libxml2/libxml/xmlversion.h >/dev/null; then
-		echo >&2 You need libxml2 headers to build $NEED_LIBXML2_DEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBKRB5DEV ]];then
-	if ! test -f /usr/include/krb5.h >/dev/null; then
-		echo >&2 You need krb5 headers to build $NEED_LIBKRB5DEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_CURLDEV ]];then
-	if ! test -f /usr/include/curl/curl.h >/dev/null; then
-		if ! test -f /usr/local/include/curl/curl.h >/dev/null; then
-			echo >&2 You need curl headers to build $NEED_CURLDEV
-			out=1
-		fi
-	fi
-fi
-
-if [[ -n $NEED_TIFFDEV ]];then
-	if ! test -f /usr/include/tiff.h >/dev/null; then
-		echo >&2 You need libtiff headers to build $NEED_TIFFDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_SDLDEV ]];then
-	if ! test -f /usr/include/SDL/SDL.h >/dev/null; then
-		echo >&2 You need libSDL headers to build $NEED_SDLDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_SDLIMAGEDEV ]];then
-	if ! test -f /usr/include/SDL/SDL_image.h >/dev/null; then
-		echo >&2 You need libSDL-image headers to build $NEED_SDLIMAGEDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_JPEGDEV ]];then
-	if ! test -f /usr/include/jpeglib.h >/dev/null; then
-		echo >&2 You need libjpeg headers to build $NEED_JPEGDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LZODEV ]];then
-	if ! test -f /usr/include/lzo/lzo1.h >/dev/null; then
-		echo >&2 You need liblzo headers to build $NEED_LZODEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBNLDEV ]];then
-	if ! test -f /usr/include/netlink/netlink.h >/dev/null; then
-		echo >&2 You need libnl headers to build $NEED_LIBNLDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_X11DEV ]];then
-	if ! test -f /usr/include/X11/Xlib.h >/dev/null; then
-		echo >&2 You need X11 headers to build $NEED_X11DEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_XEXTDEV ]];then
-	if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then
-		echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBSSLDEV ]]; then
-	if ! test -f /usr/include/openssl/ssl.h >/dev/null; then
-		echo >&2 You need openssl headers to build $NEED_LIBSSLDEV
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_GROFF ]]; then
 	if ! which groff >/dev/null 2>&1; then
 		echo >&2 You need groff to build $NEED_GROFF
@@ -204,24 +69,6 @@ if [[ -n $NEED_MKFONTDIR ]]; then
 	fi
 fi
 
-if [[ -n $NEED_WWW ]]; then
-	if ! which w3m >/dev/null 2>&1; then
-		if ! which lynx >/dev/null 2>&1; then
-			if ! which links >/dev/null 2>&1; then
-				echo >&2 You need w3m/links/lynx to build $NEED_WWW
-				out=1
-			fi
-		fi
-	fi
-fi
-
-if [[ -n $NEED_GXX ]]; then
-	if ! which g++ >/dev/null 2>&1; then
-		echo >&2 You need GNU c++ compiler to build $NEED_GXX
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_XKBCOMP ]]; then
 	if ! which xkbcomp >/dev/null 2>&1; then
 		echo >&2 You need xkbcomp to build $NEED_XKBCOMP
@@ -229,27 +76,6 @@ if [[ -n $NEED_XKBCOMP ]]; then
 	fi
 fi
 
-if [[ -n $NEED_RPM ]]; then
-	if ! which rpmbuild >/dev/null 2>&1; then
-		echo >&2 You need rpmbuild to to use $NEED_RPM package backend
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_XSLTPROC ]]; then
-	if ! which xsltproc >/dev/null 2>&1; then
-		echo >&2 You need xsltproc to build $NEED_XSLTPROC
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_DBUSGLIB ]]; then
-	if ! which dbus-binding-tool >/dev/null 2>&1; then
-		echo >&2 You need dbus-binding-tool to build $NEED_DBUSGLIB
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_JAVA ]]; then
 	if ! which java >/dev/null 2>&1; then
 		echo >&2 You need java to build $NEED_JAVA
-- 
cgit v1.2.3


From 76673934d3c65b7340089214d690aa996ced9239 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 4 Mar 2014 21:08:07 +0100
Subject: add g++ check

---
 scripts/scan-tools.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'scripts')

diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index af3223b0b..a7883cb24 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -201,6 +201,12 @@ if ! which xargs >/dev/null 2>&1; then
 	out=1
 fi
 
+if ! which g++ >/dev/null 2>&1; then
+	echo  "You need g++ (GNU C++ compiler) to continue."
+	echo
+	out=1
+fi
+
 cd $topdir
 rm -rf tmp
 
-- 
cgit v1.2.3


From 1e34c444c13235ee24867d96a796a047705695c1 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 10:17:28 +0100
Subject: fix wrong path, reported by George

---
 scripts/create.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/create.sh b/scripts/create.sh
index f5309f884..2d18cc64a 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -44,7 +44,7 @@ test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
 	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
 	cd build_mksh/mksh
 	bash Build.sh -r -c lto || bash Build.sh -r || exit 1
-	cp mksh "$TOPDIR"/bin
+	cp mksh "$TOPDIR"/host_$HOST/usr/bin
 	cd "$TOPDIR"
 	rm -rf build_mksh
 fi
-- 
cgit v1.2.3


From b563b8fd141c741932c110c2901fab555f5b22ef Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 6 Mar 2014 12:25:47 +0100
Subject: get rid of ADK_NATIVE mode, it is not regulary tested and the results
 where not satisfying.

---
 mk/build.mk                             | 42 ---------------------------------
 mk/kernel-vars.mk                       |  7 +++---
 mk/package.mk                           | 17 +++++--------
 mk/python.mk                            |  5 ----
 mk/vars.mk                              | 22 -----------------
 package/Makefile                        | 17 ++++---------
 package/MesaLib/Makefile                |  4 ----
 package/ant/Makefile                    |  2 --
 package/binutils/Makefile               |  4 ----
 package/busybox/Makefile                |  6 +----
 package/cdrtools/Makefile               |  2 --
 package/cmake/Makefile                  |  2 --
 package/ecj/Makefile                    |  2 --
 package/fastjar/Makefile                |  2 --
 package/firefox/Makefile                |  2 +-
 package/gcj/Makefile                    |  1 -
 package/jikes/Makefile                  |  2 --
 package/krb5/Makefile                   |  4 ----
 package/libc/Config.in.manual           |  6 -----
 package/libc/Makefile                   | 36 ----------------------------
 package/libgcc/Makefile                 |  2 --
 package/libpthread/Makefile             |  6 -----
 package/librt/Makefile                  |  6 -----
 package/libssh/Makefile                 |  2 +-
 package/libssp/Makefile                 |  6 -----
 package/libstdcxx/Makefile              |  4 ----
 package/libthread_db/Makefile           |  2 --
 package/nfs-utils/Makefile              |  5 ----
 package/p5-XML-Parser/Makefile          |  2 --
 package/pycurl/Makefile                 |  5 ----
 package/qemu/Makefile                   |  2 +-
 package/valgrind/Makefile               |  2 +-
 package/zlib/Makefile                   |  7 ++----
 scripts/update-sys                      | 11 ---------
 target/Makefile                         |  8 -------
 target/config/Config.in                 |  7 ------
 target/config/Config.in.arch.choice     | 10 --------
 target/linux/Config.in                  |  1 -
 target/linux/config/Config.in.audio     |  2 --
 target/linux/config/Config.in.block     |  3 ---
 target/linux/config/Config.in.graphics  |  7 +-----
 target/linux/config/Config.in.input     | 10 --------
 target/linux/config/Config.in.misc      |  4 +---
 target/linux/config/Config.in.netdevice |  1 -
 target/linux/config/Config.in.pm        | 13 ----------
 target/linux/config/Config.in.sched     |  1 -
 target/linux/config/Config.in.serial    |  9 -------
 target/linux/config/Config.in.usb       | 15 ------------
 target/x86/sys-available/intel-atom     | 29 -----------------------
 tools/adk/depmaker.c                    |  1 -
 50 files changed, 23 insertions(+), 345 deletions(-)
 delete mode 100644 package/libc/Config.in.manual
 delete mode 100644 package/libc/Makefile
 delete mode 100644 target/linux/config/Config.in.serial
 delete mode 100644 target/x86/sys-available/intel-atom

(limited to 'scripts')

diff --git a/mk/build.mk b/mk/build.mk
index 8efd7becc..3e324789b 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -149,9 +149,6 @@ world:
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
 	${BASH} ${TOPDIR}/scripts/update-pkg
-ifeq ($(ADK_NATIVE),y)
-	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
-else
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile
@@ -161,7 +158,6 @@ endif
 else
 	$(MAKE) -f mk/build.mk tools/install toolchain/fixup target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
-endif
 
 package_index:
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@@ -348,26 +344,6 @@ ifeq (${OStype},Darwin)
 endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
-endif
-ifeq ($(ADKtype),ibm-x40)
-	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
-	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
-ifeq ($(ADKtype),lemote-yeelong)
-	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
-	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/mips/sys-available/$(ADKtype) > \
-		target/mips/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/mips/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
 endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
@@ -438,24 +414,6 @@ ifeq (${OStype},Darwin)
 endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
-endif
-ifeq ($(ADKtype),ibm-x40)
-	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
-ifeq ($(ADKtype),lemote-yeelong)
-	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
 endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 0b3e7ddbb..3285e891d 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -1,13 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1
-ifneq ($(ADK_NATIVE),y)
-KERNEL_MAKE_OPTS+=	CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1 \
+			CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
 			CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
 			HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \
 			CONFIG_SHELL='${SHELL}'
-endif
+
 ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
 ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
 			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \
diff --git a/mk/package.mk b/mk/package.mk
index d5d48c1e1..8439d88eb 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -25,13 +25,12 @@ CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
-			${HOST_CONFIGURE_OPTS} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
 			ac_cv_func_realloc_0_nonnull=yes \
-			ac_cv_func_malloc_0_nonnull=yes
-ifeq ($(ADK_NATIVE),)
-CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} cross_compiling=yes
-endif
+			ac_cv_func_malloc_0_nonnull=yes \
+			cross_compiling=yes \
+			${HOST_CONFIGURE_OPTS} \
+			${TARGET_CONFIGURE_OPTS}
 
 CONFIGURE_PROG?=	configure
 MAKE_FILE?=		Makefile
@@ -57,12 +56,8 @@ MAKE_ENV+=		$(GCC_CHECK) \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
 			${HOST_CONFIGURE_OPTS} \
-			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
-ifeq ($(ADK_NATIVE),)
-MAKE_ENV+=		${TARGET_CONFIGURE_OPTS}
-else
-MAKE_ENV+=		M4=m4
-endif
+			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
+			${TARGET_CONFIGURE_OPTS}
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
 FAKE_FLAGS+=		${XAKE_FLAGS}
diff --git a/mk/python.mk b/mk/python.mk
index 1ef92e664..56008760a 100644
--- a/mk/python.mk
+++ b/mk/python.mk
@@ -1,8 +1,3 @@
 PYTHON_VERSION=2.7
-ifeq ($(ADK_NATIVE),)
 PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib
 PYTHON:=${STAGING_HOST_DIR}/usr/bin/python
-else
-PYTHON_LIBDIR:=/usr/lib
-PYTHON:=/usr/bin/python
-endif
diff --git a/mk/vars.mk b/mk/vars.mk
index 3798757bc..8f3022634 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,11 +18,6 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
-# use headers and foo-config from system
-ifeq ($(ADK_NATIVE),y)
-STAGING_TARGET_DIR:=
-SCRIPT_TARGET_DIR:=	/usr/bin
-else
 ifeq ($(ADK_TARGET_ABI),)
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
@@ -35,7 +30,6 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 endif
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
-endif
 STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
@@ -60,15 +54,9 @@ else
 GCC_CHECK:=
 endif
 
-ifeq ($(ADK_NATIVE),y) 
-TARGET_CROSS:=
-TARGET_COMPILER_PREFIX?=
-CONFIGURE_TRIPLE:=	
-else
 TARGET_CROSS:=		$(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)-
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
 CONFIGURE_TRIPLE:=	--build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
-endif
 
 ifneq ($(strip ${ADK_USE_CCACHE}),)
 TARGET_COMPILER_PREFIX=ccache ${TARGET_CROSS}
@@ -105,12 +93,6 @@ TARGET_LDFLAGS+=	-Wl,--secure-plt
 endif
 endif
 
-ifneq ($(ADK_NATIVE),)
-TARGET_CPPFLAGS:=
-TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
-TARGET_LDFLAGS:=
-endif
-
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
@@ -198,11 +180,7 @@ PKG_INSTALL:=		PKG_INSTROOT=$(TARGET_DIR) \
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/pkg
 endif
 
-ifeq ($(ADK_NATIVE),y)
-RSTRIP:=		prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh
-else
 RSTRIP:=		PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh
-endif
 
 STATCMD:=$(shell if stat -qs .>/dev/null 2>&1; then echo 'stat -f %z';else echo 'stat -c %s';fi)
 	
diff --git a/package/Makefile b/package/Makefile
index eb49efd6a..1b8cc97f3 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -9,26 +9,19 @@ ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
 gcc-compile: glibc-compile
 endif
+
 ifeq (${ADK_TARGET_LIB_MUSL},y)
 package-$(ADK_PACKAGE_MUSL) += musl
 gcc-compile: musl-compile
 endif
-ifeq (${ADK_NATIVE},y)
-package-$(ADK_PACKAGE_LIBC) += libc
-endif
-ifneq (${ADK_NATIVE},y)
-package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
-endif
 
-ifneq (${ADK_TARGET_LIB_GLIBC},y)
-ifneq (${ADK_TARGET_LIB_MUSL},y)
-ifneq (${ADK_NATIVE},y)
+ifeq (${ADK_TARGET_LIB_UCLIBC},y)
 package-$(ADK_PACKAGE_UCLIBC) += uclibc
-gcc-compile: uclibc-compile
-endif
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
+gcc-compile: uclibc-compile
 endif
-endif
+
+package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 
 include $(TOPDIR)/package/Depends.mk
 
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index e207dac9b..c6e1811a5 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -52,11 +52,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--with-dri-drivers=${DRI_DRIVERS},swrast
 CONFIGURE_ENV+=		MISSING="echo" \
 			PYTHON2=$(PYTHON)
-
 XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD}
-ifeq ($(ADK_NATIVE),y)
-XAKE_FLAGS+=		RANLIB=ranlib AR=ar
-endif
 
 mesalib-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
diff --git a/package/ant/Makefile b/package/ant/Makefile
index 5476596eb..625853bd8 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -14,8 +14,6 @@ PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
 WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index b6e6fb616..c23bac585 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -33,13 +33,9 @@ endif
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		-fPIC
-ifeq ($(ADK_NATIVE),)
 CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(GNU_TARGET_NAME) \
 			--target=$(GNU_TARGET_NAME)
-else
-CONFIGURE_ARGS+=	--disable-werror
-endif
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index d4184a37a..1fe63ff0a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -36,12 +36,8 @@ INSTALL_STYLE:=		manual
 
 BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
 			HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+			CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' \
 			-C ${WRKBUILD} 
-ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
-else
-BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
-endif
 
 do-configure:
 	# get all symbols from top level config
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 9483ad7b9..1b195fc3f 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		misc
 PKG_URL:=		http://cdrecord.berlios.de/private/cdrecord.html
 PKG_SITES:=		http://openadk.org/
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index e4d26b185..1079227f2 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 37a463eb1..92898307b 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		lang
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index e14c66076..0f4c1a50c 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -11,8 +11,6 @@ PKG_DESCR:=		fastjar utility
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index e4b69591d..1fb663e06 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -22,7 +22,7 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	arm x86 x86_64 native mips
+PKG_ARCH_DEPENDS:=	arm x86 x86_64 mips
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 PKG_SYSTEM_DEPENDS:=	tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi
 
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index be7059def..5ff8cc810 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -13,7 +13,6 @@ PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 
 DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
 
-PKG_ARCH_DEPENDS:=	native
 WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include $(TOPDIR)/mk/host.mk
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index 6f7649a49..7404fc123 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -13,8 +13,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 2af556c9e..692b7d630 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -31,10 +31,6 @@ PKGSS_KRB5_UTIL:=	libkrb5 libncurses libss libcom-err
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-signed.tar
 WRKSRC=			${WRKDIST}/src
 
-ifeq ($(ADK_NATIVE),y)
-NM:=nm
-endif
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libc/Config.in.manual b/package/libc/Config.in.manual
deleted file mode 100644
index ae74da26d..000000000
--- a/package/libc/Config.in.manual
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBC
-	boolean
-	depends on ADK_NATIVE
-	default y if ADK_NATIVE
-	help 
-	 Native C library from host system.
diff --git a/package/libc/Makefile b/package/libc/Makefile
deleted file mode 100644
index 9b85b82bc..000000000
--- a/package/libc/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		libc
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		2
-PKG_SECTION:=		base
-PKG_DESCR:=		native C library
-
-NO_DISTFILES:=		1
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-# do nothing, use native c library
-do-install:
-	${INSTALL_DIR} $(IDIR_LIBC)/lib
-	$(CP) /lib/libgcc_s.so* $(IDIR_LIBC)/lib/
-	$(CP) /lib/ld*-*.so* $(IDIR_LIBC)/lib/
-	if test -f /lib/libuClibc-*.so; then $(CP) /lib/libuClibc-*.so \
-		$(IDIR_LIBC)/lib/;fi
-	-for file in libc libpthread libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
-		$(CP) /lib/$$file.so.* $(IDIR_LIBC)/lib/; \
-		$(CP) /lib/$$file-*.so $(IDIR_LIBC)/lib/; \
-	done
-	# create ld.so link for ldd
-	cd $(IDIR_LIBC)/lib && ln -sf ld-linux.so.2 ld.so
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 28f277f8d..20f7f60f9 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -19,7 +19,6 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_LINUX_SH),y)
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
@@ -30,6 +29,5 @@ endif
 else
 	${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index f6f9e5f5f..cdb84d5fe 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -12,10 +12,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-endif
 
 PKG_NAME:=		libpthread
 PKG_DESCR:=		POSIX threading library
@@ -37,11 +33,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 libpthread-install:
-ifeq ($(ADK_NATIVE),)
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/librt/Makefile b/package/librt/Makefile
index d056bc203..cf646672f 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -9,10 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-endif
 
 PKG_NAME:=		librt
 PKG_DESCR:=		Realtime library
@@ -34,11 +30,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 librt-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 997e78895..6a49c346a 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
 PKG_DESCR:=		SSH library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl zlib
-PKG_BUILDDEP:=		openssl zlib
+PKG_BUILDDEP:=		cmake-host openssl zlib
 PKG_URL:=		http://www.libssh.org/
 PKG_SITES:=		http://www.libssh.org/files/0.5/
 PKG_OPTS:=		dev
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index a5a4a2dc7..def4443e8 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -9,10 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-endif
 
 PKG_NAME:=		libssp
 PKG_DESCR:=		Stack smashing protection library
@@ -34,9 +30,7 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 libssp-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libssp.so* ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 7fc3503f8..84f0a7aec 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -28,11 +28,7 @@ INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-ifeq ($(ADK_NATIVE),y)
-	$(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib
-else
 	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index ed92676a3..a2e14cd10 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -32,11 +32,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 694c9d7ae..59a71d6ed 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -40,13 +40,8 @@ $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${P
 $(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION}))
 $(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION}))
 
-ifeq ($(ADK_NATIVE),)
 KRB5INC:=		${STAGING_TARGET_DIR}/usr
 TIRPCINC:=		${STAGING_TARGET_DIR}/usr/include/tirpc
-else
-KRB5INC:=		/usr
-TIRPCINC:=		/usr/include/tirpc
-endif
 
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile
index 19ad06ab0..13406fb9e 100644
--- a/package/p5-XML-Parser/Makefile
+++ b/package/p5-XML-Parser/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:=		http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
 DISTFILES:=             XML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/XML-Parser-${PKG_VERSION}
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,P5_XML_PARSER,p5-xml-parser,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/pycurl/Makefile b/package/pycurl/Makefile
index 05dcb49d8..899bb3ddb 100644
--- a/package/pycurl/Makefile
+++ b/package/pycurl/Makefile
@@ -24,13 +24,8 @@ INSTALL_STYLE:=		manual
 
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 TARGET_CFLAGS+=		-fPIC
-ifeq ($(ADK_NATIVE),)
 MAKE_ENV+=		LDSHARED="$(TARGET_CC) -shared"
 CURL_CONFIG:=		$(STAGING_DIR)/usr/bin/curl-config
-else
-MAKE_ENV+=		CC="$(CC)" LDSHARED="$(CC) -shared"
-CURL_CONFIG:=		/usr/bin/curl-config
-endif
 
 include $(TOPDIR)/mk/python.mk
 
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index b03a3ca59..4c2067ac9 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:=		http://wiki.qemu.org/download/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-PKG_ARCH_DEPENDS:=	native x86 x86_64
+PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index d0337d8f5..025db9dac 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://valgrind.org/
 PKG_SITES:=		http://valgrind.org/downloads/
 
-PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 native
+PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 1d1c0d57c..6fe11ae3d 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -26,10 +26,6 @@ $(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 CONFIG_STYLE:=		manual
 CONFIGURE_ENV+=		uname=Linux
 
-ifeq ($(ADK_NATIVE),)
-COPTS:=                 $(TARGET_CONFIGURE_OPTS)
-endif
-
 ifeq ($(ADK_STATIC),)
 CONFIGURE_OPTS:=	--shared
 endif
@@ -37,8 +33,9 @@ endif
 ALL_TARGET:=		libz.a libz.so.$(PKG_VERSION)
 
 do-configure:
-	(cd $(WRKBUILD); $(COPTS) \
+	(cd $(WRKBUILD); \
 		uname="Linux" \
+		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 		CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \
 		LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib" \
diff --git a/scripts/update-sys b/scripts/update-sys
index 6c82dc626..47b73d52b 100755
--- a/scripts/update-sys
+++ b/scripts/update-sys
@@ -14,15 +14,6 @@ defaults() {
 	exit 0
 }
 
-check_native() {
-	native=$(grep ^ADK_LINUX_NATIVE $topdir/.config)
-	if [ ! -z "$native" ];then
-		exit 0
-	fi
-}
-
-touch $topdir/target/config/Config.in.native
-
 for i in $(ls $topdir/target/);do
 	if [ -d "$topdir/target/$i/sys-enabled" ];then
 		cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null
@@ -30,8 +21,6 @@ for i in $(ls $topdir/target/);do
 done
 if [ -f $topdir/.config ];then
 
-check_native
-
 arch=$(grep ^ADK_TARGET_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g')
 cpuarch=$(grep ^ADK_TARGET_CPU_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g')
 systemsym=$(grep ^ADK_TARGET_SYSTEM_ $topdir/.config|cut -f 1 -d =) 
diff --git a/target/Makefile b/target/Makefile
index 562d2b86b..fc3fd77f6 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -52,13 +52,6 @@ config-prepare: $(TOPDIR)/.config
 	    >${BUILD_DIR}/.kernelconfig.kernel
 	@sed -n '/^# ADK_KERNEL/s//# CONFIG/p' ${TOPDIR}/.config \
 	    >${BUILD_DIR}/.kernelconfig.nokernel
-ifeq ($(ADK_NATIVE),y)
-	@if [ -f /etc/adktarget ];then \
-		cp $(TOPDIR)/target/$(ARCH)/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
-	else \
-	if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \
-	fi
-else
 ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
 	@if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \
 		cat ${TOPDIR}/target/linux/kernel.config \
@@ -73,7 +66,6 @@ else
 	else \
 		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
 	fi
-endif
 endif
 	@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
 	    while IFS='=' read symbol value; do \
diff --git a/target/config/Config.in b/target/config/Config.in
index be008f97e..0eab0aecf 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -336,10 +336,6 @@ config ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP
 
 endchoice
 
-if ADK_LINUX_NATIVE
-source "target/config/Config.in.native"
-endif
-
 # hardware features
 config ADK_TARGET_WITH_USB
 	boolean
@@ -432,9 +428,6 @@ config ADK_HARDWARE_QEMU
 config ADK_HARDWARE_VBOX
 	boolean
 
-config ADK_NATIVE
-	boolean
-
 # the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
 # allows for selecting it off (i.e., to disable it)
 config ADK_TARGET_FIXED_KERNEL
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
index a147a0251..c2fc7f2f3 100644
--- a/target/config/Config.in.arch.choice
+++ b/target/config/Config.in.arch.choice
@@ -4,16 +4,6 @@ prompt "Target architecture"
 config ADK_CHOOSE_TARGET_ARCH
 	bool "Choose target architecture"
 
-config ADK_LINUX_NATIVE
-	bool "native build"
-	select ADK_native
-	select ADK_NATIVE
-	select ADK_TARGET_LIB_LIBC
-	depends on ADK_HOST_LINUX
-	help
-	  Make a native build. Use host tools.
-	  No toolchain will be created.
-
 config ADK_LINUX_ARM
 	bool "arm system"
 	select ADK_arm
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 739e2008c..9c1c04b85 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -19,7 +19,6 @@ source target/linux/config/Config.in.misc
 source target/linux/config/Config.in.mips
 source target/linux/config/Config.in.lib
 source target/linux/config/Config.in.pm
-source target/linux/config/Config.in.serial
 source target/linux/config/Config.in.spi
 source target/linux/config/Config.in.kvm
 source target/linux/config/Config.in.debug
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index dc2ff100f..76c353f0c 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -60,7 +60,6 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL
 	select ADK_KERNEL_SND_PCM_OSS
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default n
 	help
 	 ALSA OSS Emulation
@@ -71,7 +70,6 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	select ADK_KPACKAGE_KMOD_SND
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default n
 	depends on ADK_TARGET_WITH_PCI
 	help
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 057556afd..9297031c2 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -177,7 +177,6 @@ config ADK_KERNEL_SATA_AHCI
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on ADK_TARGET_WITH_SATA
-	default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default n	
 
@@ -191,8 +190,6 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
 	select ADK_KERNEL_BLK_DEV_SD
 	depends on !ADK_KERNEL_SATA_AHCI
 	depends on ADK_TARGET_WITH_SATA
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default n
 	help
 	  Enables support for AHCI Serial ATA.
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 477541478..dc748e6c0 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -2,16 +2,12 @@ config ADK_KERNEL_VT
 	boolean
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default n
 
 config ADK_KERNEL_VT_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_TARGET_WITH_VGA
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default n
 
 config ADK_KERNEL_VGA_CONSOLE
@@ -143,9 +139,8 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915
 	select ADK_KERNEL_DRM_I915_KMS
 	select ADK_KERNEL_DRM_I915
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default n
-	depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_INTEL_ATOM || ADK_NATIVE_SYSTEM_INTEL_ATOM
+	depends on ADK_TARGET_SYSTEM_IBM_X40
 	help
           AGP/DRM/KMS support for Intel chipset i915.
 	
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 939354881..17c23b65c 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -4,9 +4,7 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -61,9 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -73,9 +69,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default n
 
 config ADK_KERNEL_INPUT_MOUSE
@@ -84,9 +78,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
@@ -96,9 +88,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index ea9bc5e5a..64eb8d38b 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -57,11 +57,9 @@ config ADK_KERNEL_RTC_DRV_CMOS
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
  	default n
-	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_LEMOTE_YEELONG || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
+	depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
  	help
 	 PC CMOS RTC support.
 	
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 001ecfd33..789b75b7d 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -357,7 +357,6 @@ config ADK_KPACKAGE_KMOD_ATH5K
 	select ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_FON_FON2100
 	default n
 	help
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
index d93c820cc..deff5b3f6 100644
--- a/target/linux/config/Config.in.pm
+++ b/target/linux/config/Config.in.pm
@@ -36,12 +36,7 @@ config ADK_HARDWARE_ACPI
 	select ADK_KERNEL_ACPI_BUTTON
 	select ADK_KERNEL_ACPI_FAN
 	select ADK_KERNEL_ACPI_DOCK
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default n
 	help
 	 Enable ACPI support.
@@ -50,12 +45,8 @@ config ADK_KERNEL_SUSPEND
 	prompt "Enable Suspend-to-RAM support"
 	boolean
 	select ADK_KERNEL_PM
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
 	  Enable Suspend-to-RAM support.
@@ -66,12 +57,8 @@ config ADK_KERNEL_HIBERNATION
 	select ADK_KERNEL_PM
 	select ADK_KERNEL_SWAP
 	select BUSYBOX_SWAPONOFF
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
 	  Enable Suspend-to-Disk support.
diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched
index 7cea06102..2e749a5fb 100644
--- a/target/linux/config/Config.in.sched
+++ b/target/linux/config/Config.in.sched
@@ -17,7 +17,6 @@ config ADK_KERNEL_NET_ESTIMATOR
 	default n
 
 config ADK_KERNEL_NET_SCHED
-	#prompt "kmod-net-sched.................... QoS and/or fair queueing support"
 	boolean
 	default n
 	help
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
deleted file mode 100644
index 6ba3d4872..000000000
--- a/target/linux/config/Config.in.serial
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_KERNEL_SERIAL_PXA
-	boolean
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-
-config ADK_KERNEL_SERIAL_PXA_CONSOLE
-	boolean
-	default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
-	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index e1fd3c0c3..b2c750673 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -41,12 +41,7 @@ config ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
@@ -88,9 +83,6 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
@@ -114,8 +106,6 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
 	default n
@@ -179,12 +169,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	default y if ADK_TARGET_SYSTEM_INTEL_ATOM
-	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_NATIVE_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_TAROX_PC
-	default y if ADK_NATIVE_SYSTEM_TAROX_PC
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default n
 	help
diff --git a/target/x86/sys-available/intel-atom b/target/x86/sys-available/intel-atom
deleted file mode 100644
index 86bc85cd1..000000000
--- a/target/x86/sys-available/intel-atom
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_TARGET_SYSTEM_INTEL_ATOM
-	bool "Intel Atom (NM10)"
-	depends on ADK_BROKEN
-	select ADK_x86
-	select ADK_intel_atom
-	select ADK_CPU_ATOM
-	select ADK_KERNEL_MATOM
-	select ADK_KERNEL_MII
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSSE3
-	select ADK_TARGET_CPU_WITH_HT
-	select ADK_TARGET_CPU_WITH_MTRR
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_CF
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_ACPI
-	select ADK_TARGET_WITH_SATA
-	help
-         System profile for Intel Atom.
-
diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c
index 572baa392..e5028003b 100644
--- a/tools/adk/depmaker.c
+++ b/tools/adk/depmaker.c
@@ -166,7 +166,6 @@ int main() {
 			
 			/* exclude manual maintained packages from package/Makefile */
 			if (
-				!(strncmp(pkgdirp->d_name, "libc", 4) == 0 && strlen(pkgdirp->d_name) == 4) &&
 				!(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) &&
 				!(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) &&
 				!(strncmp(pkgdirp->d_name, "uclibc", 6) == 0) &&
-- 
cgit v1.2.3


From 35137e6c091fcb33147ad58d52140659a63affdc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 09:57:47 +0100
Subject: add ccache to host tools

---
 scripts/scan-pkgs.sh          |  7 -------
 target/config/Config.in.adk   |  1 +
 target/config/Config.in.tools |  4 ++++
 tools/Makefile                |  3 +++
 tools/ccache/Makefile         | 25 +++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 tools/ccache/Makefile

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 5563dcca2..8af04795b 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -83,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then
 	fi
 fi
 
-if [[ -n $ADK_USE_CCACHE ]]; then
-        if ! which ccache >/dev/null 2>&1; then
-                echo >&2 You have selected to build with ccache, but ccache could not be found.
-                out=1
-        fi
-fi
-
 exit $out
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index c8f820321..46de14044 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -46,6 +46,7 @@ config ADK_WGET_TIMEOUT
 
 config ADK_USE_CCACHE
 	bool "Use ccache to speedup recompilation"
+	select ADK_HOST_NEED_CCACHE
 	default n
 	help
 	  Useful if you have enough space for the cache and need speedup compilation.
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index d863179b8..c4dcdace4 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -34,6 +34,10 @@ config ADK_HOST_NEED_XZ
 	boolean
 	default n
 
+config ADK_HOST_NEED_CCACHE
+	boolean
+	default n
+
 config ADK_TOOLS_ADDPATTERN_ARGS
 	string
 	default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G
diff --git a/tools/Makefile b/tools/Makefile
index 2d29372dc..a8156cb79 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,6 +29,9 @@ endif
 ifeq ($(ADK_HOST_NEED_LZMA),y)
 TARGETS+=lzma
 endif
+ifeq ($(ADK_HOST_NEED_CCACHE),y)
+TARGETS+=ccache
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
new file mode 100644
index 000000000..fde838067
--- /dev/null
+++ b/tools/ccache/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ccache
+PKG_VERSION:=		3.1.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
+PKG_SITES:=		http://samba.org/ftp/ccache/
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/ccache
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure --prefix=$(STAGING_HOST_DIR)/usr)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/ccache: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/ccache \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From 5101b72fac2c9a6971a0c7d2fe6bbd318e9678ab Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 7 Mar 2014 10:55:50 +0100
Subject: use mksh in tools, too

---
 package/mksh/Makefile |  2 ++
 scripts/create.sh     | 15 +--------------
 tools/Makefile        |  2 +-
 tools/mksh/Makefile   | 30 ++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 tools/mksh/Makefile

(limited to 'scripts')

diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 159a3efda..c40d9d807 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org/
 PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
 
+PKG_DFLT_MKSH:=		y if !ADK_TOOLCHAIN_ONLY
+
 DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
diff --git a/scripts/create.sh b/scripts/create.sh
index 2d18cc64a..505549247 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -2,7 +2,7 @@
 #-
 # Copyright © 2010, 2011, 2012
 #	Thorsten Glaser <tg@mirbsd.org>
-# Copyright © 2010, 2011
+# Copyright © 2010-2014
 #	Waldemar Brodkorb <wbx@openadk.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -36,19 +36,6 @@ case :$PATH: in
 (*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;;
 esac
 
-test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
-	make package=mksh fetch || exit 1
-	df=mksh-R48b.tgz
-	rm -rf build_mksh
-	mkdir -p build_mksh
-	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
-	cd build_mksh/mksh
-	bash Build.sh -r -c lto || bash Build.sh -r || exit 1
-	cp mksh "$TOPDIR"/host_$HOST/usr/bin
-	cd "$TOPDIR"
-	rm -rf build_mksh
-fi
-
 test -n "$KSH_VERSION" || exec mksh "$me" "$@"
 if test -z "$KSH_VERSION"; then
 	echo >&2 Fatal error: could not run myself with mksh!
diff --git a/tools/Makefile b/tools/Makefile
index a8156cb79..cdbf2b4f1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio m4 flex bc bzip2 xz
+TARGETS:=adk mksh mkcrypt cpio m4 flex bc bzip2 xz
 
 ifeq ($(ADK_HOST_NEED_GENEXT2FS),y)
 TARGETS+=genext2fs
diff --git a/tools/mksh/Makefile b/tools/mksh/Makefile
new file mode 100644
index 000000000..8cb7c29b7
--- /dev/null
+++ b/tools/mksh/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		mksh
+PKG_VERSION:=		49
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e8c205cac72c3dc8540bbc3897421422
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+
+DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/mksh
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
+	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	    HAVE_CAN_FSTACKPROTECTORALL=0 \
+	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/mksh: $(WRKBUILD)/.compiled
+	${INSTALL_BIN} ${WRKBUILD}/mksh \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3