From patchwork Fri Mar 13 14:55:26 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: 45784 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f197.google.com (mail-we0-f197.google.com [74.125.82.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3FBEB214CB for ; Fri, 13 Mar 2015 14:56:46 +0000 (UTC) Received: by wevk48 with SMTP id k48sf17023680wev.0 for ; Fri, 13 Mar 2015 07:56:45 -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:cc: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=C5WXAKGT3240iGLQ40cTOwmIlJjOK4UUC8X/zwTj0reMqppUbzCsk0E/XHBopIShVL h2hqAIhEDK2D4J4f/N5WNQtZxnW7TJxw8JBvZKy62yFvKw5JUpgQbmqz1McsK5plK8iu EiDLpMhZm87i/UqXelizkS/uQr66L77xvcxwtSB9c9v/GuM/7E5sz2vv7VizertoE04M K8tsccUVSoUYcxY10RH8woj2+J2g6vSrkZA3k5F+tB/t+IpXovhFeoNzs43BX+N9XxsZ ofylk1N7I+CdOQwGypm5abE3wDSlM83/71QnWj4G1+ACBEOiE2qfz87vAxGWupDWgeIZ 4E8A== X-Gm-Message-State: ALoCoQnlig0SoUlDOTJKm/5SsaUa19Kqcl05/MpVVNukCHn9VMdPJcLA70tnPnv48wbAdiLEl9Ky X-Received: by 10.112.13.228 with SMTP id k4mr7178806lbc.8.1426258605375; Fri, 13 Mar 2015 07:56:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.14 with SMTP id t14ls422300laz.61.gmail; Fri, 13 Mar 2015 07:56:45 -0700 (PDT) X-Received: by 10.112.133.35 with SMTP id oz3mr42644489lbb.98.1426258605090; Fri, 13 Mar 2015 07:56:45 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id c5si1562132laf.16.2015.03.13.07.56.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Mar 2015 07:56:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by labmn12 with SMTP id mn12so23166970lab.8 for ; Fri, 13 Mar 2015 07:56:45 -0700 (PDT) X-Received: by 10.152.121.33 with SMTP id lh1mr43819510lab.86.1426258604949; Fri, 13 Mar 2015 07:56:44 -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 h5csp967956lbj; Fri, 13 Mar 2015 07:56:44 -0700 (PDT) X-Received: by 10.182.28.69 with SMTP id z5mr3464581obg.58.1426258603427; Fri, 13 Mar 2015 07:56:43 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id pc10si4496511pdb.109.2015.03.13.07.56.42; Fri, 13 Mar 2015 07:56:43 -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 3F4917391D; Fri, 13 Mar 2015 14:56:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-yh0-f54.google.com (mail-yh0-f54.google.com [209.85.213.54]) by mail.openembedded.org (Postfix) with ESMTP id 2600F6013D for ; Fri, 13 Mar 2015 14:56:09 +0000 (UTC) Received: by yhl29 with SMTP id 29so1850390yhl.4 for ; Fri, 13 Mar 2015 07:56:10 -0700 (PDT) X-Received: by 10.170.205.142 with SMTP id w136mr48480033yke.75.1426258570532; Fri, 13 Mar 2015 07:56:10 -0700 (PDT) Received: from Latitude-E6430.caveonetworks.com ([111.93.218.67]) by mx.google.com with ESMTPSA id a74sm1773572yhq.31.2015.03.13.07.56.06 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Mar 2015 07:56:09 -0700 (PDT) From: Naresh Bhat To: openembedded-core@lists.openembedded.org Date: Fri, 13 Mar 2015 20:25:26 +0530 Message-Id: <1426258527-2329-5-git-send-email-naresh.bhat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1426258527-2329-1-git-send-email-naresh.bhat@linaro.org> References: <1426258527-2329-1-git-send-email-naresh.bhat@linaro.org> Cc: matt.fleming@intel.com 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.215.41 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"