helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta-oe: fix the install dir for udev rules and files

Browse Source 
When enable multilib, some packages try to install udev rules and
related files into /lib64/udev/ directory. But these files should
be installed in /lib/udev/ directory even on multilib.
Use ${nonarch_base_libdir} instead of ${base_libdir} to fix it.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
This commit is contained in:
Yi Zhao 2015-06-11 16:15:03 +08:00 committed by Martin Jansa
parent 4e3fd58988
commit 8f7ee00291
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
View File

@ -49,13 +49,13 @@ PACKAGES =+ "libmtp-common libmtp-runtime mtp-tools"
RDEPENDS_${PN} += "libmtp-common"
RRECOMMENDS_${PN} += "libmtp-runtime mtp-tools"
FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
PKG_${PN}-bin = "mtp-tools"
SUMMARY_${PN}-bin = "Tools for communicating with MTP devices"
DESCRIPTION_${PN}-bin = "${DESCRIPTION}\nThis package contains tools for communicating with MTP devices."
FILES_libmtp-common = "${base_libdir}/udev/rules.d/*"
FILES_libmtp-common = "${nonarch_base_libdir}/udev/rules.d/*"
SUMMARY_libmtp-common = "The udev rules file for MTP devices"
FILES_libmtp-runtime = "${base_libdir}/udev/mtp-probe"
FILES_libmtp-runtime = "${nonarch_base_libdir}/udev/mtp-probe"
DEPENDS_libmtp-runtime = "libmtp-common"
SUMMARY_libmtp-runtime = "mtp-probe, used for the MTP udev rules"
DESCRIPTION_libmtp-runtime = "This package provides mtp-probe, a program to probe newly connected device interfaces from userspace to determine if they are MTP devices, used for udev rules."

2
meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
View File

@ -52,7 +52,7 @@ RDEPENDS_${PN} = "bash"
FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*"
FILES_${PN} += "${base_libdir}/udev/* ${datadir}/hal"
FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal"
FILES_${PN}-dbg += "${libdir}/*/*/.debug"
FILES_${PN}-dev += "${libdir}/*/*/*.la"

7
meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
View File

@ -6,6 +6,8 @@ DEPENDS = "libatasmart polkit udev dbus-glib glib-2.0 intltool-native gnome-comm
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
RDEPENDS_${PN} = "acl"
SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2"
SRC_URI[md5sum] = "73632501002e6de8244f831e38b2b98e"
SRC_URI[sha256sum] = "2cfcf560447ea44cba2a683342c7062aaaf35e4eb554bed64ac2dd55a70a5fb6"
@ -19,7 +21,8 @@ EXTRA_OECONF = "--disable-introspection --disable-man"
FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
${datadir}/dbus-1/ \
${datadir}/polkit-1 \
${base_libdir}/udev/* \
${nonarch_base_libdir}/udev/* \
${exec_prefix}${nonarch_base_libdir}/udisks2/* \
"
PACKAGES =+ "${PN}-libs"
@ -27,5 +30,7 @@ PACKAGES =+ "${PN}-libs"
FILES_${PN} += "${datadir}/bash-completion"
FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/udisks2/.debug"
SYSTEMD_SERVICE_${PN} = "${BPN}.service"
SYSTEMD_AUTO_ENABLE = "disable"

4
meta-oe/recipes-support/udisks/udisks_1.0.4.bb
View File

@ -27,10 +27,10 @@ EXTRA_OECONF = "--disable-man-pages"
FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
${datadir}/dbus-1/ \
${datadir}/polkit-1 \
${base_libdir}/udev/* \
${nonarch_base_libdir}/udev/* \
"
FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"

2
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb
View File

@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb
EXTRA_OEMAKE = "TCL=${bindir}/tclsh"
FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
RDEPENDS_${PN} = "tcl"
RRECOMMENDS_${PN} = "usb-modeswitch-data"