diff options
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch | 68 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.21.1.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.20.9.bb) | 5 |
4 files changed, 8 insertions, 75 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 80865a31a1..00b1e9187a 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -61,6 +61,8 @@ PROV:class-nativesdk = "" | |||
61 | 61 | ||
62 | PROVIDES += "${PROV}" | 62 | PROVIDES += "${PROV}" |
63 | 63 | ||
64 | FILES:${PN} += "${datadir}/zsh" | ||
65 | |||
64 | PACKAGES =+ "update-alternatives-dpkg" | 66 | PACKAGES =+ "update-alternatives-dpkg" |
65 | FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" | 67 | FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" |
66 | RPROVIDES:update-alternatives-dpkg += "update-alternatives" | 68 | RPROVIDES:update-alternatives-dpkg += "update-alternatives" |
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index 2dc68e2064..4d3f238012 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc Mon Sep 17 00:00:00 2001 | 1 | From cb47e9cd6735fcafd231748dab8884ae991b669c Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.microsoft.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.microsoft.com> |
3 | Date: Tue, 16 Jun 2020 03:57:25 +0000 | 3 | Date: Tue, 16 Jun 2020 03:57:25 +0000 |
4 | Subject: [PATCH] build.c: ignore return of 1 from tar -cf | 4 | Subject: [PATCH] build.c: ignore return of 1 from tar -cf |
@@ -29,10 +29,10 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> | |||
29 | 1 file changed, 4 insertions(+), 1 deletion(-) | 29 | 1 file changed, 4 insertions(+), 1 deletion(-) |
30 | 30 | ||
31 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c | 31 | diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c |
32 | index d13a21c1e..059f2be6d 100644 | 32 | index 76613adec..7c216d1a9 100644 |
33 | --- a/dpkg-deb/build.c | 33 | --- a/dpkg-deb/build.c |
34 | +++ b/dpkg-deb/build.c | 34 | +++ b/dpkg-deb/build.c |
35 | @@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 35 | @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
36 | { | 36 | { |
37 | int pipe_filenames[2], pipe_tarball[2]; | 37 | int pipe_filenames[2], pipe_tarball[2]; |
38 | pid_t pid_tar, pid_comp; | 38 | pid_t pid_tar, pid_comp; |
@@ -40,7 +40,7 @@ index d13a21c1e..059f2be6d 100644 | |||
40 | 40 | ||
41 | /* Fork off a tar. We will feed it a list of filenames on stdin later. */ | 41 | /* Fork off a tar. We will feed it a list of filenames on stdin later. */ |
42 | m_pipe(pipe_filenames); | 42 | m_pipe(pipe_filenames); |
43 | @@ -532,7 +533,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 43 | @@ -534,7 +535,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
44 | /* All done, clean up wait for tar and <compress> to finish their job. */ | 44 | /* All done, clean up wait for tar and <compress> to finish their job. */ |
45 | close(pipe_filenames[1]); | 45 | close(pipe_filenames[1]); |
46 | subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); | 46 | subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); |
diff --git a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch deleted file mode 100644 index ece18a33ac..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From c6acfba64b470c7e919fd5bd29124d7228492537 Mon Sep 17 00:00:00 2001 | ||
2 | From: Guillem Jover <guillem@debian.org> | ||
3 | Date: Fri, 28 May 2021 04:07:49 +0200 | ||
4 | Subject: [PATCH] arch: Add support for ARCv2 CPU | ||
5 | |||
6 | This is based on the ARCv2 32-bit little-endian hard-float ISA. | ||
7 | |||
8 | Closes: #980963 | ||
9 | |||
10 | Upstream-Status: Backport [https://salsa.debian.org/dpkg-team/dpkg/-/commit/0d134cdcb0dcc6b21fa7926964c1426a5821181d] | ||
11 | |||
12 | Based-on-patch-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> | ||
13 | Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> | ||
14 | --- | ||
15 | data/cputable | 1 + | ||
16 | scripts/Dpkg/Shlibs/Objdump.pm | 1 + | ||
17 | scripts/t/Dpkg_Arch.t | 4 ++-- | ||
18 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/data/cputable b/data/cputable | ||
21 | index 9f2a8e0e4..277bed88f 100644 | ||
22 | --- a/data/cputable | ||
23 | +++ b/data/cputable | ||
24 | @@ -20,6 +20,7 @@ i386 i686 (i[34567]86|pentium) 32 little | ||
25 | ia64 ia64 ia64 64 little | ||
26 | alpha alpha alpha.* 64 little | ||
27 | amd64 x86_64 (amd64|x86_64) 64 little | ||
28 | +arc arc arc 32 little | ||
29 | armeb armeb arm.*b 32 big | ||
30 | arm arm arm.* 32 little | ||
31 | arm64 aarch64 aarch64 64 little | ||
32 | diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm | ||
33 | index 4cee866e7..93319d1eb 100644 | ||
34 | --- a/scripts/Dpkg/Shlibs/Objdump.pm | ||
35 | +++ b/scripts/Dpkg/Shlibs/Objdump.pm | ||
36 | @@ -100,6 +100,7 @@ use constant { | ||
37 | ELF_MACH_OR1K => 92, | ||
38 | ELF_MACH_XTENSA => 94, | ||
39 | ELF_MACH_MICROBLAZE => 189, | ||
40 | + ELF_MACH_ARCV2 => 195, | ||
41 | ELF_MACH_AVR_OLD => 0x1057, | ||
42 | ELF_MACH_OR1K_OLD => 0x8472, | ||
43 | ELF_MACH_ALPHA => 0x9026, | ||
44 | diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t | ||
45 | index a3a9e6fee..f0bba272a 100644 | ||
46 | --- a/scripts/t/Dpkg_Arch.t | ||
47 | +++ b/scripts/t/Dpkg_Arch.t | ||
48 | @@ -16,7 +16,7 @@ | ||
49 | use strict; | ||
50 | use warnings; | ||
51 | |||
52 | -use Test::More tests => 16836; | ||
53 | +use Test::More tests => 18407; | ||
54 | |||
55 | use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch | ||
56 | debarch_eq debarch_is debarch_is_wildcard | ||
57 | @@ -174,7 +174,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet'); | ||
58 | is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet'); | ||
59 | is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet'); | ||
60 | |||
61 | -is(scalar get_valid_arches(), 539, 'expected amount of known architectures'); | ||
62 | +is(scalar get_valid_arches(), 554, 'expected amount of known architectures'); | ||
63 | |||
64 | { | ||
65 | local $ENV{CC} = 'false'; | ||
66 | -- | ||
67 | 2.16.2 | ||
68 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb index 4c587f2bf2..ccb4f06d32 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.21.1.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require dpkg.inc | 1 | require dpkg.inc |
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
3 | 3 | ||
4 | SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.x \ | 4 | SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ |
5 | file://noman.patch \ | 5 | file://noman.patch \ |
6 | file://remove-tar-no-timestamp.patch \ | 6 | file://remove-tar-no-timestamp.patch \ |
7 | file://arch_pm.patch \ | 7 | file://arch_pm.patch \ |
@@ -14,11 +14,10 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20. | |||
14 | file://0001-dpkg-Support-muslx32-build.patch \ | 14 | file://0001-dpkg-Support-muslx32-build.patch \ |
15 | file://pager.patch \ | 15 | file://pager.patch \ |
16 | file://0001-Add-support-for-riscv32-CPU.patch \ | 16 | file://0001-Add-support-for-riscv32-CPU.patch \ |
17 | file://0014-arch-Add-support-for-ARCv2-CPU.patch \ | ||
18 | " | 17 | " |
19 | 18 | ||
20 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" | 19 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" |
21 | 20 | ||
22 | SRCREV = "2177b782b16e77e97c9643961a5ae3c639bcc4a3" | 21 | SRCREV = "9b52f8fa74571049d868cb2af0643ee7f89a6151" |
23 | 22 | ||
24 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |