diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2023-12-04 14:54:52 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-12-03 23:07:10 -0800 |
| commit | 22051d98b39a60e036b84d9c9a1dd7b4c235f9d8 (patch) | |
| tree | d164d72bf8bbd8bfbf9965612ded915e49d40f56 /meta-gnome/recipes-connectivity | |
| parent | 5857cd0f42e138477c257e5552206b5bc62ada15 (diff) | |
| download | meta-openembedded-22051d98b39a60e036b84d9c9a1dd7b4c235f9d8.tar.gz | |
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 <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-connectivity')
| -rw-r--r-- | meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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 +} |