From 23b6654f880da2846d9dcd1cec93b8675b667961 Mon Sep 17 00:00:00 2001 From: Alexey Minnekhanov Date: Mon, 27 Sep 2021 21:05:53 +0300 Subject: [PATCH] cross/binutils-*: hotfix for file conflict with non-cross binutils Newly generated binutils package has file conflicsts with non-cross binutils. ERROR: binutils-2.37-r3: trying to overwrite usr/lib/bfd-plugins/libdep.so owned by binutils-aarch64-2.37-r3. Attmpt to fix this quickly to unblock bpo and users --- cross/binutils-aarch64/APKBUILD | 3 +++ cross/binutils-armhf/APKBUILD | 3 +++ cross/binutils-armv7/APKBUILD | 3 +++ 3 files changed, 9 insertions(+) diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD index dd73a85a9..64cf31970 100644 --- a/cross/binutils-aarch64/APKBUILD +++ b/cross/binutils-aarch64/APKBUILD @@ -65,6 +65,9 @@ package() { # remove man, info folders rm -rf "$pkgdir"/usr/share + + # remove files that conflict with non-cross binutils + rm -rf "$pkgdir"/usr/lib/bfd-plugins } diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD index bf13609b3..c8e3675eb 100644 --- a/cross/binutils-armhf/APKBUILD +++ b/cross/binutils-armhf/APKBUILD @@ -65,6 +65,9 @@ package() { # remove man, info folders rm -rf "$pkgdir"/usr/share + + # remove files that conflict with non-cross binutils + rm -rf "$pkgdir"/usr/lib/bfd-plugins } diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD index fe167a5bc..933b550b2 100644 --- a/cross/binutils-armv7/APKBUILD +++ b/cross/binutils-armv7/APKBUILD @@ -65,6 +65,9 @@ package() { # remove man, info folders rm -rf "$pkgdir"/usr/share + + # remove files that conflict with non-cross binutils + rm -rf "$pkgdir"/usr/lib/bfd-plugins }