summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2020-04-01 16:58:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-17 08:29:02 +0100
commit5ab3ff5dcc7ec987a57276cd88a31c4a148f4490 (patch)
tree21d43e3583b69653252c86e11482660f76888d97 /meta
parent3e311128b2514f4303422cfd9d455ff5965ea55a (diff)
downloadpoky-5ab3ff5dcc7ec987a57276cd88a31c4a148f4490.tar.gz
lib/oe/package_manager: make sure to not remove packages in apt install
apt install can decide to remove already installed packages if there are conflicts. Avoid this by explicitly specifying --no-remove. This will then cause a "E: Packages need to be removed but remove is disabled." message. (From OE-Core rev: 15790fa224f405652e8ccc93c01dee04a7259246) Signed-off-by: Jan Luebbe <jlu@pengutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 9605a488b55042add012e9aeef13ab3f4e70e6e5) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 7c373715ad..61206daeaa 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1619,7 +1619,7 @@ class DpkgPM(OpkgDpkgPM):
1619 1619
1620 os.environ['APT_CONFIG'] = self.apt_conf_file 1620 os.environ['APT_CONFIG'] = self.apt_conf_file
1621 1621
1622 cmd = "%s %s install --force-yes --allow-unauthenticated %s" % \ 1622 cmd = "%s %s install --force-yes --allow-unauthenticated --no-remove %s" % \
1623 (self.apt_get_cmd, self.apt_args, ' '.join(pkgs)) 1623 (self.apt_get_cmd, self.apt_args, ' '.join(pkgs))
1624 1624
1625 try: 1625 try: