aboutsummaryrefslogtreecommitdiff
path: root/bin/Makemodule.am
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-04-27 20:19:46 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-04-27 20:41:21 +0200
commit687e44297071c95004d47e389fc409b951a8f9ff (patch)
tree6383b32c960a32bfb1393b774cc72a54fe2b94b1 /bin/Makemodule.am
parent6a0d2f053ba32c63bb9a3c40135f8d5bb46c9cb0 (diff)
Cleanup/fix: gensquashfs: split directory scanning from xattr scanning
On the one hand, this commit cleanes the code a bit by splitting the "scan directory contents" code from the "scan xattrs from directory contents" and moving the later in a seperate file. On the other hand, the xattr scanning is now done *after* the fstree is post processed, which includes sorting it. This way, the xattrs are always added in a deterministic, reproducible order. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/Makemodule.am')
-rw-r--r--bin/Makemodule.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/Makemodule.am b/bin/Makemodule.am
index 4199ac5..778636c 100644
--- a/bin/Makemodule.am
+++ b/bin/Makemodule.am
@@ -28,7 +28,7 @@ sqfsdiff_LDADD += $(PTHREAD_LIBS)
gensquashfs_SOURCES = bin/gensquashfs/mkfs.c bin/gensquashfs/mkfs.h
gensquashfs_SOURCES += bin/gensquashfs/options.c bin/gensquashfs/selinux.c
-gensquashfs_SOURCES += bin/gensquashfs/dirscan.c
+gensquashfs_SOURCES += bin/gensquashfs/dirscan.c bin/gensquashfs/dirscan_xattr.c
gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a
gensquashfs_LDADD += libcompat.a $(LIBSELINUX_LIBS) $(LZO_LIBS)
gensquashfs_LDADD += $(PTHREAD_LIBS)