1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00

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>
This commit is contained in:
Khem Raj
2018-03-16 20:40:36 -07:00
committed by Richard Purdie
parent 9a6b5496a4
commit 35b28399d5
3 changed files with 71 additions and 5 deletions
@@ -0,0 +1,54 @@
From 319f32d743f5b5e725012654d124e49226d5de91 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 16 Mar 2018 20:28:24 -0700
Subject: [PATCH] arch: Add support for riscv64 CPU
* Architecture support:
- Add support for riscv64 CPU. Closes: #822914
Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
Upstream-Status: Backport [https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=dpkg%2Fdpkg.git;a=commitdiff_plain;h=ee0855cc66076691de4796be48f8a0d889fde001;hp=2f5816d8be40b449d2473b22f9e0c33b32f3bd78]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
data/cputable | 1 +
scripts/t/Dpkg_Arch.t | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/data/cputable b/data/cputable
index a2bd7d6..9f2a8e0 100644
--- a/data/cputable
+++ b/data/cputable
@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big
powerpcel powerpcle powerpcle 32 little
ppc64 powerpc64 (powerpc|ppc)64 64 big
ppc64el powerpc64le powerpc64le 64 little
+riscv64 riscv64 riscv64 64 little
s390 s390 s390 32 big
s390x s390x s390x 64 big
sh3 sh3 sh3 32 little
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index d478b49..ecd5d66 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -16,7 +16,7 @@
use strict;
use warnings;
-use Test::More tests => 16367;
+use Test::More tests => 16832;
use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
debarch_eq debarch_is debarch_is_wildcard
@@ -162,7 +162,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet');
is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet');
is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet');
-is(scalar get_valid_arches(), 524, 'expected amount of known architectures');
+is(scalar get_valid_arches(), 539, 'expected amount of known architectures');
{
local $ENV{CC} = 'false';
--
2.16.2
@@ -1,3 +1,8 @@
From 9d260d408f9e17abd1d1dccd685bd7e80a3655a9 Mon Sep 17 00:00:00 2001
From: Donn Seeley <donn.seeley@windriver.com>
Date: Tue, 25 Feb 2014 17:44:04 +0800
Subject: [PATCH] dpkg: fix a link problem for dpkg-native on CentOS 5.8
CentOS 5.8 kernels and headers support the sync_file_range() system call, CentOS 5.8 kernels and headers support the sync_file_range() system call,
but glibc 2.5 doesn't provide the syscall stub. It appears that this but glibc 2.5 doesn't provide the syscall stub. It appears that this
problem is known but will never be fixed: problem is known but will never be fixed:
@@ -60,13 +65,16 @@ Upstream-Status: Inappropriate [everyone else builds on newer hosts :-)]
Signed-off-by: Donn Seeley <donn.seeley@windriver.com> Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
Signed-off-by: Lei Liu <lei.liu2@windriver.com> Signed-off-by: Lei Liu <lei.liu2@windriver.com>
--- ---
src/archives.c | 4 ++-- src/archives.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/archives.c b/src/archives.c
index 4b2fc92..a92b795 100644
--- a/src/archives.c --- a/src/archives.c
+++ b/src/archives.c +++ b/src/archives.c
@@ -75,7 +75,7 @@ @@ -69,7 +69,7 @@ fd_writeback_init(int fd)
/* Ignore the return code as it should be considered equivalent to an /* Ignore the return code as it should be considered equivalent to an
* asynchronous hint for the kernel, we are doing an fsync() later on * asynchronous hint for the kernel, we are doing an fsync() later on
* anyway. */ * anyway. */
@@ -75,7 +83,7 @@ Signed-off-by: Lei Liu <lei.liu2@windriver.com>
sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE); sync_file_range(fd, 0, 0, SYNC_FILE_RANGE_WRITE);
#elif defined(HAVE_POSIX_FADVISE) #elif defined(HAVE_POSIX_FADVISE)
posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED); posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
@@ -1179,7 +1179,7 @@ @@ -1078,7 +1078,7 @@ tarobject(void *ctx, struct tar_entry *ti)
return 0; return 0;
} }
@@ -84,3 +92,6 @@ Signed-off-by: Lei Liu <lei.liu2@windriver.com>
static void static void
tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg) tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg)
{ {
--
2.16.2
@@ -14,6 +14,7 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20170518T093838Z/pool/main/
file://0006-add-musleabi-to-known-target-tripets.patch \ file://0006-add-musleabi-to-known-target-tripets.patch \
file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \
file://0001-dpkg-Support-muslx32-build.patch \ file://0001-dpkg-Support-muslx32-build.patch \
file://0001-arch-Add-support-for-riscv64-CPU.patch \
" "
SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch "