diff options
| author | Felix Fietkau | 2025-07-06 08:32:41 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2025-07-06 08:32:44 +0000 |
| commit | 5adc663af6c9669493d4fe9bf8169d6debe7aab8 (patch) | |
| tree | f2ba5bae3a8e1966e4230fa65bc2368ea0071190 | |
| parent | 604355e8c4d18dda22aeb618c1489c5369860418 (diff) | |
| download | openwrt-5adc663af6c9669493d4fe9bf8169d6debe7aab8.tar.gz | |
image: only calculate EROFS_PCLUSTERSIZE when needed
Fixes shell warning on any makefile including image.mk when EROFS
is not enabled
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/image.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/image.mk b/include/image.mk index 262edd79d4..048e750f33 100644 --- a/include/image.mk +++ b/include/image.mk @@ -99,9 +99,8 @@ endif JFFS2_BLOCKSIZE ?= 64k 128k -EROFS_PCLUSTERSIZE := $(shell echo $$(($(CONFIG_TARGET_EROFS_PCLUSTER_SIZE)*1024))) -EROFSOPT := -C$(EROFS_PCLUSTERSIZE) -EROFSOPT += -Efragments,dedupe,ztailpacking -Uclear --all-root +EROFS_PCLUSTERSIZE = $(shell echo $$(($(CONFIG_TARGET_EROFS_PCLUSTER_SIZE)*1024))) +EROFSOPT := -Efragments,dedupe,ztailpacking -Uclear --all-root EROFSOPT += $(if $(SOURCE_DATE_EPOCH),-T$(SOURCE_DATE_EPOCH) --ignore-mtime) EROFSOPT += $(if $(CONFIG_SELINUX),,-x-1) EROFSCOMP := lz4hc,12 @@ -322,7 +321,8 @@ endef # Don't use the mkfs.erofs builtin $SOURCE_DATE_EPOCH behavior define Image/mkfs/erofs - env -u SOURCE_DATE_EPOCH $(STAGING_DIR_HOST)/bin/mkfs.erofs -z$(EROFSCOMP) $(EROFSOPT) \ + env -u SOURCE_DATE_EPOCH $(STAGING_DIR_HOST)/bin/mkfs.erofs -z$(EROFSCOMP) \ + -C$(EROFS_PCLUSTERSIZE) $(EROFSOPT) \ $@ $(call mkfs_target_dir,$(1)) endef |