summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-03-16 20:40:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-20 09:59:32 +0000
commit35b28399d5ac6935d6fcfcd4dfa4aca5caafcc5e (patch)
tree13bd30da9e4083201b50ecdc5ff751a9217ed9c1
parent9a6b5496a427a1c733fbe5b73e7a4ac95b4df17b (diff)
downloadpoky-35b28399d5ac6935d6fcfcd4dfa4aca5caafcc5e.tar.gz
dpkg: Backport riscv support
Refresh patches with devtool (From OE-Core rev: 6d21977c9d1cf00b102a58e28797250b9a853caf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch54
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.18.24.bb1
3 files changed, 71 insertions, 5 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch
new file mode 100644
index 0000000000..45c606e690
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch
@@ -0,0 +1,54 @@
1From 319f32d743f5b5e725012654d124e49226d5de91 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 16 Mar 2018 20:28:24 -0700
4Subject: [PATCH] arch: Add support for riscv64 CPU
5
6 * Architecture support:
7 - Add support for riscv64 CPU. Closes: #822914
8 Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
9
10Upstream-Status: Backport [https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=dpkg%2Fdpkg.git;a=commitdiff_plain;h=ee0855cc66076691de4796be48f8a0d889fde001;hp=2f5816d8be40b449d2473b22f9e0c33b32f3bd78]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 data/cputable | 1 +
15 scripts/t/Dpkg_Arch.t | 4 ++--
16 2 files changed, 3 insertions(+), 2 deletions(-)
17
18diff --git a/data/cputable b/data/cputable
19index a2bd7d6..9f2a8e0 100644
20--- a/data/cputable
21+++ b/data/cputable
22@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big
23 powerpcel powerpcle powerpcle 32 little
24 ppc64 powerpc64 (powerpc|ppc)64 64 big
25 ppc64el powerpc64le powerpc64le 64 little
26+riscv64 riscv64 riscv64 64 little
27 s390 s390 s390 32 big
28 s390x s390x s390x 64 big
29 sh3 sh3 sh3 32 little
30diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
31index d478b49..ecd5d66 100644
32--- a/scripts/t/Dpkg_Arch.t
33+++ b/scripts/t/Dpkg_Arch.t
34@@ -16,7 +16,7 @@
35 use strict;
36 use warnings;
37
38-use Test::More tests => 16367;
39+use Test::More tests => 16832;
40
41 use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
42 debarch_eq debarch_is debarch_is_wildcard
43@@ -162,7 +162,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet');
44 is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet');
45 is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet');
46
47-is(scalar get_valid_arches(), 524, 'expected amount of known architectures');
48+is(scalar get_valid_arches(), 539, 'expected amount of known architectures');
49
50 {
51 local $ENV{CC} = 'false';
52--
532.16.2
54
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 d56b8a69a3..d48386647e 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
@@ -1,12 +1,17 @@
1From 9d260d408f9e17abd1d1dccd685bd7e80a3655a9 Mon Sep 17 00:00:00 2001
2From: Donn Seeley <donn.seeley@windriver.com>
3Date: Tue, 25 Feb 2014 17:44:04 +0800
4Subject: [PATCH] dpkg: fix a link problem for dpkg-native on CentOS 5.8
5
1CentOS 5.8 kernels and headers support the sync_file_range() system call, 6CentOS 5.8 kernels and headers support the sync_file_range() system call,
2but glibc 2.5 doesn't provide the syscall stub. It appears that this 7but glibc 2.5 doesn't provide the syscall stub. It appears that this
3problem is known but will never be fixed: 8problem is known but will never be fixed:
4 9
5 https://bugzilla.redhat.com/show_bug.cgi?id=518581 10 https://bugzilla.redhat.com/show_bug.cgi?id=518581
6 11
7 Bug 518581 - [RHEL5] glibc misses sync_file_range syscall interface 12 Bug 518581 - [RHEL5] glibc misses sync_file_range syscall interface
8 13
9 Status: CLOSED CANTFIX 14 Status: CLOSED CANTFIX
10 Last Closed: 2009-11-22 22:19:55 15 Last Closed: 2009-11-22 22:19:55
11 16
12 Kirby Zhou 2009-08-20 23:37:55 EDT 17 Kirby Zhou 2009-08-20 23:37:55 EDT
@@ -60,13 +65,16 @@ Upstream-Status: Inappropriate [everyone else builds on newer hosts :-)]
60 65
61Signed-off-by: Donn Seeley <donn.seeley@windriver.com> 66Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
62Signed-off-by: Lei Liu <lei.liu2@windriver.com> 67Signed-off-by: Lei Liu <lei.liu2@windriver.com>
68
63--- 69---
64 src/archives.c | 4 ++-- 70 src/archives.c | 4 ++--
65 1 file changed, 2 insertions(+), 2 deletions(-) 71 1 file changed, 2 insertions(+), 2 deletions(-)
66 72
73diff --git a/src/archives.c b/src/archives.c
74index 4b2fc92..a92b795 100644
67--- a/src/archives.c 75--- a/src/archives.c
68+++ b/src/archives.c 76+++ b/src/archives.c
69@@ -75,7 +75,7 @@ 77@@ -69,7 +69,7 @@ fd_writeback_init(int fd)
70 /* Ignore the return code as it should be considered equivalent to an 78 /* Ignore the return code as it should be considered equivalent to an
71 * asynchronous hint for the kernel, we are doing an fsync() later on 79 * asynchronous hint for the kernel, we are doing an fsync() later on
72 * anyway. */ 80 * anyway. */
@@ -75,7 +83,7 @@ Signed-off-by: Lei Liu <lei.liu2@windriver.com>
75 sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); 83 sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE);
76 #elif defined(HAVE_POSIX_FADVISE) 84 #elif defined(HAVE_POSIX_FADVISE)
77 posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); 85 posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
78@@ -1179,7 +1179,7 @@ 86@@ -1078,7 +1078,7 @@ tarobject(void *ctx, struct tar_entry *ti)
79 return 0; 87 return 0;
80 } 88 }
81 89
@@ -84,3 +92,6 @@ Signed-off-by: Lei Liu <lei.liu2@windriver.com>
84 static void 92 static void
85 tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) 93 tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg)
86 { 94 {
95--
962.16.2
97
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
index c0c59f1410..6d8ec34768 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20170518T093838Z/pool/main/
14 file://0006-add-musleabi-to-known-target-tripets.patch \ 14 file://0006-add-musleabi-to-known-target-tripets.patch \
15 file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ 15 file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \
16 file://0001-dpkg-Support-muslx32-build.patch \ 16 file://0001-dpkg-Support-muslx32-build.patch \
17 file://0001-arch-Add-support-for-riscv64-CPU.patch \
17 " 18 "
18SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " 19SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch "
19 20