diff options
author | wangmy <wangmy@fujitsu.com> | 2022-03-28 17:49:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-29 15:59:28 +0100 |
commit | b8016ddbeae1996aef4cba1219fa72fbd8b00eb5 (patch) | |
tree | dfc03825ae8e07b8ac84d43334edd942672227e6 /meta/recipes-devtools/apt | |
parent | 04af73b8ba59975ee1f2967a74e95f5a52b74c8d (diff) | |
download | poky-b8016ddbeae1996aef4cba1219fa72fbd8b00eb5.tar.gz |
apt: upgrade 2.4.0 -> 2.4.3
0001-aptwebserver.cc-Include-array.patch
refreshed for new version.
(From OE-Core rev: e147934d8dcb31a33ec3396d31a09aa9cdae2a90)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt')
-rw-r--r-- | meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt_2.4.3.bb (renamed from meta/recipes-devtools/apt/apt_2.4.0.bb) | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch b/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch index cfee50c7a0..2c1e617e55 100644 --- a/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch +++ b/meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f999aeb5ceb77b81c36e6a55300a521aaa2da882 Mon Sep 17 00:00:00 2001 | 1 | From 5985f366750a73c81c7d86893a2b959b4af062a5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 26 May 2021 22:12:46 -0700 | 3 | Date: Wed, 26 May 2021 22:12:46 -0700 |
4 | Subject: [PATCH] aptwebserver.cc: Include <array> | 4 | Subject: [PATCH] aptwebserver.cc: Include <array> |
@@ -11,22 +11,20 @@ test/interactive-helper/aptwebserver.cc:36:55: error: constexpr variable cannot | |||
11 | 11 | ||
12 | Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133] | 12 | Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133] |
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | |||
14 | --- | 15 | --- |
15 | test/interactive-helper/aptwebserver.cc | 1 + | 16 | test/interactive-helper/aptwebserver.cc | 1 + |
16 | 1 file changed, 1 insertion(+) | 17 | 1 file changed, 1 insertion(+) |
17 | 18 | ||
18 | diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc | 19 | diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc |
19 | index 58ba54f84..0e030c7e9 100644 | 20 | index f4f8d95..361c7a9 100644 |
20 | --- a/test/interactive-helper/aptwebserver.cc | 21 | --- a/test/interactive-helper/aptwebserver.cc |
21 | +++ b/test/interactive-helper/aptwebserver.cc | 22 | +++ b/test/interactive-helper/aptwebserver.cc |
22 | @@ -22,6 +22,7 @@ | 23 | @@ -23,6 +23,7 @@ |
23 | #include <unistd.h> | ||
24 | 24 | ||
25 | #include <array> | ||
25 | #include <algorithm> | 26 | #include <algorithm> |
26 | +#include <array> | 27 | +#include <array> |
27 | #include <fstream> | 28 | #include <fstream> |
28 | #include <iostream> | 29 | #include <iostream> |
29 | #include <list> | 30 | #include <list> |
30 | -- | ||
31 | 2.31.1 | ||
32 | |||
diff --git a/meta/recipes-devtools/apt/apt_2.4.0.bb b/meta/recipes-devtools/apt/apt_2.4.3.bb index c95e36e3d0..27e455747f 100644 --- a/meta/recipes-devtools/apt/apt_2.4.0.bb +++ b/meta/recipes-devtools/apt/apt_2.4.3.bb | |||
@@ -25,7 +25,7 @@ SRC_URI:append:class-nativesdk = " \ | |||
25 | file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ | 25 | file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ |
26 | " | 26 | " |
27 | 27 | ||
28 | SRC_URI[sha256sum] = "728c69df369cbc4a55f91fc2817fe9832c1a2f39de4142e7ef222c5158f234af" | 28 | SRC_URI[sha256sum] = "5a7215ca924302da0b2205862cd2d651326eea222a589184ec6ce663885729f7" |
29 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 29 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
30 | 30 | ||
31 | # the package is taken from snapshots.debian.org; that source is static and goes stale | 31 | # the package is taken from snapshots.debian.org; that source is static and goes stale |