From: Thomas Petazzoni Date: Wed, 10 Mar 2010 21:31:32 +0000 (+0100) Subject: Coherent naming for .mk files in fs/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3474716bff31a3d287d0d3813eb7e107cedfa3ef;p=buildroot.git Coherent naming for .mk files in fs/ Signed-off-by: Thomas Petazzoni --- diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk new file mode 100644 index 0000000000..ab7d546185 --- /dev/null +++ b/fs/cpio/cpio.mk @@ -0,0 +1,18 @@ +############################################################# +# +# cpio to archive target filesystem +# +############################################################# + +define ROOTFS_CPIO_INIT_SYMLINK + rm -f $(TARGET_DIR)/init + ln -s sbin/init $(TARGET_DIR)/init +endef + +ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_INIT_SYMLINK + +define ROOTFS_CPIO_CMD + cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@ +endef + +$(eval $(call ROOTFS_TARGET,cpio)) \ No newline at end of file diff --git a/fs/cpio/cpioroot.mk b/fs/cpio/cpioroot.mk deleted file mode 100644 index ab7d546185..0000000000 --- a/fs/cpio/cpioroot.mk +++ /dev/null @@ -1,18 +0,0 @@ -############################################################# -# -# cpio to archive target filesystem -# -############################################################# - -define ROOTFS_CPIO_INIT_SYMLINK - rm -f $(TARGET_DIR)/init - ln -s sbin/init $(TARGET_DIR)/init -endef - -ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_INIT_SYMLINK - -define ROOTFS_CPIO_CMD - cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@ -endef - -$(eval $(call ROOTFS_TARGET,cpio)) \ No newline at end of file diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk new file mode 100644 index 0000000000..68b3b813c3 --- /dev/null +++ b/fs/ext2/ext2.mk @@ -0,0 +1,40 @@ +############################################################# +# +# Build the ext2 root filesystem image +# +############################################################# + +EXT2_OPTS := + +ifeq ($(BR2_TARGET_ROOTFS_EXT2_SQUASH),y) +EXT2_OPTS += -U +endif + +ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) +EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS) +endif + +ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0) +EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES) +endif + +ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) +EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) +endif + +ROOTFS_EXT2_DEPENDENCIES = host-genext2fs + +ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) +GENEXT2_REALSIZE=$(shell LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//") +GENEXT2_ADDTOROOTSIZE=$(shell if [ $(GENEXT2_REALSIZE) -ge 20000 ]; then echo 16384; else echo 2400; fi) +GENEXT2_SIZE=$(shell expr $(GENEXT2_REALSIZE) + $(GENEXT2_ADDTOROOTSIZE)) +GENEXT2_ADDTOINODESIZE=$(shell find $(TARGET_DIR) | wc -l) +GENEXT2_INODES=$(shell expr $(GENEXT2_ADDTOINODESIZE) + 400) +EXT2_OPTS += -b $(GENEXT2_SIZE) -N $(GENEXT2_INODES) +endif + +define ROOTFS_EXT2_CMD + $(HOST_DIR)/usr/bin/genext2fs -d $(TARGET_DIR) $(EXT2_OPTS) $$@ +endef + +$(eval $(call ROOTFS_TARGET,ext2)) \ No newline at end of file diff --git a/fs/ext2/ext2root.mk b/fs/ext2/ext2root.mk deleted file mode 100644 index 68b3b813c3..0000000000 --- a/fs/ext2/ext2root.mk +++ /dev/null @@ -1,40 +0,0 @@ -############################################################# -# -# Build the ext2 root filesystem image -# -############################################################# - -EXT2_OPTS := - -ifeq ($(BR2_TARGET_ROOTFS_EXT2_SQUASH),y) -EXT2_OPTS += -U -endif - -ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) -EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS) -endif - -ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0) -EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES) -endif - -ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) -EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) -endif - -ROOTFS_EXT2_DEPENDENCIES = host-genext2fs - -ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) -GENEXT2_REALSIZE=$(shell LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//") -GENEXT2_ADDTOROOTSIZE=$(shell if [ $(GENEXT2_REALSIZE) -ge 20000 ]; then echo 16384; else echo 2400; fi) -GENEXT2_SIZE=$(shell expr $(GENEXT2_REALSIZE) + $(GENEXT2_ADDTOROOTSIZE)) -GENEXT2_ADDTOINODESIZE=$(shell find $(TARGET_DIR) | wc -l) -GENEXT2_INODES=$(shell expr $(GENEXT2_ADDTOINODESIZE) + 400) -EXT2_OPTS += -b $(GENEXT2_SIZE) -N $(GENEXT2_INODES) -endif - -define ROOTFS_EXT2_CMD - $(HOST_DIR)/usr/bin/genext2fs -d $(TARGET_DIR) $(EXT2_OPTS) $$@ -endef - -$(eval $(call ROOTFS_TARGET,ext2)) \ No newline at end of file diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk new file mode 100644 index 0000000000..a0a563d185 --- /dev/null +++ b/fs/jffs2/jffs2.mk @@ -0,0 +1,61 @@ +############################################################# +# +# Build the jffs2 root filesystem image +# +############################################################# + +JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) +SUMTOOL_OPTS := $(JFFS2_OPTS) + +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) +ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0) +JFFS2_OPTS += --pad=$(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)) +else +JFFS2_OPTS += -p +endif +SUMTOOL_OPTS += -p +endif + +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y) +JFFS2_OPTS += -l +SUMTOOL_OPTS += -l +endif + +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_BE),y) +JFFS2_OPTS += -b +SUMTOOL_OPTS += -b +endif + +JFFS2_OPTS += -s $(BR2_TARGET_ROOTFS_JFFS2_PAGESIZE) +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER),y) +JFFS2_OPTS += -n +SUMTOOL_OPTS += -n +endif + +ifneq ($(TARGET_DEVICE_TABLE),) +JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE) +endif + +ROOTFS_JFFS2_DEPENDENCIES = host-mtd + +ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),) +define ROOTFS_JFFS2_CMD + $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \ + $(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \ + rm $$@.nosummary +endef +else +define ROOTFS_JFFS2_CMD + $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@ +endef +endif + +define JFFS2_GEN_SREC + $(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $$@ $$@.srec +endef + +ifeq ($(BR2_JFFS2_TARGET_SREC),y) +ROOTFS_JFFS2_POST_GEN_HOOKS += JFFS2_GEN_SREC +endif + +$(eval $(call ROOTFS_TARGET,jffs2)) \ No newline at end of file diff --git a/fs/jffs2/jffs2root.mk b/fs/jffs2/jffs2root.mk deleted file mode 100644 index a0a563d185..0000000000 --- a/fs/jffs2/jffs2root.mk +++ /dev/null @@ -1,61 +0,0 @@ -############################################################# -# -# Build the jffs2 root filesystem image -# -############################################################# - -JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) -SUMTOOL_OPTS := $(JFFS2_OPTS) - -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) -ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0) -JFFS2_OPTS += --pad=$(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)) -else -JFFS2_OPTS += -p -endif -SUMTOOL_OPTS += -p -endif - -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y) -JFFS2_OPTS += -l -SUMTOOL_OPTS += -l -endif - -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_BE),y) -JFFS2_OPTS += -b -SUMTOOL_OPTS += -b -endif - -JFFS2_OPTS += -s $(BR2_TARGET_ROOTFS_JFFS2_PAGESIZE) -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER),y) -JFFS2_OPTS += -n -SUMTOOL_OPTS += -n -endif - -ifneq ($(TARGET_DEVICE_TABLE),) -JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE) -endif - -ROOTFS_JFFS2_DEPENDENCIES = host-mtd - -ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),) -define ROOTFS_JFFS2_CMD - $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \ - $(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \ - rm $$@.nosummary -endef -else -define ROOTFS_JFFS2_CMD - $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@ -endef -endif - -define JFFS2_GEN_SREC - $(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $$@ $$@.srec -endef - -ifeq ($(BR2_JFFS2_TARGET_SREC),y) -ROOTFS_JFFS2_POST_GEN_HOOKS += JFFS2_GEN_SREC -endif - -$(eval $(call ROOTFS_TARGET,jffs2)) \ No newline at end of file diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk new file mode 100644 index 0000000000..d72388ebf2 --- /dev/null +++ b/fs/squashfs/squashfs.mk @@ -0,0 +1,13 @@ +############################################################# +# +# Build the squashfs root filesystem image +# +############################################################# + +ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs + +define ROOTFS_SQUASHFS_CMD + $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend +endef + +$(eval $(call ROOTFS_TARGET,squashfs)) \ No newline at end of file diff --git a/fs/squashfs/squashfsroot.mk b/fs/squashfs/squashfsroot.mk deleted file mode 100644 index d72388ebf2..0000000000 --- a/fs/squashfs/squashfsroot.mk +++ /dev/null @@ -1,13 +0,0 @@ -############################################################# -# -# Build the squashfs root filesystem image -# -############################################################# - -ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs - -define ROOTFS_SQUASHFS_CMD - $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend -endef - -$(eval $(call ROOTFS_TARGET,squashfs)) \ No newline at end of file diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk new file mode 100644 index 0000000000..4d435cb33b --- /dev/null +++ b/fs/tar/tar.mk @@ -0,0 +1,13 @@ +############################################################# +# +# tar to archive target filesystem +# +############################################################# + +TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS) + +define ROOTFS_TAR_CMD + tar -c$(TAR_OPTS)f $$@ -C $(TARGET_DIR) . +endef + +$(eval $(call ROOTFS_TARGET,tar)) diff --git a/fs/tar/tarroot.mk b/fs/tar/tarroot.mk deleted file mode 100644 index 4d435cb33b..0000000000 --- a/fs/tar/tarroot.mk +++ /dev/null @@ -1,13 +0,0 @@ -############################################################# -# -# tar to archive target filesystem -# -############################################################# - -TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS) - -define ROOTFS_TAR_CMD - tar -c$(TAR_OPTS)f $$@ -C $(TARGET_DIR) . -endef - -$(eval $(call ROOTFS_TARGET,tar)) diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk new file mode 100644 index 0000000000..0fad234212 --- /dev/null +++ b/fs/ubifs/ubifs.mk @@ -0,0 +1,25 @@ +############################################################# +# +# Build the ubifs root filesystem image +# +############################################################# + +UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) + +ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB),y) +UBIFS_OPTS += -x zlib +endif +ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_LZI),y) +UBIFS_OPTS += -x lzo +endif +ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y) +UBIFS_OPTS += -x none +endif + +ROOTFS_UBIFS_DEPENDENCIES = host-mtd + +define ROOTFS_UBIFS_CMD + $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@ +endef + +$(eval $(call ROOTFS_TARGET,ubifs)) \ No newline at end of file diff --git a/fs/ubifs/ubifsroot.mk b/fs/ubifs/ubifsroot.mk deleted file mode 100644 index 0fad234212..0000000000 --- a/fs/ubifs/ubifsroot.mk +++ /dev/null @@ -1,25 +0,0 @@ -############################################################# -# -# Build the ubifs root filesystem image -# -############################################################# - -UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) - -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB),y) -UBIFS_OPTS += -x zlib -endif -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_LZI),y) -UBIFS_OPTS += -x lzo -endif -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y) -UBIFS_OPTS += -x none -endif - -ROOTFS_UBIFS_DEPENDENCIES = host-mtd - -define ROOTFS_UBIFS_CMD - $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@ -endef - -$(eval $(call ROOTFS_TARGET,ubifs)) \ No newline at end of file