summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor
diff options
context:
space:
mode:
authorAnton Blanchard <anton@ozlabs.org>2021-08-17 08:51:27 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-08-17 17:51:56 +0300
commit782d7195eac9bb9e05f86477b9537dbbee26930c (patch)
tree459a1d60da8a54ccc7eec4c5dd8b5e8a6c664bb7 /meta-phosphor/recipes-phosphor
parent3f248dc32aa8c8f9c294d955fe0f19d8c8c4579a (diff)
downloadopenbmc-782d7195eac9bb9e05f86477b9537dbbee26930c.tar.xz
Fix path to udev rules files
Use nonarch_base_libdir instead of base_libdir, because the files are always in /lib/udev/rules.d/. On ppc64le base_libdir is lib64, and the files end up in the wrong spot. Signed-off-by: Anton Blanchard <anton@ozlabs.org> Change-Id: I3c24dae293f4166f1ed1826d09d4bde7cd7d0357
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
-rw-r--r--meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb2
-rw-r--r--meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb4
-rw-r--r--meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb4
3 files changed, 5 insertions, 5 deletions
diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
index 2da124be0..1a8022c8a 100644
--- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
+++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb
@@ -40,7 +40,7 @@ SYSTEMD_SERVICE:${PN}-presence += "phosphor-gpio-presence@.service"
FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor"
FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor"
FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util"
-FILES:${PN}-monitor += "${base_libdir}/udev/rules.d/99-gpio-keys.rules"
+FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules"
FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence"
SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor"
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb
index 62126e43d..684e41c3a 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb
@@ -24,6 +24,6 @@ SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e"
S = "${WORKDIR}/git"
do_install:append() {
- install -d ${D}/${base_libdir}/udev/rules.d/
- install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${base_libdir}/udev/rules.d/
+ install -d ${D}/${nonarch_base_libdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${nonarch_base_libdir}/udev/rules.d/
}
diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
index 1b91ba364..c7273a032 100644
--- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
+++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb
@@ -26,8 +26,8 @@ MBOXD_FLASH_SIZE ??= "32M"
SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service"
do_install:append() {
- install -d ${D}/lib/udev/rules.d
- install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d
+ install -d ${D}/${nonarch_base_libdir}/udev/rules.d
+ install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/${nonarch_base_libdir}/udev/rules.d
}
TMPL = "mboxd-reload@.service"