fs: make it behave a bit more like the package infra

Currently, to register a filesystem, one has to call:

    $(eval $(call ROOTFS_TARGET,blabla))

This is very unlike the package infrastructure, where the name of the
package is automatically guessed by the infra.

It turns out that we can now do that for the filesystem infra too.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2017-12-28 11:40:32 +01:00 committed by Thomas Petazzoni
parent 9fc21664e8
commit b6842c4097
14 changed files with 16 additions and 17 deletions

View File

@ -10,4 +10,4 @@ define ROOTFS_AXFS_CMD
$(HOST_DIR)/bin/mkfs.axfs -s -a $(TARGET_DIR) $@ $(HOST_DIR)/bin/mkfs.axfs -s -a $(TARGET_DIR) $@
endef endef
$(eval $(call ROOTFS_TARGET,axfs)) $(eval $(rootfs))

View File

@ -11,4 +11,4 @@ define ROOTFS_CLOOP_CMD
$(HOST_DIR)/bin/create_compressed_fs - 65536 > $@ $(HOST_DIR)/bin/create_compressed_fs - 65536 > $@
endef endef
$(eval $(call ROOTFS_TARGET,cloop)) $(eval $(rootfs))

View File

@ -37,7 +37,7 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
# Since this function will be called from within an $(eval ...) # Since this function will be called from within an $(eval ...)
# all variable references except the arguments must be $$-quoted. # all variable references except the arguments must be $$-quoted.
define ROOTFS_TARGET_INTERNAL define inner-rootfs
# extra deps # extra deps
ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \
@ -128,8 +128,7 @@ endif
endef endef
define ROOTFS_TARGET # $(pkgname) also works well to return the filesystem name
$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1))) rootfs = $(call inner-rootfs,$(pkgname),$(call UPPERCASE,$(pkgname)))
endef
include $(sort $(wildcard fs/*/*.mk)) include $(sort $(wildcard fs/*/*.mk))

View File

@ -40,4 +40,4 @@ endef
ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE
endif endif
$(eval $(call ROOTFS_TARGET,cpio)) $(eval $(rootfs))

View File

@ -16,4 +16,4 @@ endef
ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
$(eval $(call ROOTFS_TARGET,cramfs)) $(eval $(rootfs))

View File

@ -43,4 +43,4 @@ endef
ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK
endif endif
$(eval $(call ROOTFS_TARGET,ext2)) $(eval $(rootfs))

View File

@ -144,4 +144,4 @@ endef
ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID
endif endif
$(eval $(call ROOTFS_TARGET,iso9660)) $(eval $(rootfs))

View File

@ -49,4 +49,4 @@ define ROOTFS_JFFS2_CMD
endef endef
endif endif
$(eval $(call ROOTFS_TARGET,jffs2)) $(eval $(rootfs))

View File

@ -10,4 +10,4 @@ define ROOTFS_ROMFS_CMD
$(HOST_DIR)/bin/genromfs -d $(TARGET_DIR) -f $@ $(HOST_DIR)/bin/genromfs -d $(TARGET_DIR) -f $@
endef endef
$(eval $(call ROOTFS_TARGET,romfs)) $(eval $(rootfs))

View File

@ -24,4 +24,4 @@ define ROOTFS_SQUASHFS_CMD
$(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ $(ROOTFS_SQUASHFS_ARGS) $(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ $(ROOTFS_SQUASHFS_ARGS)
endef endef
$(eval $(call ROOTFS_TARGET,squashfs)) $(eval $(rootfs))

View File

@ -11,4 +11,4 @@ define ROOTFS_TAR_CMD
tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner) tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner)
endef endef
$(eval $(call ROOTFS_TARGET,tar)) $(eval $(rootfs))

View File

@ -29,4 +29,4 @@ define ROOTFS_UBI_CMD
rm $(BUILD_DIR)/ubinize.cfg rm $(BUILD_DIR)/ubinize.cfg
endef endef
$(eval $(call ROOTFS_TARGET,ubi)) $(eval $(rootfs))

View File

@ -27,4 +27,4 @@ define ROOTFS_UBIFS_CMD
$(HOST_DIR)/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@ $(HOST_DIR)/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
endef endef
$(eval $(call ROOTFS_TARGET,ubifs)) $(eval $(rootfs))

View File

@ -10,4 +10,4 @@ define ROOTFS_YAFFS2_CMD
$(HOST_DIR)/bin/mkyaffs2 --all-root $(TARGET_DIR) $@ $(HOST_DIR)/bin/mkyaffs2 --all-root $(TARGET_DIR) $@
endef endef
$(eval $(call ROOTFS_TARGET,yaffs2)) $(eval $(rootfs))