diff options
| author | Changqing Li <changqing.li@windriver.com> | 2024-06-18 11:30:18 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-07-12 05:47:20 -0700 |
| commit | 5c6ffbcfa13615b6f0057fa5344bf1607336e526 (patch) | |
| tree | c23efd067b2881fd24c6b5e68d1d619f7cca565d | |
| parent | 47789523ddcc62fde6c55eb1bfbfe7bd3ce4cd11 (diff) | |
| download | poky-5c6ffbcfa13615b6f0057fa5344bf1607336e526.tar.gz | |
apt-native: don't let dpkg overwrite files by default
With --force-overwrite (implied by --force-all), dpkg will not abort
when a package overwrites files from different packages. As this can
also lead to "The following package disappeared from your system as
all files have been overwritten by other packages: <package>" and
subsequently broken dependencies, this makes the simple case of
conflicting files hard to debug.
Instead of finding all possibly required force options, only disable
overwrite for now.
(From OE-Core rev: 30cc69f094729e3d11dc6021daf77f5038c4de61)
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Take back from https://git.openembedded.org/openembedded-core/commit/?id=4292387ef6c4e80428bad6a07c844a288b27d9a1
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-devtools/apt/apt_2.6.1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index fb4ff899d2..e688d30cae 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb | |||
| @@ -111,7 +111,7 @@ Acquire | |||
| 111 | AllowInsecureRepositories "true"; | 111 | AllowInsecureRepositories "true"; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; | 114 | DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-force-overwrite";"--no-debsig"}; |
| 115 | DPkg::Path ""; | 115 | DPkg::Path ""; |
| 116 | EOF | 116 | EOF |
| 117 | } | 117 | } |
