From patchwork Tue Jun 2 13:28:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clayton Shotwell X-Patchwork-Id: 479487 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 722E71412EA for ; Tue, 2 Jun 2015 23:30:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 07034A4232; Tue, 2 Jun 2015 13:30:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g39sAlMc6iLp; Tue, 2 Jun 2015 13:30:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 740AAA1B8F; Tue, 2 Jun 2015 13:29:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A3C141C20E1 for ; Tue, 2 Jun 2015 13:29:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A0CD233587 for ; Tue, 2 Jun 2015 13:29:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aXLepeuA7UM1 for ; Tue, 2 Jun 2015 13:28:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs01.rockwellcollins.com (secvs01.rockwellcollins.com [205.175.225.240]) by silver.osuosl.org (Postfix) with ESMTPS id 4C7013356D for ; Tue, 2 Jun 2015 13:28:59 +0000 (UTC) Received: from ofwgwc03.rockwellcollins.com (HELO dtulimr01.rockwellcollins.com) ([205.175.225.12]) by secvs01.rockwellcollins.com with ESMTP; 02 Jun 2015 08:28:58 -0500 X-Received: from thehammer.rockwellcollins.com (unknown [192.168.141.197]) by dtulimr01.rockwellcollins.com (Postfix) with ESMTP id 47BA160176; Tue, 2 Jun 2015 08:28:58 -0500 (CDT) From: Clayton Shotwell To: buildroot@buildroot.org Date: Tue, 2 Jun 2015 08:28:36 -0500 Message-Id: <1433251718-3167-21-git-send-email-clayton.shotwell@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433251718-3167-1-git-send-email-clayton.shotwell@rockwellcollins.com> References: <1433251718-3167-1-git-send-email-clayton.shotwell@rockwellcollins.com> Cc: Clayton Shotwell Subject: [Buildroot] [PATCH v7 20/22] squashfs: Add xattr support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Adding extended attribute support for the squashfs tools when the attr package is selected. This is needed for SELinux support. Signed-off-by: Clayton Shotwell --- Changes v6 -> v7: - No changes Changes v5 -> v6: - No changes --- package/squashfs/squashfs.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 8ca9e2e..f44ef9f 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -10,9 +10,6 @@ SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squas SQUASHFS_LICENSE = GPLv2+ SQUASHFS_LICENSE_FILES = COPYING -# no libattr in BR -SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0 - ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) SQUASHFS_DEPENDENCIES += lz4 SQUASHFS_MAKE_ARGS += LZ4_SUPPORT=1 COMP_DEFAULT=lz4 @@ -52,13 +49,20 @@ HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz # no libattr/xz in BR HOST_SQUASHFS_MAKE_ARGS = \ - XATTR_SUPPORT=0 \ XZ_SUPPORT=1 \ GZIP_SUPPORT=1 \ LZ4_SUPPORT=1 \ LZO_SUPPORT=1 \ LZMA_XZ_SUPPORT=1 +ifeq ($(BR2_PACKAGE_ATTR),y) + SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=1 + HOST_SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=1 +else + SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=0 + HOST_SQUASHFS_MAKE_ARGS += XATTR_SUPPORT=0 +endif + define SQUASHFS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) \ CC="$(TARGET_CC)" \