diff options
author | Roy Li <rongqing.li@windriver.com> | 2014-06-06 16:26:25 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-06 10:24:07 +0100 |
commit | ec53bfd18c4e5d92ec4baedd702248a303a15dfa (patch) | |
tree | 07a2748fe945a0fe1be3449a8532c9b6b33be00e /meta/recipes-bsp/grub/grub_2.00.bb | |
parent | 5a49a24d35794fcf9e3895469a67db992a52305e (diff) | |
download | poky-ec53bfd18c4e5d92ec4baedd702248a303a15dfa.tar.gz |
grub-2.00: remove our 40_custom
We have this in recipes-bsp/grub/grub/40_custom:
[snip]
menuentry "Linux" {
set root=(hd0,1)
linux /vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet
}
[snip]
These lines are only for initrdscripts/files/init-install.sh, the side
effect is that it would make the target's grub-mkconfig doesn't work
well since the 40_custom will be installed to /etc/grub.d/40_custom, the
grub-mkconfig will run the 40_custom, and there will always be a
'menuentry "Linux"' menu in grub.cfg no matter it is valid or not, we
can do this in init-install.sh rather than grub to fix the problem,
which is also much simpler.
We have done the related work in init-install.sh, now we need remove our own
40_custom, and use grub's own 40_custom which is the right one.
(From OE-Core rev: 4fad24fef5552bd0e4a5ea0982573ba8e4523570)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/grub_2.00.bb')
-rw-r--r-- | meta/recipes-bsp/grub/grub_2.00.bb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index 6075b20bdc..ce2d680eec 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb | |||
@@ -20,7 +20,6 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | |||
20 | file://grub-2.00-fpmath-sse-387-fix.patch \ | 20 | file://grub-2.00-fpmath-sse-387-fix.patch \ |
21 | file://remove-gets.patch \ | 21 | file://remove-gets.patch \ |
22 | file://check-if-liblzma-is-disabled.patch \ | 22 | file://check-if-liblzma-is-disabled.patch \ |
23 | file://40_custom \ | ||
24 | file://fix-issue-with-flex-2.5.37.patch \ | 23 | file://fix-issue-with-flex-2.5.37.patch \ |
25 | file://grub-2.00-add-oe-kernel.patch \ | 24 | file://grub-2.00-add-oe-kernel.patch \ |
26 | " | 25 | " |
@@ -44,7 +43,6 @@ EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ | |||
44 | 43 | ||
45 | do_install_append () { | 44 | do_install_append () { |
46 | install -d ${D}${sysconfdir}/grub.d | 45 | install -d ${D}${sysconfdir}/grub.d |
47 | install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom | ||
48 | } | 46 | } |
49 | 47 | ||
50 | INSANE_SKIP_${PN} = "arch" | 48 | INSANE_SKIP_${PN} = "arch" |