[ELDK] [PATCH RFSB] Makefile: add dependency libraries after copying the custom rootfs

Wolfgang Grandegger wg at grandegger.com
Thu Apr 15 21:37:36 CEST 2010


So far, binaries in "custom/rootfs" are not searched for missing
libraries. 

Signed-off-by: Wolfgang Grandegger <wg at denx.de>
---
 Makefile |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ea6f131..0025fcd 100644
--- a/Makefile
+++ b/Makefile
@@ -37,12 +37,13 @@ CRAMFS_FILE       := $(BUILD)/images/image.cramfs
 MKDEV_SCRIPT      := /tmp/mkdev.rfsb.tmp
 STATUS_DIR        := status
 STAMP_POPULATE    := $(STATUS_DIR)/stamp.populate
-STAMP_RFSB_SKEL    := $(STATUS_DIR)/stamp.rfsb-skel
+STAMP_RFSB_SKEL   := $(STATUS_DIR)/stamp.rfsb-skel
 STAMP_CHROOT      := $(STATUS_DIR)/stamp.chroot
 STAMP_ELDK_PKGS   := $(STATUS_DIR)/stamp.eldk-pkgs
 STAMP_CUSTOM_PKGS := $(STATUS_DIR)/stamp.custom-pkgs
 STAMP_LIBS        := $(STATUS_DIR)/stamp.libs
 STAMP_ROOTFS      := $(STATUS_DIR)/stamp.rootfs
+STAMP_CUSTOM_RFS  := $(STATUS_DIR)/stamp.custom_rfs
 
 noconfig_targets := menuconfig config oldconfig randconfig \
 	defconfig allyesconfig allnoconfig release tags
@@ -189,17 +190,20 @@ $(STAMP_ELDK_PKGS):	$(STAMP_RFSB_SKEL)
 	@touch $(STAMP_ELDK_PKGS)
 
 
-$(STAMP_LIBS): $(STAMP_ELDK_PKGS) $(STAMP_CUSTOM_PKGS)
+$(STAMP_CUSTOM_RFS):
+	@if [ -d custom/rootfs ]; then \
+	    echo "Copying files from custom/rootfs" ;\
+	    ( cd custom/rootfs ; find . | cpio -Bpdum $(BUILD_RFS) ) ;\
+	fi
+	@touch $(STAMP_CUSTOM_RFS)
+
+$(STAMP_LIBS):	$(STAMP_ELDK_PKGS) $(STAMP_CUSTOM_PKGS) $(STAMP_CUSTOM_RFS)
 	@echo "Adding dependency libraries"
 	@scripts/list-deps -l "$(shell echo $(extra_libs) | sed 's/ /,/g')"  $(BUILD_RFS) | sed -e "s!$(ELDK_ROOTFS)\/!!" | \
 	    ( cd $(ELDK_ROOTFS) ; cpio -Bpdum $(BUILD_RFS) )
 	@touch $(STAMP_LIBS)
 
 $(STAMP_ROOTFS):	$(STAMP_LIBS)
-	@if [ -d custom/rootfs ]; then \
-	    echo "Copying files from custom/rootfs" ;\
-	    ( cd custom/rootfs ; find . | cpio -Bpdum $(BUILD_RFS) ) ;\
-	fi
 	@touch $(STAMP_ROOTFS)
 
 $(STAMP_CHROOT):	$(STAMP_ROOTFS)
-- 
1.6.2.5



More information about the eldk mailing list