浏览代码

squashfs: always enable xattr support

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.

Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Gustavo Zacarias 9 年之前
父节点
当前提交
10478514a5
共有 1 个文件被更改,包括 2 次插入9 次删除
  1. 2 9
      package/squashfs/squashfs.mk

+ 2 - 9
package/squashfs/squashfs.mk

@@ -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	\