dracut: RDEPEND on systemd optionally & install modules to /usr/lib
cover dracut: RDEPEND on systemd optionally & install modules to /usr/lib
From: Wenzong Fan <[email protected]>
* Get dracut RDEPEND on systemd optionally;
* install modules to /usr/lib for fixing runtime issues.
The following changes since commit d36e2d1066f50036080f978583a58fe79ecfac54:
libunique: add a recipe from oe-core (2015-09-08 16:30:24 +0200)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/dracut
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/dracut
Robert Yang (1):
dracut: RDEPEND on systemd optionally
Wenzong Fan (1):
dracut: install modules to /usr/lib
meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/2 dracut: RDEPEND on systemd optionally
From: Robert Yang <[email protected]>
Use PACKAGECONFIG to depend on systemd optionally.
--- meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +6 -5
@@ -13,9 +13,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git" S = "${WORKDIR}/git" -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "systemd" - EXTRA_OECONF = "--prefix=${prefix} \ --libdir=${libdir} \ --datadir=${datadir} \
@@ -25,7 +22,7 @@ EXTRA_OECONF = "--prefix=${prefix} \ --bindir=${bindir} \ --includedir=${includedir} \ --localstatedir=${localstatedir} \ - --systemdsystemunitdir=${systemd_unitdir}/system" + " do_configure() { ./configure ${EXTRA_OECONF}
@@ -44,9 +41,13 @@ FILES_${PN} += " ${libdir}/kernel \ " CONFFILES_${PN} += "${sysconfdir}/dracut.conf" -RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt bash ldd" +RDEPENDS_${PN} = "findutils cpio util-linux-blkid util-linux-getopt bash ldd" RDEPENDS_${PN}-bash-completion = "bash-completion" +# RDEPEND on systemd optionally +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd" + # This could be optimized a bit, but let's avoid non-booting systems :) RRECOMMENDS_${PN} = " \ kernel-modules \
Signature · 1 line
1.9.1
Re: [PATCH 1/2][meta-initramfs] dracut: RDEPEND on systemd optionally
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 10-09-15 om 09:26 schreef [email protected]:
Quoted 34 lines
From: Robert Yang <[email protected]>
Use PACKAGECONFIG to depend on systemd optionally.
Signed-off-by Robert Yang <[email protected]> Signed-off-by:Wenzong Fan <[email protected]> --- meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
(quoted diff) +0
-0b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index b7d88fd..3a72251 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -13,9 +13,6 @@
SRC_URI= "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"S = "${WORKDIR}/git"
-inherit
distro_features_check-REQUIRED_DISTRO_FEATURES = "systemd" -EXTRA_OECONF= "--prefix=${prefix} \ --libdir=${libdir} \
--datadir=${datadir} \ @@ -25,7 +22,7 @@EXTRA_OECONF= "--prefix=${prefix} \ --bindir=${bindir} \ --includedir=${includedir} \
--localstatedir=${localstatedir} \ -
--systemdsystemunitdir=${systemd_unitdir}/system" + "
do_configure(){ ./configure ${EXTRA_OECONF} @@ -44,9 +41,13 @@ FILES_${PN} += " ${libdir}/kernel \ " CONFFILES_${PN} += "${sysconfdir}/dracut.conf"-RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt bash ldd" +RDEPENDS_${PN} = "findutils cpio util-linux-blkid util-linux-getopt bash ldd" RDEPENDS_${PN}-bash-completion = "bash-completion"
Quoted 4 lines
+# RDEPEND on systemd optionally +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd"
Since packageconfig deals with do_configure, it needs to go next to EXTRA_OECONF, not next to R*
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFV8V0cMkyGM64RGpERAioKAJ0eFaToEpbhH9mu4J8r02DP9KM1NgCgtHTx ESYXBkXqAe55sypT5UjiyiE=
=Ueoe
-----END PGP SIGNATURE-----
PATCH 2/2 dracut: install modules to /usr/lib
In reply to [email protected]From: Wenzong Fan <[email protected]>
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.
--- meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +7 -2
@@ -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"
Signature · 1 line
1.9.1