From 7d0023fbd2f86808e39e8ca8ee9cd58c52b76150 Mon Sep 17 00:00:00 2001
From: PaulK <contact@paulk.fr>
Date: Sat, 7 Apr 2012 16:00:20 +0200
Subject: Fixed initramfs-related instructions while building boot and recovery
 images

---
 bootimg.mk | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/bootimg.mk b/bootimg.mk
index c5ffd74..e88001e 100644
--- a/bootimg.mk
+++ b/bootimg.mk
@@ -5,15 +5,31 @@ LOCAL_PATH := $(call my-dir)
 INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
 INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
 INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
+recovery_kernel := $(PRODUCT_OUT)/kernel-recovery
 
 .NOTPARALLEL: $(INSTALLED_BOOTIMAGE_TARGET)
 .NOTPARALLEL: $(INSTALLED_RECOVERYIMAGE_TARGET)
 
-$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_RAMDISK_TARGET) $(INSTALLED_KERNEL_TARGET)
+.PHONY: recovery_kernel_config
+recovery_kernel_config:
+#	$(hide) ln -fs $(CURDIR)/$(TARGET_RECOVERY_ROOT_OUT) $(KBUILD_OUTPUT)/initramfs
+	$(hide) rm -rf $(KBUILD_OUTPUT)/initramfs
+	$(hide) cp -r $(CURDIR)/$(TARGET_RECOVERY_ROOT_OUT) $(KBUILD_OUTPUT)/initramfs
+
+.PHONY: kernel_config
+kernel_config:
+#	$(hide) ln -fs $(CURDIR)/$(TARGET_ROOT_OUT) $(KBUILD_OUTPUT)/initramfs
+	$(hide) rm -rf $(KBUILD_OUTPUT)/initramfs
+	$(hide) cp -r $(CURDIR)/$(TARGET_ROOT_OUT) $(KBUILD_OUTPUT)/initramfs
+
+$(recovery_kernel): _zimage
+	@echo "**** RECOVERY KERNEL BUILT ****"
+	$(hide) $(ACP) -fp $(BUILT_KERNEL_TARGET) $@
+
+$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_RAMDISK_TARGET) kernel_config $(INSTALLED_KERNEL_TARGET)
 	$(call pretty,"Boot image: $@")
 	$(ACP) $(PRODUCT_OUT)/kernel $@
 
-$(INSTALLED_RECOVERYIMAGE_TARGET): $(recovery_ramdisk) $(recovery_kernel) $(PRODUCT_OUT)/utilities/busybox $(PRODUCT_OUT)/utilities/mke2fs
+$(INSTALLED_RECOVERYIMAGE_TARGET): $(recovery_ramdisk) recovery_kernel_config $(recovery_kernel) $(PRODUCT_OUT)/utilities/busybox $(PRODUCT_OUT)/utilities/mke2fs
+	$(call pretty,"Recovery image: $@")
 	$(ACP) $(PRODUCT_OUT)/kernel-recovery $@
-
-include $(BUILD_SYSTEM)/kernel.mk
-- 
cgit v1.1