aboutsummaryrefslogtreecommitdiffstats
path: root/meta-initramfs
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-02-06 09:02:35 -0600
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-12 19:35:40 +0100
commit57632c54d82d9f6826629e931b8a50bf5a5bf5e4 (patch)
tree0c01b893b159ea19c2044f5ce3ecefb706f4123b /meta-initramfs
parent9bb362cb3fdf3c28c6bb1f510fd303b5297c218f (diff)
downloadmeta-openembedded-contrib-57632c54d82d9f6826629e931b8a50bf5a5bf5e4.tar.gz
meta-openembedded-contrib-57632c54d82d9f6826629e931b8a50bf5a5bf5e4.tar.bz2
meta-openembedded-contrib-57632c54d82d9f6826629e931b8a50bf5a5bf5e4.zip
dracut: recipe cleanup
Split out bash-completion data Update RDEPENDS: getopt is util-linux-getopt now Use distro_features_check to require systemd Recommend busybox Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs')
-rw-r--r--meta-initramfs/recipes-devtools/dracut/dracut_git.bb25
1 files changed, 19 insertions, 6 deletions
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
index ea55a4dfbd..77c137c463 100644
--- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
@@ -13,8 +13,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"
S = "${WORKDIR}/git"
-do_configure() {
- ./configure --prefix=${prefix} \
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+EXTRA_OECONF = "--prefix=${prefix} \
--libdir=${libdir} \
--datadir=${datadir} \
--sysconfdir=${sysconfdir} \
@@ -23,20 +25,31 @@ do_configure() {
--bindir=${bindir} \
--includedir=${includedir} \
--localstatedir=${localstatedir} \
+ --systemdsystemunitdir=${systemd_unitdir}/system"
+
+do_configure() {
+ ./configure ${EXTRA_OECONF}
}
do_install() {
oe_runmake install DESTDIR=${D}
}
-FILES_${PN} += "${datadir}/bash-completion \
- ${libdir}/kernel \
+PACKAGES =+ "${PN}-bash-completion"
+
+FILES_${PN}-bash-completion = "${datadir}/bash-completion"
+
+FILES_${PN} += " ${libdir}/kernel \
+ ${systemd_unitdir} \
"
+CONFFILES_${PN} += "${sysconfdir}/dracut.conf"
+
+RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt bash ldd"
+RDEPENDS_${PN}-bash-completion = "bash-completion"
-# 'getopt' is in the util-linux main package
-RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd"
# This could be optimized a bit, but let's avoid non-booting systems :)
RRECOMMENDS_${PN} = " \
kernel-modules \
+ busybox \
coreutils \
"