From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 19 Aug 2021 00:23:41 +0000 (+0100)
Subject: image: fix build with SELinux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c5616a8ae1649ef55d362462a39aa133b65dc1e3;p=openwrt%2Fstaging%2Fjow.git

image: fix build with SELinux

The option '-xattr' for mksquashfs4 should be '-xattrs' which lead to
build failure with SELinux enabled. Add the missing 's'.

Fixes: 4baf47b9a8 ("images: squashfs: xattrs should not depend on buld host")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/include/image.mk b/include/image.mk
index d2b34d25a7..6298e3085e 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -75,7 +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)
+SQUASHFSOPT += $(if $(CONFIG_SELINUX),-xattrs,-no-xattrs)
 SQUASHFSCOMP := gzip
 LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
 ifeq ($(CONFIG_SQUASHFS_XZ),y)