From 5761a29f0700c0add9b84c9c1fccfef13e8dac8f Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com>
Date: Mon, 27 Sep 2021 20:34:49 +0300
Subject: [PATCH] pmb.aportgen.binutils: fix for new binutils file conflict (MR
 2116)

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.

Fix the generator to produce package that does not include these plugins.
---
 pmb/aportgen/binutils.py                                      | 3 +++
 test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pmb/aportgen/binutils.py b/pmb/aportgen/binutils.py
index 85ffb041..3c5e9aaf 100644
--- a/pmb/aportgen/binutils.py
+++ b/pmb/aportgen/binutils.py
@@ -45,6 +45,9 @@ def generate(args, pkgname):
 
             # remove man, info folders
             rm -rf "$pkgdir"/usr/share
+
+            # remove files that conflict with non-cross binutils
+            rm -rf "$pkgdir"/usr/lib/bfd-plugins
         """,
         "libs": None,
         "gold": None,
diff --git a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD
index 2c416ab9..44d38192 100644
--- a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD
+++ b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD
@@ -63,6 +63,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
 }