aboutsummaryrefslogtreecommitdiffstats
path: root/tools/squashfs4/patches/100-portability.patch
diff options
context:
space:
mode:
authorLinhui Liu <liulinhui36@gmail.com>2023-03-31 21:42:09 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-01 21:58:31 +0200
commitf0103c78d83866fa2649f4d874b94e646d13c591 (patch)
treeff9375b28c1e1ad862bf8ccea7c86d90a13247cb /tools/squashfs4/patches/100-portability.patch
parent3efd49a588d7d7c800b03551552d120b8af44bb7 (diff)
downloadupstream-f0103c78d83866fa2649f4d874b94e646d13c591.tar.gz
upstream-f0103c78d83866fa2649f4d874b94e646d13c591.tar.bz2
upstream-f0103c78d83866fa2649f4d874b94e646d13c591.zip
tools/squashfs4: bump to 4.6.1
Changelogs: https://github.com/plougher/squashfs-tools/blob/4.6.1/CHANGES Removed upstreamed patches: - 001-Unsquashfs-Add-and-make-some-header-includes-conditi.patch - 002-Mksquashfs-Make-sysinfo-conditional.patch - 003-Only-use-available-CPUs.patch - 004-action-rework-strdupa-with-POSIX-strdup-and-free.patch - 005-Don-t-use-sigwaitinfo-sigtimedwait-if-not-supported.patch - 006-Move-sysinfo.h-into-the-linux-only-section-should-fi.patch - 007-Unsquashfs-fix-compilation-error-for-missing-sysctl..patch - 100-portability.patch Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
Diffstat (limited to 'tools/squashfs4/patches/100-portability.patch')
-rw-r--r--tools/squashfs4/patches/100-portability.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/tools/squashfs4/patches/100-portability.patch b/tools/squashfs4/patches/100-portability.patch
deleted file mode 100644
index fe804d4476..0000000000
--- a/tools/squashfs4/patches/100-portability.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/squashfs-tools/xattr.c
-+++ b/squashfs-tools/xattr.c
-@@ -115,6 +115,7 @@ int xattr_get_prefix(struct xattr_list *
-
- static int read_xattrs_from_system(char *filename, struct xattr_list **xattrs)
- {
-+#if defined(linux)
- ssize_t size, vsize;
- char *xattr_names, *p;
- int i;
-@@ -227,6 +228,10 @@ failed:
- free(xattr_list);
- free(xattr_names);
- return 0;
-+#else
-+ *xattrs = NULL;
-+ return 0;
-+#endif
- }
-
-
---- a/squashfs-tools/unsquashfs_xattr.c
-+++ b/squashfs-tools/unsquashfs_xattr.c
-@@ -36,6 +36,7 @@ extern int strict_errors;
-
- int write_xattr(char *pathname, unsigned int xattr)
- {
-+#if defined(linux)
- unsigned int count;
- struct xattr_list *xattr_list;
- int i;
-@@ -147,4 +148,5 @@ int write_xattr(char *pathname, unsigned
- free_xattr(xattr_list, count);
-
- return !failed;
-+#endif
- }