[openwrt/openwrt] images: squashfs: xattrs should not depend on buld host

LEDE Commits lede-commits at lists.infradead.org
Tue Aug 3 10:29:55 PDT 2021


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4baf47b9a828b2e2ba2f174083676fe79b0ab527

commit 4baf47b9a828b2e2ba2f174083676fe79b0ab527
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Aug 2 20:14:53 2021 +0200

    images: squashfs: xattrs should not depend on buld host
    
    Enable xattr for the generated squashfs only if needed for SELinux.
    This eliminates warnings during boot on target when building
    (non-SELinux) OpenWrt on SELinux-enabled hosts like Fedora.
    
    Reported-by: fda77 <fda77 at users.noreply.github.com>
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 include/image.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/image.mk b/include/image.mk
index a7473abe68..d2b34d25a7 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -75,6 +75,7 @@ JFFS2OPTS += $(MKFS_DEVTABLE_OPT)
 SQUASHFS_BLOCKSIZE := $(CONFIG_TARGET_SQUASHFS_BLOCK_SIZE)k
 SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE)
 SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1'
+SQUASHFSOPT += $(if $(CONFIG_SELINUX),-xattr,-no-xattrs)
 SQUASHFSCOMP := gzip
 LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
 ifeq ($(CONFIG_SQUASHFS_XZ),y)



More information about the lede-commits mailing list