Skip to contentSkip to conversation

squashfs: always enable xattr support

PATCH New gustavo.zacarias at free-electrons.com 2 participants 2 messages Nov 20, 2015 – Nov 29, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 squashfs: always enable xattr support

From: Gustavo Zacarias <[email protected]>

In 785fef10 xattr support was disabled, probably because the old version did require the xattr package to be present to support it. In a409d76e xattr support was made optional via (lib)attr, however the squashfs package does in fact include all of the required bits to support xattr without the need for the attr package.

So enable xattr support by default for both the host and target variants.

---
 package/squashfs/squashfs.mk | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
package/squashfs/squashfs.mk +2 -9
index 3204d05..cdeb9c8 100644
@@ -9,13 +9,7 @@ SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
 SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
 SQUASHFS_LICENSE = GPLv2+
 SQUASHFS_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_PACKAGE_ATTR),y)
-SQUASHFS_DEPENDENCIES += attr
-SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=1
-else
-SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=0
-endif
+SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
 SQUASHFS_DEPENDENCIES += lz4
@@ -54,9 +48,8 @@ endif
 
 HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
 
-# no libattr/xz in BR
 HOST_SQUASHFS_MAKE_ARGS = \
-	XATTR_SUPPORT=0 \
+	XATTR_SUPPORT=1 \
 	XZ_SUPPORT=1    \
 	GZIP_SUPPORT=1  \
 	LZ4_SUPPORT=1	\
Signature · 1 line
2.4.10
#1 lore raw

PATCH 1/1 squashfs: always enable xattr support

Dear gustavo.zacarias at free-electrons.com,

Quoted 8 lines · gustavo.zacarias at free-electrons.com

From: Gustavo Zacarias <[email protected]>

In 785fef10 xattr support was disabled, probably because the old version did require the xattr package to be present to support it. In a409d76e xattr support was made optional via (lib)attr, however the squashfs package does in fact include all of the required bits to support xattr without the need for the attr package.

Quoted 7 lines

So enable xattr support by default for both the host and target variants.

---
 package/squashfs/squashfs.mk | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com