diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-09-14 13:01:55 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-15 11:23:58 +0100 |
commit | bcd1bca88052bfab4aaca74608134f4c8ff797de (patch) | |
tree | 8b2a81c023f503811b9595816bea9515cf0a30e5 /meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | |
parent | 978f48b7e2654ac161d548811f3c023af4f04c62 (diff) | |
download | poky-bcd1bca88052bfab4aaca74608134f4c8ff797de.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.
(From OE-Core rev: c67d03eb3684acab89e5972609e397087727e74e)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.bb | 8 |
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 @@ | |||
1 | DESCRIPTION = "A live image init script" | 1 | DESCRIPTION = "A live image init script for grub" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-install.sh" | 4 | SRC_URI = "file://init-install.sh" |
5 | 5 | ||
6 | PR = "r4" | 6 | PR = "r5" |
7 | 7 | ||
8 | RDEPENDS="grub parted e2fsprogs-mke2fs" | 8 | RDEPENDS="grub parted e2fsprogs-mke2fs" |
9 | 9 | ||
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
19 | 19 | ||
20 | FILES_${PN} = " /install.sh " | 20 | FILES_${PN} = " /install.sh " |
21 | 21 | ||
22 | # Alternatives to grub need adding for other arch support | 22 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" |
23 | # consistent with grub 0.97 | ||
24 | COMPATIBLE_HOST = "i.86.*-linux" | ||