NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4c18b5c378
kumquat-buildroot/fs/ext2/ext2.mk

38 lines
1.1 KiB
Makefile
Raw Normal View History

Normalize separator size to 80 Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 23:54:13 +02:00
################################################################################
Major rework
2002-04-26 13:45:55 +02:00
#
# Build the ext2 root filesystem image
#
Normalize separator size to 80 Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 23:54:13 +02:00
################################################################################
Major rework
2002-04-26 13:45:55 +02:00
fs/ext2: fix double quoted label Since the commit 6dd7bbb59134799ed3d7343f238b3b02592faebf, the label does not need anymore to be quoted. Even worse it *must* not be simple-quoted, unless the label will contain the double-quotes from the config variable BR2_TARGET_ROOTFS_EXT2_LABEL. The commit mentionned above has replaced echo by printf: - echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT) + $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) Since this commit the rootfs label contains extra double-quotes. $ blkid /dev/mmcblk0: LABEL=""BR 2016.08"" UUID="xxx" ^ ^ With this fix, the extra double-quotes have disappeared: /dev/mmcblk0: LABEL="BR 2016.11-rc2" UUID="yyy" Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-21 17:15:29 +01:00
# qstrip results in stripping consecutive spaces into a single one. So the
# variable is not qstrip-ed to preserve the integrity of the string value.
EXT2_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL))
fs/ext2: always pass the label option ... since passing an empty string is equivalent to not setting a label. And fix the syntax highlighting in some editors... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-04 00:50:58 +02:00
#" Syntax highlighting... :-/ )
fs/ext2: simplify code No option is conditional anymore, so just collate them into a single assignment. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-04 00:51:00 +02:00
EXT2_OPTS = \
-G $(BR2_TARGET_ROOTFS_EXT2_GEN) \
-R $(BR2_TARGET_ROOTFS_EXT2_REV) \
package/mke2img: add option to specify block size ext filesystems can use a block size of 1024, 2048, or 4096 bytes, the former being interesting to store small files, while the latter being more intersting to store bigger files. So far, we were using the default, which was to use a 1024-byte block. Continue doing so (for now...). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-04 00:51:01 +02:00
-B 1024 \
fs/ext2: simplify code No option is conditional anymore, so just collate them into a single assignment. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-04 00:51:00 +02:00
-b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS) \
-i $(BR2_TARGET_ROOTFS_EXT2_INODES) \
-I $(BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES) \
-r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \
-l "$(EXT2_LABEL)"
fs/ext2: add option to specify a filesystem label Filesystems of the ext familly can carry a filesystem label. Add an option for the user to specify such a label. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Károly Kasza <kaszak@gmail.com> Tested-by: Karoly Kasza <kaszak@gmail.com> Reviewed-by: Karoly Kasza <kaszak@gmail.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-06 23:40:06 +01:00
fs/ext2: use the new mke2img host package And get rid of the old genext2fs.sh wrapper. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Karoly Kasza <kaszak@gmail.com> Reviewed-by: Karoly Kasza <kaszak@gmail.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-06 23:40:05 +01:00
ROOTFS_EXT2_DEPENDENCIES = host-mke2img
Patch from gtj -- http://bugs.uclibc.org/view.php?id=39 0000039: Adds options to ext2 filesystem creation Adds ability to specify block and inode counts, reserved blocks, permissions squash and device table in the configuration. Also adds capability to gzip output and to copy the resulting image to a secondary location like a tftp server's root directory.
2005-01-23 11:53:06 +01:00
ext2: convert to ROOTFS_TARGET infrastructure We also remove the BR2_TARGET_ROOTFS_EXT2_OUTPUT option, that could be used to specify an alternate name for the generated image file. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-03-10 00:15:15 +01:00
define ROOTFS_EXT2_CMD
fs/ext2: use the new mke2img host package And get rid of the old genext2fs.sh wrapper. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Karoly Kasza <kaszak@gmail.com> Reviewed-by: Karoly Kasza <kaszak@gmail.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-12-06 23:40:05 +01:00
PATH=$(BR_PATH) mke2img -d $(TARGET_DIR) $(EXT2_OPTS) -o $@
ext2: convert to ROOTFS_TARGET infrastructure We also remove the BR2_TARGET_ROOTFS_EXT2_OUTPUT option, that could be used to specify an alternate name for the generated image file. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-03-10 00:15:15 +01:00
endef
Major rework
2002-04-26 13:45:55 +02:00
rootfs-ext2: make the symlink as a _POST_TARGET This will allow us to remove the unused ROOTFS_$(FSTYPE)_POST_GEN_HOOKS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-07 00:12:29 +01:00
rootfs-ext2-symlink:
rootfs-ext2: symlink with the compressed rootfs Previously, a symlink was created to the uncompressed filesystem, which made it a bit useless in case compression was chosen. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-07 00:12:33 +01:00
ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT)
rootfs-ext2: make the symlink as a _POST_TARGET This will allow us to remove the unused ROOTFS_$(FSTYPE)_POST_GEN_HOOKS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-07 00:12:29 +01:00
fs: declare phony targets as such This commit improves the filesystem handling code to declare its various targets as PHONY when appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2015-04-12 18:37:46 +02:00
.PHONY: rootfs-ext2-symlink
fs/ext2: add a symlink 'rootfs.ext#' -> 'rootfs.ext2' Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-11 14:17:52 +02:00
ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2)
rootfs-ext2: make the symlink as a _POST_TARGET This will allow us to remove the unused ROOTFS_$(FSTYPE)_POST_GEN_HOOKS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-07 00:12:29 +01:00
ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink
fs/ext2: add a symlink 'rootfs.ext#' -> 'rootfs.ext2' Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-11 14:17:52 +02:00
endif
fs/ext2: fix blocks/inodes calculation With the ROOTFS_TARGET conversion, EXT2_OPTS gets evaluated very early (before TARGET_DIR is populated with files), so the calculated blocks/inodes numbers are wrong. Fix it by moving the calculation to a shell script wrapper around genext2fs, so it only gets executed just before genext2fs runs. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-19 14:24:11 +02:00
$(eval $(call ROOTFS_TARGET,ext2))
Reference in New Issue Copy Permalink