mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-02-21 04:30:31 +00:00
gnome-control-center: Unbreak gnome images
images that now include both shared-mime-info and gnome-control-center We get
Collected errors:
* check_data_file_clashes: Package gnome-control-center wants to
* install file
* /home/kraj/work/angstrom-repo/build/tmp-angstrom_next-eglibc/work/beaglebone-angstrom-linux-gnueabi/systemd-gnome-image/1.0-r0/rootfs/usr/share/mime/generic-icons
But that file is already provided by package * shared-mime-info
This brings it back to wheree it was additionally removes the packaging
warnings
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -16,13 +16,15 @@ LDFLAGS += "-lgthread-2.0 -lxml2"
|
||||
do_configure_prepend() {
|
||||
sed -i s:help::g Makefile.am
|
||||
}
|
||||
do_install_append() {
|
||||
rm -rf ${D}${datadir}/mime
|
||||
}
|
||||
|
||||
FILES_${PN} += "${datadir}/icon* \
|
||||
${datadir}/xsession* \
|
||||
${libdir}/window-manager-settings/*.so \
|
||||
${datadir}/gnome \
|
||||
${datadir}/desktop-directories \
|
||||
${datadir}/mime \
|
||||
"
|
||||
FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
|
||||
FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la"
|
||||
|
||||
Reference in New Issue
Block a user