Return-Path: Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by mail.openembedded.org (Postfix) with ESMTP id 1A83072184 for ; Wed, 4 Feb 2015 18:40:43 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id rl12so4242744iec.11 for ; Wed, 04 Feb 2015 10:40:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=nXBH3DyfZA0ouTzZ0E8as/SfTfPa4y6HnBzLL0D7nbw=; b=tZzKz+laBtGmne4kSW8CPFTXUa1SunCpo9bujYSNwOf7UzuxiE3pRJnacFda+w8yox RxkrDc58EjGHZU2ViG8PPq5Wmk+zTrwdeQhEB7vZuG+1CEDjWp6ZuWA3ijPqBYhoIZoM rYJ3tegjsMasnwluxbwYNG58/gX41Ibej2zXUUOUDMrpp6h/9lQZkHZnObHLILqasDgI i0bazcDXl825qq6ULNN93gGpXTozAjfPjz6yS+yMb8EQqIgAhQ9lYy/nBiQtdiYpWmI6 4OXYsSYRAuiiVvO/W+QS2mkKOa1iGx83G8BegHfRdEm5GSVLa8BY6IiaT66yChUHTApu Ykyg== X-Received: by 10.50.234.194 with SMTP id ug2mr25999727igc.39.1423075244959; Wed, 04 Feb 2015 10:40:44 -0800 (PST) Received: from mediabox.local (71-17-233-74.sktn.hsdb.sasknet.sk.ca. [71.17.233.74]) by mx.google.com with ESMTPSA id a204sm1265297ioe.2.2015.02.04.10.40.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Feb 2015 10:40:44 -0800 (PST) From: Dan McGregor To: openembedded-devel@lists.openembedded.org Date: Wed, 4 Feb 2015 12:40:43 -0600 Message-Id: <1423075243-24859-1-git-send-email-danismostlikely@gmail.com> X-Mailer: git-send-email 2.1.0 Subject: [meta-initramfs][PATCH 5/5] dracut: recipe cleanup X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Feb 2015 18:40:44 -0000 From: Dan McGregor 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 --- .../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" + 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 \ " -- 2.1.0