synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Alexey Min 2021-09-27 20:34:49 +03:00 committed by Oliver Smith
parent 2d23849aa3
commit 5761a29f07
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmb/aportgen/binutils.py
View File

@ -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,

3
test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD vendored
View File

@ -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
}