aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBöszörményi Zoltán <zboszor@pr.hu>2018-11-04 16:21:29 +0100
committerAlex J Lennon <ajlennon@dynamicdevices.co.uk>2018-11-06 16:53:39 +0000
commita3ec88520b450a49352a55a8d39e71b6557eed8f (patch)
tree61c34810ea83f2cc06e88e85cc3c45a455c77e3a
parentb2765ccae8915d12e093f2a979713cfd68d50f8b (diff)
downloadmeta-mono-a3ec88520b450a49352a55a8d39e71b6557eed8f.tar.gz
meta-mono-a3ec88520b450a49352a55a8d39e71b6557eed8f.tar.bz2
meta-mono-a3ec88520b450a49352a55a8d39e71b6557eed8f.zip
msbuild: Remove files conflicting with Mono 5.12
Signed-off-by: Böszörményi Zoltán <zboszor@pr.hu>
-rw-r--r--recipes-mono/msbuild/msbuild_git.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/recipes-mono/msbuild/msbuild_git.bb b/recipes-mono/msbuild/msbuild_git.bb
index 8a89543..62369b1 100644
--- a/recipes-mono/msbuild/msbuild_git.bb
+++ b/recipes-mono/msbuild/msbuild_git.bb
@@ -49,6 +49,11 @@ do_install () {
# End of conditional copies from install-mono-prefix.sh
sed -i -es,${D},,g ${D}${bindir}/msbuild
+
+ # There are two conflicting files in these directories
+ # across msbuild and mono 5.12.x
+ rm -rf ${D}${libdir}/mono/xbuild/15.0/Microsoft.Common.targets
+ rm -rf ${D}${libdir}/mono/xbuild/15.0/Imports/Microsoft.Common.props
}
do_install_append_class-target() {