diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2015-06-11 16:15:03 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-23 12:40:10 +0200 |
| commit | 8f7ee00291f0e693223ebf0644386206dcf8e64b (patch) | |
| tree | 5b108c602fb6de7e766c7c20b585a23db5728714 /meta-oe/recipes-support | |
| parent | 4e3fd58988b5d40bb2fb699ffdaecc8b088a4372 (diff) | |
| download | meta-openembedded-contrib-8f7ee00291f0e693223ebf0644386206dcf8e64b.tar.gz | |
meta-oe: fix the install dir for udev rules and files
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>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/udisks/udisks2_2.1.5.bb | 7 | ||||
| -rw-r--r-- | meta-oe/recipes-support/udisks/udisks_1.0.4.bb | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb index 4ff6687a38..1c76d81b7a 100644 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb @@ -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" diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb index e8a4e55c03..4bd65d3539 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb @@ -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" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb index 5e95bb9442..52a2f5688c 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.2.0.bb @@ -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" |