diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-01-31 00:07:54 -0600 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2011-01-31 00:07:54 -0600 |
commit | c5ecc11dec2402aa05e68bd03b65a6460837b748 (patch) | |
tree | 8ca0e296946abc3a0b9a79b51fa9f04d7d5469d7 /common/recipes-bsp/grub/grub-1.98/grub-install.in.patch | |
parent | 3a6fbfdf01945277a4a271942fc8086575c41744 (diff) | |
download | meta-intel-c5ecc11dec2402aa05e68bd03b65a6460837b748.tar.gz |
meta-intel: add a /common dir with grub2/live-install changes
Add a /common dir to contain code shared by multiple BSPs in the
meta-intel repo, along with a couple recipes to live there
temporarily.
In this case, there are two BSPs that need to share the common grub2
and associated initramfs-live-install changes (sugarbay and
jasperforest).
The grub2 and associated initramfs-live-install changes will soon be
submitted to the main poky repo, but for now it makes more sense to
keep them here - they're needed for live-install of the two BSPs
mentioned, but they contain a couple hacks that need to be addressed
and are untested with anything else.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'common/recipes-bsp/grub/grub-1.98/grub-install.in.patch')
-rw-r--r-- | common/recipes-bsp/grub/grub-1.98/grub-install.in.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/common/recipes-bsp/grub/grub-1.98/grub-install.in.patch b/common/recipes-bsp/grub/grub-1.98/grub-install.in.patch new file mode 100644 index 00000000..ac964193 --- /dev/null +++ b/common/recipes-bsp/grub/grub-1.98/grub-install.in.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: grub-1.98/util/grub-install.in | ||
2 | =================================================================== | ||
3 | --- grub-1.98.orig/util/grub-install.in 2011-01-25 23:47:05.587521825 -0600 | ||
4 | +++ grub-1.98/util/grub-install.in 2011-01-25 23:47:23.867521822 -0600 | ||
5 | @@ -306,7 +306,7 @@ | ||
6 | |||
7 | if [ "x${devabstraction_module}" = "x" ] ; then | ||
8 | if [ x"${install_device}" != x ]; then | ||
9 | - if echo "${install_device}" | grep -qx "(.*)" ; then | ||
10 | + if echo "${install_device}" | grep -q "(.*)" ; then | ||
11 | install_drive="${install_device}" | ||
12 | else | ||
13 | install_drive="`$grub_probe --target=drive --device ${install_device}`" | ||