From 22051d98b39a60e036b84d9c9a1dd7b4c235f9d8 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 4 Dec 2023 14:54:52 +0800 Subject: libnma: remove conflict xml file The file org.gnome.nm-applet.gschema.xml conflicts with the one provided by network-manager-applet, so remove it from libnma and use the one from network-manager-applet. | Error: Transaction test error: | file /usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml conflicts between attempted installs of network-manager-applet-1.34.0-r0.core2_ 64 and libnma-1.10.6-r0.core2_64 Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb index 997a5a71b3..9a4dad35d1 100644 --- a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb +++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb @@ -26,3 +26,8 @@ EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" GTKDOC_MESON_OPTION = "gtk_doc" + +do_install:append() { + # conflicts with the file provided by network-manager-applet + rm -f ${D}${datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +} -- cgit v1.2.3-54-g00ecf