From 3cabc6cce153ee1265c477d840fe3887347053ae Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 2 Mar 2010 22:43:21 +0100
Subject: target/romfs: cleanup

Remove the code needed to build host genromfs, since it can now be
done using package/genromfs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 target/romfs/Config.in |  1 -
 target/romfs/romfs.mk  | 42 ++----------------------------------------
 2 files changed, 2 insertions(+), 41 deletions(-)

(limited to 'target')

diff --git a/target/romfs/Config.in b/target/romfs/Config.in
index 03a23d413..7a8c663dd 100644
--- a/target/romfs/Config.in
+++ b/target/romfs/Config.in
@@ -1,6 +1,5 @@
 config BR2_TARGET_ROOTFS_ROMFS
 	bool "romfs root filesystem"
-	select BR2_HOST_FAKEROOT
 	help
 	  Build a romfs image of the root filesystem.
 
diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk
index 6e7fbeedd..e4b8ff58b 100644
--- a/target/romfs/romfs.mk
+++ b/target/romfs/romfs.mk
@@ -1,33 +1,3 @@
-#############################################################
-#
-# genromfs to build to target romfs filesystems
-#
-#############################################################
-ROMFS_VERSION=0.5.2
-ROMFS_DIR=$(BUILD_DIR)/genromfs-$(ROMFS_VERSION)
-ROMFS_SOURCE=genromfs-$(ROMFS_VERSION).tar.gz
-ROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs
-
-$(DL_DIR)/$(ROMFS_SOURCE):
-	 $(call DOWNLOAD,$(ROMFS_SITE),$(ROMFS_SOURCE))
-
-$(ROMFS_DIR): $(DL_DIR)/$(ROMFS_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(ROMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-
-$(ROMFS_DIR)/genromfs: $(ROMFS_DIR)
-	$(MAKE) -C $(ROMFS_DIR)
-	touch -c $@
-
-romfs: $(ROMFS_DIR)/genromfs
-
-romfs-source: $(DL_DIR)/$(ROMFS_SOURCE)
-
-romfs-clean:
-	-$(MAKE) -C $(ROMFS_DIR) clean
-
-romfs-dirclean:
-	rm -rf $(ROMFS_DIR)
-
 #############################################################
 #
 # Build the romfs root filesystem image
@@ -36,7 +6,7 @@ romfs-dirclean:
 
 ROMFS_TARGET=$(IMAGE).romfs
 
-romfsroot: host-fakeroot makedevs romfs
+romfsroot: host-fakeroot host-genromfs makedevs
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
 	touch $(BUILD_DIR)/.fakeroot.00000
@@ -48,19 +18,11 @@ ifneq ($(TARGET_DEVICE_TABLE),)
 		>> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
 endif
 	# Use fakeroot so genromfs believes the previous fakery
-	echo "$(ROMFS_DIR)/genromfs -d $(TARGET_DIR) -f $(ROMFS_TARGET)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
+	echo "$(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $(ROMFS_TARGET)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
 	chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
 	$(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
 	-@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET))
 
-romfsroot-source: romfs-source
-
-romfsroot-clean:
-	-$(MAKE) -C $(ROMFS_DIR) clean
-
-romfsroot-dirclean:
-	rm -rf $(ROMFS_DIR)
-
 #############################################################
 #
 # Toplevel Makefile options
-- 
cgit v1.2.3