summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-03-20 14:49:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-23 22:51:25 +0000
commit94fa96262a5868c615ccf407bd0c4c40ca9c8cae (patch)
treef4f49024a5888e045d07980e3f69e9f5a36f1dfc /meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
parent3c48fe13f357d54235a7e624de1f9a99b5e36e44 (diff)
downloadpoky-94fa96262a5868c615ccf407bd0c4c40ca9c8cae.tar.gz
apt: update 1.8.2.2 -> 2.2.2
Drop 0001-test-libapt-do-not-use-gtest-from-the-host.patch (replaced by WITH_TESTS option). Drop 0001-Do-not-configure-packages-on-installation.patch (no longer necessary). Adjust build dependencies. (From OE-Core rev: f0ede019c828249688e2b287b7845f4ebd2d6203) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch')
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
index 37f969690c..c14dc2a414 100644
--- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
+++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
@@ -1,4 +1,4 @@
1From 34700bebc52659e7e3eecd252f65bd36e669eee8 Mon Sep 17 00:00:00 2001 1From a603b3281f3f60a87531c8cec4843f970170d409 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 21 May 2020 20:13:25 +0000 3Date: Thu, 21 May 2020 20:13:25 +0000
4Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our 4Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our
@@ -20,10 +20,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
20 1 file changed, 2 insertions(+), 7 deletions(-) 20 1 file changed, 2 insertions(+), 7 deletions(-)
21 21
22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc 22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
23index ffa880d..5875e86 100644 23index 46a6dee..8617a9e 100644
24--- a/apt-pkg/deb/dpkgpm.cc 24--- a/apt-pkg/deb/dpkgpm.cc
25+++ b/apt-pkg/deb/dpkgpm.cc 25+++ b/apt-pkg/deb/dpkgpm.cc
26@@ -1215,12 +1215,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() 26@@ -1211,12 +1211,6 @@ void pkgDPkgPM::BuildPackagesProgressMap()
27 } 27 }
28 } 28 }
29 } 29 }
@@ -35,8 +35,8 @@ index ffa880d..5875e86 100644
35- ++PackagesTotal; 35- ++PackagesTotal;
36 } 36 }
37 /*}}}*/ 37 /*}}}*/
38 bool pkgDPkgPM::Go(int StatusFd) /*{{{*/ 38 void pkgDPkgPM::StartPtyMagic() /*{{{*/
39@@ -1716,7 +1710,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) 39@@ -1710,7 +1704,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
40 40
41 // support subpressing of triggers processing for special 41 // support subpressing of triggers processing for special
42 // cases like d-i that runs the triggers handling manually 42 // cases like d-i that runs the triggers handling manually