aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/udisks
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2015-06-11 16:15:03 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-06-23 12:40:10 +0200
commit8f7ee00291f0e693223ebf0644386206dcf8e64b (patch)
tree5b108c602fb6de7e766c7c20b585a23db5728714 /meta-oe/recipes-support/udisks
parent4e3fd58988b5d40bb2fb699ffdaecc8b088a4372 (diff)
downloadmeta-openembedded-contrib-8f7ee00291f0e693223ebf0644386206dcf8e64b.tar.gz
meta-openembedded-contrib-8f7ee00291f0e693223ebf0644386206dcf8e64b.tar.bz2
meta-openembedded-contrib-8f7ee00291f0e693223ebf0644386206dcf8e64b.zip
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/udisks')
-rw-r--r--meta-oe/recipes-support/udisks/udisks2_2.1.5.bb7
-rw-r--r--meta-oe/recipes-support/udisks/udisks_1.0.4.bb4
2 files changed, 8 insertions, 3 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"