aboutsummaryrefslogtreecommitdiffstats
path: root/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
diff options
context:
space:
mode:
authorAlex Maclean <monkeh@monkeh.net>2017-10-23 13:48:19 +0100
committerMathias Kresin <dev@kresin.me>2017-10-27 11:19:38 +0200
commit4425fa84dad57b6b0046b97e224d50b33f1f536b (patch)
treea35eb5584ca74a955fb4bd8bb9436fa065702591 /tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
parent09bfca653c0ce9db3588c4046c53b28ae67eddbe (diff)
downloadupstream-4425fa84dad57b6b0046b97e224d50b33f1f536b.tar.gz
upstream-4425fa84dad57b6b0046b97e224d50b33f1f536b.tar.bz2
upstream-4425fa84dad57b6b0046b97e224d50b33f1f536b.zip
tools/squashfs4: include sysmacros.h explicitly
glibc is moving to remove the include of sys/sysmacros.h from sys/types.h, and some distros have done this early. Other libcs may already lack this include. Include sysmacros.h explicitly. Fixes: FS#1017 Signed-off-by: Alex Maclean <monkeh@monkeh.net> [refresh patches] Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'tools/squashfs4/patches/200-add-fixed-timestamp-option.patch')
-rw-r--r--tools/squashfs4/patches/200-add-fixed-timestamp-option.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch b/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
index 5cec51f7b7..7411b97844 100644
--- a/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
+++ b/tools/squashfs4/patches/200-add-fixed-timestamp-option.patch
@@ -1,6 +1,6 @@
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
-@@ -175,6 +175,9 @@ unsigned int cache_bytes = 0, cache_size
+@@ -176,6 +176,9 @@ unsigned int cache_bytes = 0, cache_size
/* inode lookup table */
squashfs_inode *inode_lookup_table = NULL;
@@ -10,7 +10,7 @@
/* in memory directory data */
#define I_COUNT_SIZE 128
#define DIR_ENTRIES 32
-@@ -2452,6 +2455,8 @@ again:
+@@ -2453,6 +2456,8 @@ again:
restat:
fstat(file, &buf2);
close(file);
@@ -19,7 +19,7 @@
if(read_size != buf2.st_size) {
memcpy(buf, &buf2, sizeof(struct stat));
file_buffer->error = 2;
-@@ -3612,7 +3617,7 @@ void dir_scan(squashfs_inode *inode, cha
+@@ -3613,7 +3618,7 @@ void dir_scan(squashfs_inode *inode, cha
buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR;
buf.st_uid = getuid();
buf.st_gid = getgid();
@@ -28,7 +28,7 @@
buf.st_dev = 0;
buf.st_ino = 0;
dir_ent->inode = lookup_inode(&buf);
-@@ -3623,6 +3628,8 @@ void dir_scan(squashfs_inode *inode, cha
+@@ -3624,6 +3629,8 @@ void dir_scan(squashfs_inode *inode, cha
pathname, strerror(errno));
return;
}
@@ -37,7 +37,7 @@
dir_ent->inode = lookup_inode(&buf);
}
-@@ -3677,6 +3684,8 @@ struct dir_info *dir_scan1(char *pathnam
+@@ -3678,6 +3685,8 @@ struct dir_info *dir_scan1(char *pathnam
filename, strerror(errno));
continue;
}
@@ -46,7 +46,7 @@
if((buf.st_mode & S_IFMT) != S_IFREG &&
(buf.st_mode & S_IFMT) != S_IFDIR &&
-@@ -3795,7 +3804,7 @@ struct dir_info *dir_scan2(struct dir_in
+@@ -3796,7 +3805,7 @@ struct dir_info *dir_scan2(struct dir_in
buf.st_gid = pseudo_ent->dev->gid;
buf.st_rdev = makedev(pseudo_ent->dev->major,
pseudo_ent->dev->minor);
@@ -55,7 +55,7 @@
buf.st_ino = pseudo_ino ++;
if(pseudo_ent->dev->type == 'f') {
-@@ -4674,6 +4683,15 @@ int main(int argc, char *argv[])
+@@ -4675,6 +4684,15 @@ int main(int argc, char *argv[])
progress = FALSE;
else if(strcmp(argv[i], "-no-exports") == 0)
exportable = FALSE;
@@ -71,7 +71,7 @@
else if(strcmp(argv[i], "-processors") == 0) {
if((++i == argc) || (processors =
strtol(argv[i], &b, 10), *b != '\0')) {
-@@ -5314,7 +5332,7 @@ printOptions:
+@@ -5315,7 +5333,7 @@ printOptions:
sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments,
always_use_fragments, duplicate_checking, exportable,
no_xattrs, comp_opts);