openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-06-17 12:40:16 +04:00
Code Issues Packages Projects Releases Wiki Activity

imagebuilder: allow to specify filesystem

Browse Source 
The ImageBuilder creates by default all filesystems enabled during it's own
build, which are typically squashfs and sometimes ext4.

This commit allows to set ROOTFS_FILESYSTEM to specify which specific
filesystem should be build (instead of all).

Motivation is to reduce the load on sysupgrade servers but also fix corner
cases where a squashfs filesystem results in a working image while the ext4
image fails, resulting in a ImageBuilder failure.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren
2026-05-18 13:32:39 +02:00
parent 09e55e1008
commit db7af22e49
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/image.mk
+4
View File
@@ -122,6 +122,10 @@ fs-subtypes-$(CONFIG_TARGET_ROOTFS_JFFS2) += $(addsuffix -raw,$(addprefix jffs2-
TARGET_FILESYSTEMS := $(fs-types-y)
ifneq ($(ROOTFS_FILESYSTEM),)
TARGET_FILESYSTEMS := $(filter $(ROOTFS_FILESYSTEM) $(ROOTFS_FILESYSTEM)-%,$(TARGET_FILESYSTEMS))
endif
FS_64K := $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-64k
FS_128K := $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-128k
FS_256K := $(filter-out jffs2-%,$(TARGET_FILESYSTEMS)) jffs2-256k
target/imagebuilder/files/Makefile
+28 -1
View File
@@ -53,6 +53,7 @@ image:
make image DISABLED_SERVICES="<svc1> [<svc2> [<svc3> ..]]" # Which services in /etc/init.d/ should be disabled
make image ADD_LOCAL_KEY=1 # store locally generated signing key in built images
make image ROOTFS_PARTSIZE="<size>" # override the default rootfs partition size in MegaBytes
make image ROOTFS_FILESYSTEM="<fs>" # restrict images to one filesystem (e.g. squashfs, ext4, jffs2)
manifest:
List "all" packages which get installed into the image.
@@ -108,6 +109,17 @@ include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/default-packages.mk
-include .profiles.mk
# Filesystems this ImageBuilder was built with (used to validate ROOTFS_FILESYSTEM)
IB_FILESYSTEMS := \
$(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),squashfs) \
$(if $(CONFIG_TARGET_ROOTFS_EXT4FS),ext4) \
$(if $(CONFIG_TARGET_ROOTFS_UBIFS),ubifs) \
$(if $(CONFIG_TARGET_ROOTFS_EROFS),erofs) \
$(if $(CONFIG_TARGET_ROOTFS_JFFS2),jffs2) \
$(if $(CONFIG_TARGET_ROOTFS_JFFS2_NAND),jffs2-nand) \
$(if $(CONFIG_TARGET_ROOTFS_TARGZ),targz) \
$(if $(CONFIG_TARGET_ROOTFS_CPIOGZ),cpiogz)
USER_PROFILE ?= $(firstword $(PROFILE_NAMES))
PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \
echo '$(patsubst DEVICE_%,%,$(p)):'; $(if $($(p)_NAME),echo ' $(subst ','"'"',$($(p)_NAME))'; ) \
@@ -324,6 +336,19 @@ ifneq ($(PROFILE),)
endif
endif
_check_rootfs_filesystem: FORCE
ifneq ($(ROOTFS_FILESYSTEM),)
ifneq ($(words $(ROOTFS_FILESYSTEM)),1)
@echo 'ROOTFS_FILESYSTEM must be a single value, got "$(ROOTFS_FILESYSTEM)"'
@exit 1
endif
ifeq ($(filter $(ROOTFS_FILESYSTEM),$(IB_FILESYSTEMS)),)
@echo 'Filesystem "$(ROOTFS_FILESYSTEM)" is not available!'
@echo 'Available filesystems: $(strip $(IB_FILESYSTEMS))'
@exit 1
endif
endif
_check_keys: FORCE
ifneq ($(CONFIG_SIGNATURE_CHECK),)
ifeq ($(CONFIG_USE_APK),)
@@ -353,6 +378,7 @@ endif
image:
$(MAKE) -s _check_profile
$(MAKE) -s _check_rootfs_filesystem
$(MAKE) -s _check_keys
(unset PROFILE FILES PACKAGES MAKEFLAGS; \
$(MAKE) -s _call_image \
@@ -361,7 +387,8 @@ image:
$(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)") \
$(if $(BIN_DIR),BIN_DIR="$(BIN_DIR)") \
$(if $(DISABLED_SERVICES),DISABLED_SERVICES="$(DISABLED_SERVICES)") \
$(if $(ROOTFS_PARTSIZE),CONFIG_TARGET_ROOTFS_PARTSIZE="$(ROOTFS_PARTSIZE)"))
$(if $(ROOTFS_PARTSIZE),CONFIG_TARGET_ROOTFS_PARTSIZE="$(ROOTFS_PARTSIZE)") \
$(if $(ROOTFS_FILESYSTEM),ROOTFS_FILESYSTEM="$(ROOTFS_FILESYSTEM)"))
manifest: FORCE
$(MAKE) -s _check_profile