mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
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>
This commit is contained in:
parent
5857cd0f42
commit
22051d98b3
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user