From 15c95156cc3de045d78ff58bd0ca926eb5acdcd7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 17:51:23 +0100
Subject: fix when overwrite via extra dir

---
 mk/image.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mk/image.mk')

diff --git a/mk/image.mk b/mk/image.mk
index 1e7a802a5..9de733ef8 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -34,6 +34,9 @@ imageprepare: image-prepare-post extra-install
 # if an extra directory exist in TOPDIR, copy all content over the 
 # root directory, do the same if make extra=/dir/to/extra is used
 extra-install:
+	@-if [ -h ${TARGET_DIR}/etc/resolv.conf -a -f $(TOPDIR)/extra/etc/resolv.conf ];then \
+		rm ${TARGET_DIR}/etc/resolv.conf;\
+	fi
 	@if [ -d $(TOPDIR)/extra ];then $(CP) $(TOPDIR)/extra/* ${TARGET_DIR};fi
 	@if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi
 
-- 
cgit v1.2.3


From 46af98aa4327633d1509d728b3b85e0a4da39c9b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 25 Mar 2014 12:05:56 +0100
Subject: add support for x86_64 toolchain with 32 bit abi

---
 mk/image.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mk/image.mk')

diff --git a/mk/image.mk b/mk/image.mk
index 1e7a802a5..b607249cd 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -51,6 +51,7 @@ image-prepare-post:
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
+ifeq ($(ADK_TARGET_ABI_32),)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
@@ -60,6 +61,7 @@ ifeq ($(ADK_LINUX_X86_64),y)
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
+endif
 ifeq ($(ADK_LINUX_PPC64),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
-- 
cgit v1.2.3