Changeset 78d1618 in freewrt for target

Timestamp:

Aug 15, 2025, 4:56:30 PM (4 months ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_2_0

Children:

c41db42

Parents:

0e691c1

Message:

rename squashfs-overlay to squashfs

Location:

target

Files:

• Config.in (modified) (2 diffs)
• image/brcm/Makefile (modified) (2 diffs)
• linux/brcm-6.12/Makefile (modified) (2 diffs)
• linux/brcm-6.12/squashfs/config/config.squashfs (moved) (moved from target/linux/brcm-6.12/squashfs-overlay/config/config.squashfs_overlay )
• linux/brcm-6.12/squashfs/files/etc/init.d/S20jffsclean (moved) (moved from target/linux/brcm-6.12/squashfs-overlay/files/etc/init.d/S20jffsclean )
• linux/brcm-6.12/squashfs/files/sbin/mount_root (moved) (moved from target/linux/brcm-6.12/squashfs-overlay/files/sbin/mount_root )

target/Config.in

@@ -10 +10 @@
 choice
 prompt "Target Firmware type"
-        default FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
+        default FWRT_TARGET_ROOTFS_SQUASHFS
 
 config FWRT_TARGET_ROOTFS_JFFS2
@@ -16 +16 @@
         select FWRT_PACKAGE_MTD
         select FWRT_PACKAGE_FWCF
-        depends on FWRT_LINUX_BRCM
         help
           Build firmware images with a writable jffs2 root filesystem.
 
-config FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY
-        bool "read-only root filesystem and overlay fs (squashfs-overlay)"
+config FWRT_TARGET_ROOTFS_SQUASHFS
+        bool "read-only root filesystem (squashfs)"
         select FWRT_PACKAGE_MTD
         select FWRT_PACKAGE_FWCF
-        depends on FWRT_LINUX_BRCM
         help
           Build firmware images with a read-only and highly compressed
-          (squashfs with lzma compression) root filesystem and a overlay
-          filesystem for a pseudo writable root filesystem. Only differences
-          to the read-only image are kept on a writable jffs2 partition.
+          (squashfs with zstd compression) root filesystem. 
 
 endchoice

target/image/brcm/Makefile

@@ -45 +45 @@
 endif
 
-ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS_OVERLAY),y)
-$(KDIR)/root.squashfs-overlay:
-        rm -f $(KDIR)/root.squashfs-overlay
+ifeq ($(FWRT_TARGET_ROOTFS_SQUASHFS),y)
+$(KDIR)/root.squashfs:
+        rm -f $(KDIR)/root.squashfs
         $(STAGING_DIR)/bin/mksquashfs $(KDIR)/root \
-                $(KDIR)/root.squashfs-overlay $(SQUASHFS_OPTS) $(MAKE_TRACE)
+                $(KDIR)/root.squashfs $(SQUASHFS_OPTS) $(MAKE_TRACE)
 endif
 
@@ -61 +61 @@
         cp $(BUILD_DIR)/loader.elf $(BIN_DIR)/boot/bootloader-$(BOARD)-$(KERNEL).elf
 
-ifeq ($(FS),squashfs-overlay)
+ifeq ($(FS),squashfs)
 $(STAGING_DIR)/$(FWRT_PREFIX)-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS) $(KDIR)/vmlinux.lzma
         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma -a 1024 $(KDIR)/root.$(FS) $(MAKE_TRACE)

target/linux/brcm-6.12/Makefile

@@ -86 +86 @@
 # otherwise use generic root filesystem specific for this board
 
-# squashfs with mini-fo overlay
-ifeq ($(FS),squashfs-overlay)
-MODELCONFIG:=$(shell test -f $(MODEL)/config/config.squashfs_overlay && echo y 2>/dev/null)
-ifneq ($(strip $(MODELCONFIG)),)
-include $(MODEL)/config/config.squashfs_overlay
-else
-include $(FS)/config/config.squashfs_overlay
+# squashfs
+ifeq ($(FS),squashfs)
+MODELCONFIG:=$(shell test -f $(MODEL)/config/config.squashfs && echo y 2>/dev/null)
+ifneq ($(strip $(MODELCONFIG)),)
+include $(MODEL)/config/config.squashfs
+else
+include $(FS)/config/config.squashfs
 endif
 endif
@@ -136 +136 @@
         [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
         #-[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
-ifeq ($(FS),squashfs-overlay)
-ifneq ($(strip $(MODELCONFIG)),)
-        $(CP) $(MODEL)/config/config.squashfs_overlay $(LINUX_DIR)/.config
-else
-        $(CP) $(FS)/config/config.squashfs_overlay $(LINUX_DIR)/.config
+ifeq ($(FS),squashfs)
+ifneq ($(strip $(MODELCONFIG)),)
+        $(CP) $(MODEL)/config/config.squashfs $(LINUX_DIR)/.config
+else
+        $(CP) $(FS)/config/config.squashfs $(LINUX_DIR)/.config
 endif
 endif