summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-11-19 14:01:13 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-19 14:04:49 (GMT)
commit0a0cb991b715ecc490b77533d49d24424b9d11a2 (patch)
treec7c90beb0b1e8658e2d3a7bcc898f9a35adb4dd5
parentc7af389523ba4134ba88c2e4481a56dab84d3594 (diff)
downloadbuildroot-0a0cb991b715ecc490b77533d49d24424b9d11a2.tar.gz
buildroot-0a0cb991b715ecc490b77533d49d24424b9d11a2.tar.bz2
fs: rename make targets to match package/ convention
Use rootfs-* rather than *-root, to match the convention used under package/ and which fits with the ROOTFS_*_ variables. This will also help with the host dependencies. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--fs/common.mk6
-rw-r--r--fs/iso9660/iso9660.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/common.mk b/fs/common.mk
index 74e9ce0..f9dabab 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -61,13 +61,13 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
$(LZMA) -9 -c $$@ > $$@.lzma
endif
-$(1)-root-show-depends:
+rootfs-$(1)-show-depends:
@echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
-$(1)-root: $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
+rootfs-$(1): $(BINARIES_DIR)/rootfs.$(1) $(ROOTFS_$(2)_POST_TARGETS)
ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
-TARGETS += $(1)-root
+TARGETS += rootfs-$(1)
endif
endef
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 6f60893..2a5288c 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y)
ISO9660_OPTS+=-U
endif
-$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub
+$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 rootfs-ext2 grub
@$(call MESSAGE,"Generating root filesystem image rootfs.iso9660")
mkdir -p $(ISO9660_TARGET_DIR)
mkdir -p $(ISO9660_TARGET_DIR)/boot/grub
@@ -37,7 +37,7 @@ $(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub
-@rm -f $(FAKEROOT_SCRIPT)
-@rm -rf $(ISO9660_TARGET_DIR)
-iso9660-root: $(BINARIES_DIR)/rootfs.iso9660
+rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
#############################################################
#
@@ -45,5 +45,5 @@ iso9660-root: $(BINARIES_DIR)/rootfs.iso9660
#
#############################################################
ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
-TARGETS+=iso9660-root
+TARGETS+=rootfs-iso9660
endif