summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-03-28 17:49:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-29 15:58:38 +0100
commite147934d8dcb31a33ec3396d31a09aa9cdae2a90 (patch)
treea8107eacf46b0eb547d47c0b45f499cbf8ef42ae
parent59041a5f945d480503e391f5f210f383412646b9 (diff)
downloadopenembedded-core-contrib-e147934d8dcb31a33ec3396d31a09aa9cdae2a90.tar.gz
apt: upgrade 2.4.0 -> 2.4.3
0001-aptwebserver.cc-Include-array.patch refreshed for new version. 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>
-rw-r--r--meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch12
-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 @@
-From f999aeb5ceb77b81c36e6a55300a521aaa2da882 Mon Sep 17 00:00:00 2001
+From 5985f366750a73c81c7d86893a2b959b4af062a5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 26 May 2021 22:12:46 -0700
Subject: [PATCH] aptwebserver.cc: Include <array>
@@ -11,22 +11,20 @@ test/interactive-helper/aptwebserver.cc:36:55: error: constexpr variable cannot
Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
---
test/interactive-helper/aptwebserver.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
-index 58ba54f84..0e030c7e9 100644
+index f4f8d95..361c7a9 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
-@@ -22,6 +22,7 @@
- #include <unistd.h>
+@@ -23,6 +23,7 @@
+ #include <array>
#include <algorithm>
+#include <array>
#include <fstream>
#include <iostream>
#include <list>
---
-2.31.1
-
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 = " \
file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
"
-SRC_URI[sha256sum] = "728c69df369cbc4a55f91fc2817fe9832c1a2f39de4142e7ef222c5158f234af"
+SRC_URI[sha256sum] = "5a7215ca924302da0b2205862cd2d651326eea222a589184ec6ce663885729f7"
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
# the package is taken from snapshots.debian.org; that source is static and goes stale