diff options
| author |   Wenzong Fan <wenzong.fan@windriver.com> | 2015-09-17 03:51:26 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:10:57 +0200 |
| commit | f4533380c8a5c1d229f692222ee0c2ef9d187ef8 (patch) | |
| tree | abffaf9b7a60a593faffbe1bc0add6aea9ebf57d /meta-initramfs | |
| parent | ea86048c8e0241753466a134790b77bdb193c7c2 (diff) | |
| download | meta-openembedded-f4533380c8a5c1d229f692222ee0c2ef9d187ef8.tar.gz | |
dracut: install modules to /usr/lib
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@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs')
| -rw-r--r-- | meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 9 |
1 files 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 3be78ed34d..8733d548cb 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} \ @@ -28,6 +28,8 @@ EXTRA_OECONF = "--prefix=${prefix} \ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" +EXTRA_OEMAKE += 'libdir=${prefix}/lib' + do_configure() { ./configure ${EXTRA_OECONF} } @@ -40,9 +42,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" |