From a1f303c316be60e5a282a6a6a27726152b529a51 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Tue, 24 Feb 2015 12:46:47 +0100
Subject: extend KERNEL_MAKE_OPTS by the target directory

This change is straightforward but in toolchain/kernel-headers/Makefile
which seems to be called before ${BUILD_DIR}/linux symlink exists.
Therefore define LINUX_DIR to the correct value in between inclusion of
vars.mk (through rules.mk) and kernel-vars.mk.
---
 mk/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/image.mk')

diff --git a/mk/image.mk b/mk/image.mk
index bd7d66f96..1563c2a63 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -203,7 +203,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
-	env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \
+	env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \
 		-j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 	@cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL)
 
-- 
cgit v1.2.3


From b35d9328163f84e2d7dc6f2504c5e7c3fffc92dd Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Tue, 24 Feb 2015 12:46:49 +0100
Subject: toolchain: add cross prelinking tool from yoctoproject and hook it
 into build system

---
 mk/image.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'mk/image.mk')

diff --git a/mk/image.mk b/mk/image.mk
index 1563c2a63..7d982d773 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -37,7 +37,7 @@ else
 $(error No login shell configured!)
 endif
 
-imageprepare: image-prepare-post extra-install
+imageprepare: image-prepare-post extra-install prelink
 
 # if an extra directory exist in ADK_TOPDIR, copy all content over the 
 # root directory, do the same if make extra=/dir/to/extra is used
@@ -79,6 +79,19 @@ ifneq ($(ADK_TARGET_ARCH_AARCH64)$(ADK_TARGET_ARCH_X86_64)$(ADK_TARGET_ARCH_PPC6
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
 
+ifeq (${ADK_PRELINK},)
+prelink:
+else
+${TARGET_DIR}/etc/prelink.conf:
+	echo '/' > $@
+
+prelink: ${TARGET_DIR}/etc/prelink.conf
+	$(TRACE) target/prelink
+	${TARGET_CROSS}prelink ${ADK_PRELINK_OPTS} \
+		--ld-library-path=${STAGING_TARGET_DIR}/usr/lib:${STAGING_TARGET_DIR}/lib \
+		--root=${TARGET_DIR} -a $(MAKE_TRACE)
+endif
+
 KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
 KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(ADK_TARGET_CPU_ARCH).$(PKG_SUFFIX)
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
-- 
cgit v1.2.3