aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-09-14 13:01:55 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-15 11:21:31 +0100
commitc67d03eb3684acab89e5972609e397087727e74e (patch)
treed9eef112cb875df1fb23340416f92e7286df27c5 /meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
parent1bc26dca631da53d956008a4570c46012c478435 (diff)
downloadopenembedded-core-contrib-c67d03eb3684acab89e5972609e397087727e74e.tar.gz
initramfs-live-install: add support for grub2
grub2 needs a different set of install steps from grub 0.97. This adds them to init-install.sh and adds an install-time check that determines which version is being used and which steps to use depending on the version of grub selected. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb')
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 0eeabf1774..619b16c7c7 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "A live image init script"
+DESCRIPTION = "A live image init script for grub"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-install.sh"
-PR = "r4"
+PR = "r5"
RDEPENDS="grub parted e2fsprogs-mke2fs"
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = "1"
FILES_${PN} = " /install.sh "
-# Alternatives to grub need adding for other arch support
-# consistent with grub 0.97
-COMPATIBLE_HOST = "i.86.*-linux"
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"