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

Wolfgang Grandegger wg at grandegger.com
Fri Apr 16 14:03:54 CEST 2010


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

Signed-off-by: Wolfgang Grandegger <wg at denx.de>
---

This patch now apples properly to the HEAD.

 Makefile |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 9b468b3..26dbbeb 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,8 @@ 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_COPY := $(STATUS_DIR)/stamp.custom-copy
 
 noconfig_targets := menuconfig config oldconfig randconfig \
 	defconfig allyesconfig allnoconfig release tags
@@ -191,17 +191,17 @@ $(STAMP_ELDK_PKGS):	$(STAMP_RFSB_SKEL)
 	@touch $(STAMP_ELDK_PKGS)
 
 
-$(STAMP_LIBS): $(STAMP_ELDK_PKGS) $(STAMP_CUSTOM_PKGS)
-	@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)
+$(STAMP_CUSTOM_COPY):
 	@if [ -d custom/rootfs ]; then \
 	    echo "Copying files from custom/rootfs" ;\
 	    ( cd custom/rootfs ; find . | cpio -Bpdum $(BUILD_RFS) ) ;\
 	fi
+	@touch $(STAMP_CUSTOM_COPY)
+
+$(STAMP_ROOTFS):	$(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) )
 	date > $(BUILD_RFS)/etc/build-date
 	@touch $(STAMP_ROOTFS)
 
-- 
1.6.2.5



More information about the eldk mailing list