From patchwork Mon Mar 9 18:31:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: naresh.bhat@linaro.org X-Patchwork-Id: 45558 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED68120285 for ; Mon, 9 Mar 2015 18:32:21 +0000 (UTC) Received: by wibbs8 with SMTP id bs8sf13830320wib.3 for ; Mon, 09 Mar 2015 11:32:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list; bh=2CRtSeRb4WsinK7cK2ZssgtzW4uESCXI9FRGwSmNK4k=; b=YcrcS0fS2l+bciuoHwqTFiT8RbcrMOsaIS5qmVPIj1eWhsVaWD3ANysuyCG0Ytxthc JF7cX7QlxoQjpfbgSyS2UiMAoyxYO5Pf5pVHSEo1mfPP0hjIrbU8e6V4ik/P3tOH0/O3 /1m345NYeXfFmw52RvuKMEPPmcwOgNBTYL6agwa7V1pAAFJriwb+M/yNF86IAKR6U+2b PRMeeeWqUXUfDn9Jx+uyBdhaZOtKYAkjkN9AmI+4OBuyO2iqrJZ1DdThb5SBAip/3jy6 D79j34mFs0SpZkOVDIU+zyZKl3mAvEHL6vqXaZH9OmuvPbbE0Oq61TRzxhI/Dgnnu3P1 TEEA== X-Gm-Message-State: ALoCoQlHc1ogD32BRw1+tG3khf6gPhPe75QMa8TIdkSnImpiVCBtWYYhV1nzzCypKu414VFi6HBb X-Received: by 10.180.87.166 with SMTP id az6mr7305180wib.1.1425925941180; Mon, 09 Mar 2015 11:32:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.193 with SMTP id e1ls247632lag.80.gmail; Mon, 09 Mar 2015 11:32:21 -0700 (PDT) X-Received: by 10.152.87.176 with SMTP id az16mr3793429lab.122.1425925941011; Mon, 09 Mar 2015 11:32:21 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id js9si14967257lbc.9.2015.03.09.11.32.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Mar 2015 11:32:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbvn10 with SMTP id n10so19266040lbv.11 for ; Mon, 09 Mar 2015 11:32:20 -0700 (PDT) X-Received: by 10.112.201.231 with SMTP id kd7mr6254340lbc.35.1425925940890; Mon, 09 Mar 2015 11:32:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1655488lbj; Mon, 9 Mar 2015 11:32:19 -0700 (PDT) X-Received: by 10.70.40.144 with SMTP id x16mr56692564pdk.148.1425925938767; Mon, 09 Mar 2015 11:32:18 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ot10si32081326pdb.98.2015.03.09.11.32.17; Mon, 09 Mar 2015 11:32:18 -0700 (PDT) Received-SPF: none (google.com: openembedded-core-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 64B2F739AE; Mon, 9 Mar 2015 18:32:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-ig0-f178.google.com (mail-ig0-f178.google.com [209.85.213.178]) by mail.openembedded.org (Postfix) with ESMTP id 097CC739AD for ; Mon, 9 Mar 2015 18:32:03 +0000 (UTC) Received: by igkb16 with SMTP id b16so23629728igk.1 for ; Mon, 09 Mar 2015 11:32:04 -0700 (PDT) X-Received: by 10.42.123.75 with SMTP id q11mr29690463icr.87.1425925924722; Mon, 09 Mar 2015 11:32:04 -0700 (PDT) Received: from Latitude-E6430.domain.name (64.2.3.194.ptr.us.xo.net. [64.2.3.194]) by mx.google.com with ESMTPSA id w3sm6552503igz.4.2015.03.09.11.32.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Mar 2015 11:32:03 -0700 (PDT) From: Naresh Bhat To: openembedded-core@lists.openembedded.org Date: Tue, 10 Mar 2015 00:01:15 +0530 Message-Id: <1425925876-9663-5-git-send-email-naresh.bhat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1425925876-9663-1-git-send-email-naresh.bhat@linaro.org> References: <1425925876-9663-1-git-send-email-naresh.bhat@linaro.org> Subject: [OE-core] [OE-core v1 PATCH 4/5] grub: Update grub git recipe X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: naresh.bhat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Update the grub git recipe with the following actions for native and target - Base class extend to native - do_configure_prepend - do_install_append - do_mkimage native - do_deploy Signed-off-by: Naresh Bhat --- meta/recipes-bsp/grub/grub_git.bb | 48 +++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 3ab675b..a5ab649 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -8,6 +8,7 @@ DEFAULT_PREFERENCE_arm = "1" PV = "2.00+${SRCPV}" SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" SRC_URI = "git://git.savannah.gnu.org/grub.git \ + file://cfg \ file://grub-2.00-fpmath-sse-387-fix.patch \ file://autogen.sh-exclude-pc.patch \ file://grub-2.00-add-oe-kernel.patch \ @@ -18,7 +19,7 @@ S = "${WORKDIR}/git" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' -inherit autotools gettext texinfo +inherit autotools-brokensep gettext texinfo deploy PACKAGECONFIG ??= "" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" @@ -31,24 +32,57 @@ GRUBPLATFORM_arm = "uboot" GRUBPLATFORM_aarch64 = "efi" GRUBPLATFORM ??= "pc" +CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN=" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" +export ac_cv_path_HELP2MAN="" + do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) + ./autogen.sh +} + +do_install_append_class-native() { + install -m 755 -D grub-mkimage ${D}${bindir} } -do_install_append () { - install -d ${D}${sysconfdir}/grub.d - +do_install_append_class-target() { + # Search for the grub.cfg on the local boot media by using the + # built in cfg file provided via this recipe + grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ + -O ${GRUB_TARGET}-${GRUBPLATFORM} -o ./${GRUB_IMAGE} \ + boot linux ext2 fat serial part_msdos part_gpt \ + normal efi_gop iso9660 search efinet tftp all_video chain \ + gfxmenu jpeg gfxterm + + install -m 0755 -D ${B}/${GRUB_IMAGE} ${D}${bindir} +} + +GRUB_TARGET_aarch64 = "arm64" +GRUB_IMAGE_aarch64 = "grubaa64.efi" + +do_mkimage_class-native() { + : } +do_deploy() { + install -m 0755 -D ${B}/${GRUB_IMAGE} ${DEPLOYDIR} +} + +do_deploy_class-native() { + : +} + +addtask deploy after do_install before do_build + # debugedit chokes on bare metal binaries INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -RDEPENDS_${PN} = "diffutils freetype" +RDEPENDS_${PN}_class-target = "diffutils freetype" FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" INSANE_SKIP_${PN} = "arch" INSANE_SKIP_${PN}-dbg = "arch" + +DEPENDS_class-target += "grub-native" +BBCLASSEXTEND = "native"