squashfs: build without xattr support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-10-12 19:17:20 +02:00
parent f04257160a
commit f6f3d4b83e
2 changed files with 48 additions and 2 deletions

View File

@ -3,7 +3,6 @@
. config/options $1
$SCRIPTS/build toolchain
$SCRIPTS/build attr
$SCRIPTS/unpack lzma
LZMA_DIR=`ls -d $ROOT/$BUILD/lzma*`
@ -14,7 +13,6 @@ cd $BUILD/$1*/squashfs-tools
make mksquashfs \
LZMA_SUPPORT=1 LZMA_DIR=$LZMA_DIR \
LZO_SUPPORT=1 \
INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include -I$LZMA_DIR/C"
mkdir -p $ROOT/$TOOLCHAIN/bin

View File

@ -0,0 +1,48 @@
diff -Naur squashfs4.1/squashfs-tools/Makefile squashfs4.1.patch/squashfs-tools/Makefile
--- squashfs4.1/squashfs-tools/Makefile 2010-09-21 00:11:47.000000000 +0200
+++ squashfs4.1.patch/squashfs-tools/Makefile 2010-10-12 19:13:52.504611650 +0200
@@ -64,7 +64,7 @@
# If your C library or build/target environment doesn't support XATTRs then
# comment out the next line to build Mksquashfs and Unsquashfs without XATTR
# support
-XATTR_SUPPORT = 1
+#XATTR_SUPPORT = 1
# Select whether you wish xattrs to be stored by Mksquashfs and extracted
# by Unsquashfs by default. If selected users can disable xattr support by
@@ -72,7 +72,7 @@
#
# If unselected, Mksquashfs/Unsquashfs won't store and extract xattrs by
# default. Users can enable xattrs by using the -xattrs option.
-XATTR_DEFAULT = 1
+#XATTR_DEFAULT = 1
###############################################
@@ -87,7 +87,7 @@
UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
unsquash-4.o swap.o compressor.o
-CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+CFLAGS += $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall
LIBS =
@@ -175,7 +175,7 @@
all: mksquashfs unsquashfs
mksquashfs: $(MKSQUASHFS_OBJS)
- $(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
squashfs_swap.h xattr.h
@@ -195,7 +195,7 @@
read_xattrs.o: xattr.h
unsquashfs: $(UNSQUASHFS_OBJS)
- $(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
+ $(CC) $(CFLAGS) $(LDFLAGS) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \
squashfs_compat.h global.h xattr.h