diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-02-22 01:47:16 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 10:42:56 +0000 |
commit | 5185b6fe3d4fa9b53baffa6ee419da60ac056da2 (patch) | |
tree | b4d68a65315648c19f002bde1ef7cd6497b950a2 /meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch | |
parent | c2684740d7fd3aeb60b3ec7888000097effe82f4 (diff) | |
download | openembedded-core-contrib-5185b6fe3d4fa9b53baffa6ee419da60ac056da2.tar.gz |
dpkg: 1.18.25 -> 1.19.4
Upgrade dpkg from 1.18.25 to 1.19.4:
* update SRC_URI which DEBIAN_MIRROR
* un-export PERL which causes script scripts/dpkg-architecture.pl fails
to get cpu type and package arch
* add configure option '--disable-update-alternatives' which causes
installed-vs-shipped issue
* add patch for dpkg-native to resolve host tar may not support
options --owner=NAME:ID and --group=NAME:ID
* update context of patches
* drop dpkg-configure.service that apt provides a systemd timer to do it
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 11 |
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 :-)] Signed-off-by: Donn Seeley <donn.seeley@windriver.com> Signed-off-by: Lei Liu <lei.liu2@windriver.com> +Update patch context for dpkg 1.19.4. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- src/archives.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/archives.c b/src/archives.c -index 4b2fc92..a92b795 100644 +index 8476a5c..b05a63f 100644 --- a/src/archives.c +++ b/src/archives.c -@@ -69,7 +69,7 @@ fd_writeback_init(int fd) +@@ -68,7 +68,7 @@ fd_writeback_init(int fd) /* Ignore the return code as it should be considered equivalent to an * asynchronous hint for the kernel, we are doing an fsync() later on * anyway. */ @@ -83,14 +86,14 @@ index 4b2fc92..a92b795 100644 sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); #elif defined(HAVE_POSIX_FADVISE) posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); -@@ -1078,7 +1078,7 @@ tarobject(void *ctx, struct tar_entry *ti) +@@ -1093,7 +1093,7 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti) return 0; } -#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) +#if defined(SYNC_FILE_RANGE_WAIT_BEFORE) && __GLIBC_PREREQ(2, 6) static void - tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) + tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg) { -- 2.16.2 |