summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch b/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
index d48386647e..5debcc5209 100644
--- a/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
@@ -66,15 +66,18 @@ Upstream-Status: Inappropriate [everyone else builds on newer hosts :-)]
66Signed-off-by: Donn Seeley <donn.seeley@windriver.com> 66Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
67Signed-off-by: Lei Liu <lei.liu2@windriver.com> 67Signed-off-by: Lei Liu <lei.liu2@windriver.com>
68 68
69Update patch context for dpkg 1.19.4.
70
71Signed-off-by: Kai Kang <kai.kang@windriver.com>
69--- 72---
70 src/archives.c | 4 ++-- 73 src/archives.c | 4 ++--
71 1 file changed, 2 insertions(+), 2 deletions(-) 74 1 file changed, 2 insertions(+), 2 deletions(-)
72 75
73diff --git a/src/archives.c b/src/archives.c 76diff --git a/src/archives.c b/src/archives.c
74index 4b2fc92..a92b795 100644 77index 8476a5c..b05a63f 100644
75--- a/src/archives.c 78--- a/src/archives.c
76+++ b/src/archives.c 79+++ b/src/archives.c
77@@ -69,7 +69,7 @@ fd_writeback_init(int fd) 80@@ -68,7 +68,7 @@ fd_writeback_init(int fd)
78 /* Ignore the return code as it should be considered equivalent to an 81 /* Ignore the return code as it should be considered equivalent to an
79 * asynchronous hint for the kernel, we are doing an fsync() later on 82 * asynchronous hint for the kernel, we are doing an fsync() later on
80 * anyway. */ 83 * anyway. */
@@ -83,14 +86,14 @@ index 4b2fc92..a92b795 100644
83 sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); 86 sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE);
84 #elif defined(HAVE_POSIX_FADVISE) 87 #elif defined(HAVE_POSIX_FADVISE)
85 posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); 88 posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
86@@ -1078,7 +1078,7 @@ tarobject(void *ctx, struct tar_entry *ti) 89@@ -1093,7 +1093,7 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti)
87 return 0; 90 return 0;
88 } 91 }
89 92
90-#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) 93-#if defined(SYNC_FILE_RANGE_WAIT_BEFORE)
91+#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) && __GLIBC_PREREQ(2, 6) 94+#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) && __GLIBC_PREREQ(2, 6)
92 static void 95 static void
93 tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) 96 tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg)
94 { 97 {
95-- 98--
962.16.2 992.16.2