From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1R42Uy-0001UW-0r for openembedded-core@lists.openembedded.org; Thu, 15 Sep 2011 05:20:24 +0200 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 14 Sep 2011 20:15:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,384,1312182000"; d="scan'208";a="17264359" Received: from unknown (HELO swold-mobl.bigsur.com) ([10.255.14.252]) by AZSMGA002.ch.intel.com with ESMTP; 14 Sep 2011 20:15:08 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Wed, 14 Sep 2011 20:14:59 -0700 Message-Id: <464d47c2c54927aeff25aa6f8db014cee38efc1c.1316056194.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [RC2 PULL 10/13] grub2: new recipe X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Sep 2011 03:20:24 -0000 From: Tom Zanussi This adds the grub-1.98 from meta-intel while upgrading it to 1.99. Signed-off-by: Tom Zanussi --- meta/recipes-bsp/grub/grub-1.99/40_custom | 9 ++++ .../grub/grub-1.99/grub-install.in.patch | 20 +++++++++ meta/recipes-bsp/grub/grub_1.99.bb | 44 ++++++++++++++++++++ 3 files changed, 73 insertions(+), 0 deletions(-) create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom b/meta/recipes-bsp/grub/grub-1.99/40_custom new file mode 100755 index 0000000..0d80854 --- /dev/null +++ b/meta/recipes-bsp/grub/grub-1.99/40_custom @@ -0,0 +1,9 @@ +#!/bin/sh +exec tail -n +3 $0 +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +menuentry "Linux" { + set root=(hd0,1) + linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet +} diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch new file mode 100644 index 0000000..326951d --- /dev/null +++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch @@ -0,0 +1,20 @@ +Upstream-Status: Inappropriate [embedded specific] + +Our use of grub-install doesn't require the -x option, so we should be +be able make use of grep versions that don't support it. + +Signed-off-by: Tom Zanussi + +Index: grub-1.99/util/grub-install.in +=================================================================== +--- grub-1.99.orig/util/grub-install.in 2011-09-09 22:37:20.093906679 -0500 ++++ grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500 +@@ -510,7 +510,7 @@ + + if [ "x${devabstraction_module}" = "x" ] ; then + if [ x"${install_device}" != x ]; then +- if echo "${install_device}" | grep -qx "(.*)" ; then ++ if echo "${install_device}" | grep -q "(.*)" ; then + install_drive="${install_device}" + else + install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1 diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb new file mode 100644 index 0000000..d9df573 --- /dev/null +++ b/meta/recipes-bsp/grub/grub_1.99.bb @@ -0,0 +1,44 @@ +SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader" + +DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \ +intended to unify bootloading across x86 operating systems. In \ +addition to loading the Linux kernel, it implements the Multiboot \ +standard, which allows for flexible loading of multiple boot images." + +HOMEPAGE = "http://www.gnu.org/software/grub/" +SECTION = "bootloaders" +PRIORITY = "optional" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +RDEPENDS = "diffutils freetype" +PR = "r0" + +SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ + file://grub-install.in.patch;apply=yes \ + file://40_custom" + +inherit autotools +inherit gettext + +EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --target=${TARGET_ARCH} --program-prefix=""" + +do_configure() { + oe_runconf +} + +python __anonymous () { + import re + host = bb.data.getVar('HOST_SYS', d, 1) + if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', host): + raise bb.parse.SkipPackage("incompatible with host %s" % host) +} + +do_install_append () { + install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom +} + +FILES_${PN}-doc = "${datadir}" +FILES_${PN} = "/usr /etc" + -- 1.7.6