[oe] [PATCH 2/2][meta-initramfs] dracut: install modules to /usr/lib
wenzong.fan at windriver.com
wenzong.fan at windriver.com
Thu Sep 10 07:26:04 UTC 2015
From: Wenzong Fan <wenzong.fan at windriver.com>
The dracut modules will be installed to /usr/lib64 while building 64bit
targets with multilib enabled, this causes runtime errors:
dracut: Cannot find /usr/lib/dracut/dracut-functions.sh.
dracut: Are you running from a git checkout?
dracut: Try passing -l as an argument to /usr/bin/dracut
The dracut modules, 50-dracut.install and 51-dracut-rescue.install must
be installed to /usr/lib as Fedora 20 does.
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
---
meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
index 3a72251..8c02a4f 100644
--- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--prefix=${prefix} \
- --libdir=${libdir} \
+ --libdir=${prefix}/lib \
--datadir=${datadir} \
--sysconfdir=${sysconfdir} \
--sbindir=${sbindir} \
@@ -24,6 +24,8 @@ EXTRA_OECONF = "--prefix=${prefix} \
--localstatedir=${localstatedir} \
"
+EXTRA_OEMAKE += 'libdir=${prefix}/lib'
+
do_configure() {
./configure ${EXTRA_OECONF}
}
@@ -36,9 +38,12 @@ PACKAGES =+ "${PN}-bash-completion"
FILES_${PN}-bash-completion = "${datadir}/bash-completion"
-FILES_${PN} += " ${libdir}/kernel \
+FILES_${PN} += "${prefix}/lib/kernel \
+ ${prefix}/lib/dracut \
${systemd_unitdir} \
"
+FILES_${PN}-dbg += "${prefix}/lib/dracut/.debug"
+
CONFFILES_${PN} += "${sysconfdir}/dracut.conf"
RDEPENDS_${PN} = "findutils cpio util-linux-blkid util-linux-getopt bash ldd"
--
1.9.1
More information about the Openembedded-devel
mailing list