mirror of
https://git.yoctoproject.org/poky
synced 2026-06-06 14:49:50 +00:00
dpkg: update 1.20.9 -> 1.21.1
(From OE-Core rev: f274f495aedd42c951aafd2cec39be159225b3c5) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
cd31c6e4ba
commit
7737b1e93a
@@ -61,6 +61,8 @@ PROV:class-nativesdk = ""
|
||||
|
||||
PROVIDES += "${PROV}"
|
||||
|
||||
FILES:${PN} += "${datadir}/zsh"
|
||||
|
||||
PACKAGES =+ "update-alternatives-dpkg"
|
||||
FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
|
||||
RPROVIDES:update-alternatives-dpkg += "update-alternatives"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc Mon Sep 17 00:00:00 2001
|
||||
From cb47e9cd6735fcafd231748dab8884ae991b669c Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
|
||||
Date: Tue, 16 Jun 2020 03:57:25 +0000
|
||||
Subject: [PATCH] build.c: ignore return of 1 from tar -cf
|
||||
@@ -29,10 +29,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
|
||||
index d13a21c1e..059f2be6d 100644
|
||||
index 76613adec..7c216d1a9 100644
|
||||
--- a/dpkg-deb/build.c
|
||||
+++ b/dpkg-deb/build.c
|
||||
@@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
|
||||
@@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
|
||||
{
|
||||
int pipe_filenames[2], pipe_tarball[2];
|
||||
pid_t pid_tar, pid_comp;
|
||||
@@ -40,7 +40,7 @@ index d13a21c1e..059f2be6d 100644
|
||||
|
||||
/* Fork off a tar. We will feed it a list of filenames on stdin later. */
|
||||
m_pipe(pipe_filenames);
|
||||
@@ -532,7 +533,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
|
||||
@@ -534,7 +535,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
|
||||
/* All done, clean up wait for tar and <compress> to finish their job. */
|
||||
close(pipe_filenames[1]);
|
||||
subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
From c6acfba64b470c7e919fd5bd29124d7228492537 Mon Sep 17 00:00:00 2001
|
||||
From: Guillem Jover <guillem@debian.org>
|
||||
Date: Fri, 28 May 2021 04:07:49 +0200
|
||||
Subject: [PATCH] arch: Add support for ARCv2 CPU
|
||||
|
||||
This is based on the ARCv2 32-bit little-endian hard-float ISA.
|
||||
|
||||
Closes: #980963
|
||||
|
||||
Upstream-Status: Backport [https://salsa.debian.org/dpkg-team/dpkg/-/commit/0d134cdcb0dcc6b21fa7926964c1426a5821181d]
|
||||
|
||||
Based-on-patch-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
|
||||
Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
|
||||
---
|
||||
data/cputable | 1 +
|
||||
scripts/Dpkg/Shlibs/Objdump.pm | 1 +
|
||||
scripts/t/Dpkg_Arch.t | 4 ++--
|
||||
3 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/data/cputable b/data/cputable
|
||||
index 9f2a8e0e4..277bed88f 100644
|
||||
--- a/data/cputable
|
||||
+++ b/data/cputable
|
||||
@@ -20,6 +20,7 @@ i386 i686 (i[34567]86|pentium) 32 little
|
||||
ia64 ia64 ia64 64 little
|
||||
alpha alpha alpha.* 64 little
|
||||
amd64 x86_64 (amd64|x86_64) 64 little
|
||||
+arc arc arc 32 little
|
||||
armeb armeb arm.*b 32 big
|
||||
arm arm arm.* 32 little
|
||||
arm64 aarch64 aarch64 64 little
|
||||
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
|
||||
index 4cee866e7..93319d1eb 100644
|
||||
--- a/scripts/Dpkg/Shlibs/Objdump.pm
|
||||
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
|
||||
@@ -100,6 +100,7 @@ use constant {
|
||||
ELF_MACH_OR1K => 92,
|
||||
ELF_MACH_XTENSA => 94,
|
||||
ELF_MACH_MICROBLAZE => 189,
|
||||
+ ELF_MACH_ARCV2 => 195,
|
||||
ELF_MACH_AVR_OLD => 0x1057,
|
||||
ELF_MACH_OR1K_OLD => 0x8472,
|
||||
ELF_MACH_ALPHA => 0x9026,
|
||||
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
|
||||
index a3a9e6fee..f0bba272a 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 => 16836;
|
||||
+use Test::More tests => 18407;
|
||||
|
||||
use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
|
||||
debarch_eq debarch_is debarch_is_wildcard
|
||||
@@ -174,7 +174,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(), 539, 'expected amount of known architectures');
|
||||
+is(scalar get_valid_arches(), 554, 'expected amount of known architectures');
|
||||
|
||||
{
|
||||
local $ENV{CC} = 'false';
|
||||
--
|
||||
2.16.2
|
||||
|
||||
+2
-3
@@ -1,7 +1,7 @@
|
||||
require dpkg.inc
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.x \
|
||||
SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \
|
||||
file://noman.patch \
|
||||
file://remove-tar-no-timestamp.patch \
|
||||
file://arch_pm.patch \
|
||||
@@ -14,11 +14,10 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.
|
||||
file://0001-dpkg-Support-muslx32-build.patch \
|
||||
file://pager.patch \
|
||||
file://0001-Add-support-for-riscv32-CPU.patch \
|
||||
file://0014-arch-Add-support-for-ARCv2-CPU.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
|
||||
|
||||
SRCREV = "2177b782b16e77e97c9643961a5ae3c639bcc4a3"
|
||||
SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
Reference in New Issue
Block a user