-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 10-09-15 om 09:26 schreef [email protected]: > 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(-) > > diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb > b/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" > > +# 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----- -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
