Re: [meta-initramfs][PATCH 5/5] dracut: recipe cleanup

[Koen Kooi <koen@dominion.thruhere.net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dan McGregor schreef op 04-02-15 om 19:40:
> From: Dan McGregor <dan.mcgregor@usask.ca>
> 
> 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> --- 
> .../recipes-devtools/dracut/dracut_git.bb          | 25
> ++++++++++++++++------ 1 file 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
> ea55a4d..8ef0749 100644 ---
> a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++
> b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -4,6 +4,8 @@
> DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut
> (the t LICENSE = "GPLv2" LIC_FILES_CHKSUM =
> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> 
> +PACKAGES =+ "${PN}-bash-completion"

PACKAGES is runtime, so move that below do_install


> + PE = "1" PV = "038"
> 
> @@ -13,8 +15,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 +27,29 @@
> 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 \ +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 util-linux 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 \ "
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFU03M0MkyGM64RGpERAsSgAJ4sxWUVqtCD2DKYpzAca3LK73vuXgCgnww/
s7RbVFpxvlWMqI2+kurk6E8=
=GmZH
-----END PGP SIGNATURE-----