liblzma5 is really requiring by grub, setting RDEPENDS to xz would pull
unneeded xz binaries into rootfs.
(From OE-Core master rev: 78526905999fa38047ae8f3491127cc03de3e3f6)
(From OE-Core rev: 33a352f45ab05f4c81b860b1b369bde429dbff1d)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Avoids it's auto-detected from sysroot, which will lead implicit results.
(From OE-Core master rev: 6f9e72f77cd0b06c5ad753cb9ab05dd681690c6b)
(From OE-Core rev: 384bb308edc35fbd6538aed90512f5fcdce7575c)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
grub requires bison and it will fail to configure on
the host without bison installed, add the dependency
to fix it.
(From OE-Core master rev: a1510c1a8e6b8a652ae65b7e3910501f1055f87f)
(From OE-Core rev: 6f6e292a102e8ae8d607bb9dac4f3d3e2bced1ea)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
grub_2.0.0 requires xz to run or an error may occur.
(From OE-Core master rev: ffa2877c06c587d4ea56c55bfd0f67a88e42a772)
(From OE-Core rev: d3e1dde9ae75faa1015b80da74604c5ae360c3a6)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The iso9660 file system support needs to be added to grub in order to
be able to correctly find the grub.cfg. The grub commands to locate
the grub.cfg also needs to be encoded into grub's default
configuration.
This change allows the resulting grub binary to work both in the hard
drive / USB boot case or the optical media boot case.
[YOCTO #4100]
(From OE-Core rev: 0bc0762a479b5182a07fccb2b1e9cd5fc15ca485)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If do_patch re-executes, patching the configure script will fail because
it will have been regenerated during do_configure. We're patching
configure.ac so we don't need to patch configure anyway.
(From OE-Core rev: ae98a95577ba9c8a6a0d9a78d4cea33a92adff35)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously, the boot partition was created for the target hard drive
but there was no corresponding entry for it in /etc/fstab. Besides,
even if the boot partition was mounted, it would just result in odd
directory hierarchy like /boot/boot/grub. However, what we really need
is /boot/grub. This patch fixes this problem.
Besides, for future maintance work, this patch also renames some of the
intermediate directories. It uses more descriptive names like /tgt_root
and /src_root. The name of /ssd is dropped.
[YOCTO #5018]
(From OE-Core rev: aa67b1333b4774e1845f562085f7048df65a644f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The grub_fix_for_automake-1.12.patch replaced pkglib with pkgdata to
make grub_0.97 build with automake-1.12. However, it forgot to set up
the pkgdatadir, thus causing grub_0.97 not shipping files under /usr/lib.
This in turn resulted in an unworkable grub.
This patch fixes this problem by setting up the pkgdatadir correctly.
[YOCTO #4997]
(From OE-Core rev: 883b1b396328e6cd67dcb4ca6fd8975b6e716c0a)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A dependency was being added on ncurses conditionally upon whether it
had been built first. Explicitly disable this dependency to stop this
from happening.
Note that grub 2.x does not need this same fix because there ncurses is only
used when building grub-emu, which is only built when the specified
target platform is "emu" which we do not use.
(From OE-Core rev: 2ca75dd0718ec37d7f131b8bcd841de6e876bd07)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fuse is autodetected from sysroot
* add PACKAGECONFIG to make it deterministic
(From OE-Core rev: 5e7c3228acce9f95b506ecce9712e843c35067df)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Get patch from ubuntu to fix this:
error: GRUB requires a working absolute objcopy; upgrade your binutils
(From OE-Core rev: 18bb555268ecc11d0fb7d4f404a38f1b453f2928)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A few of the recent commits have used inconsistent whitespace with
respect to tabs and spaces for indentation and alignment. Correct it.
(From OE-Core rev: 3472c1f7ab409cd91c1d4782d9e00880b84e3ae8)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
O irony: the grub2/gnulib nag macro that says "don't use gets, use fgets" breaks the build if you're using a recent (e)glibc release that has gets removed.
Fedora already #if 0's the check in grub, so I stole their patch.
(From OE-Core rev: 261e377b08388a288ee521a3629877b89e18e42b)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Due to recent change in the oecore layer grub-efi recipe uses separate
builddir and the paths used in the do_deply need to change accordingly.
This change avoids this build issue:
install: cannot stat `/build-fri2/tmp/work/x86_64-linux/grub-efi-i586-native/2.00-r1/grub-2.00/bootia32.efi': No such file or directory
ERROR: Function failed: do_deploy (see /build-fri2/tmp/work/x86_64-linux/grub-efi-i586-native/2.00-r1/temp/log.do_deploy.5875 for further information)
(From OE-Core rev: 11ba0231244b8a27939969353e3aa668ce78f7c6)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added -Wno-unused-result because of a read() with no result, and causing
error due to -Werror
Updated grub recipe because of a patch name change
Removed unnecessary patches (merged upstream).
(From OE-Core rev: 88cd5d99918a896f515e8bb59b7238f3ad50adff)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #2916]
On some systems the host version of flex may be too old to work properly,
instead we depend on flex-native to ensure that we have the proper version
available to us. (Flex version 2.5.35 or newer is requried.)
(From OE-Core rev: b53b4c4d6dad745b2eb0ab804f7975146a81aedf)
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Clarified commit message
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This cleans up code added in 2008 to use modern syntax. It is functionally
equivalent.
(From OE-Core rev: a73b314c95a21e44dc584c58639a038833c9756b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this change, an effective reautoconf happens at compile time with potentially
incorrect parameters. This change ensures it happens once, in do_configure with the
correct parameters.
(From OE-Core rev: cae93d99497b822de9607261d225385423d5daf2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As suggested in 70067f082a we do not
need this dependency.
[YOCTO #2527]
(From OE-Core rev: ef637e417ae1c2dff7fc0ad6cb30989e72ac35ab)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current fix_for_automake patch is not complete. It fixes the install
dir of grub-mkconfig_lib but neglects to update its references in
grub-mkconfig and the grub.d/* scripts. grub-mkconfig would complain:
# grub-mkconfig
/usr/sbin/grub-mkconfig: line 98: /usr/lib/grub/grub-mkconfig_lib: No such file or directory
Backport upstream patch to fix all the references.
[YOCTO #2777]
(From OE-Core rev: 72a582874704838ddd19700bf7c300d7a7faaf9f)
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Live image installer did not preserve BSP specified console= kernel parameter.
This patch updates the init scripts that are responsible for grub.cfg creation
so that options like console= are passed allong from installer to installed img
[YOCTO #2426]
(From OE-Core rev: e18c59eb5a61f265b9cad6de68359fa1430b0e58)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #2527]
Modify configure.ac and the generated configure script to avoid using
help2man during the compilation process. For grub-efi we are only
deploying the EFI payload and are not installing grub on the target
root filesystem. Therefor, we do not need the man pages.
Cleanup the SRC_URI whitespace while we add a line to it.
(From OE-Core rev: 035bc3f5ee99ed3bd74219d9717239299e4bc765)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Paul Eggleton <paul.eggleton@linux.intel.com>
CC: Radu Moisan <radu.moisan@intel.com>
grub-efi-native whitespace cleanup (INC)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It was using distro gcc to build binaries for target. This got detected
on fedora 17 alpha, on which it hit an gcc-4.7 issue.
This Fixes Bug: [Yocto #2291]
More information in the patch header
Thanks to Saul Wold for suggesting to remove the --target parameter from
EXTRA_OECONF var.
(From OE-Core rev: 26ae0e53411c1ea3afbb2e0c6d9dc2f1b0690751)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO 2257]
GPT partitions are common for EFI systems. Add support for them by
including the part_gpt partition module in the grub-efi image. In
order to allow for loading a Linux kernel from an EXT* filesystem,
include the ext2 module as well.
With this fix applied, I was able to boot from a USB key using a
GPT partition table with the following layout:
$ sudo gdisk -l /dev/sdc
GPT fdisk (gdisk) version 0.8.2
Partition table scan:
MBR: protective
BSD: not present
APM: not present
GPT: present
Found valid GPT with protective MBR; using GPT.
Disk /dev/sdc: 7669824 sectors, 3.7 GiB
Logical sector size: 512 bytes
Disk identifier (GUID): 68FA7CD4-E0C3-4A8E-82B5-1331C9B17A3C
Partition table holds up to 128 entries
First usable sector is 34, last usable sector is 7669790
Partitions will be aligned on 2-sector boundaries
Total free space is 7428816 sectors (3.5 GiB)
Number Start (sector) End (sector) Size Code Name
1 34 32801 16.0 MiB 0700 # FAT16
2 32802 240974 101.6 MiB 0700 # EXT3
From within GRUB, booted as bootia32.efi from the BOOT partition, I
booted the OS with the following commands:
grub> linux (hd0,gpt2)/vmlinuz rootwait root=/dev/sda2 console=ttyS0,115200
grub> boot
This change will enable BSP developers to use the grub-efi image in
their own images as well as enable upcoming changes to the installer
to support EFI.
(From OE-Core rev: a2c6687410f00623efe8dfcb22385cbbc7f2e1a9)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Kishore Bodke <kishore.k.bodke@intel.com>
CC: Rahul Saxena <rahul.saxena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* We have various variables which are either not quoted at all or are half
quoted. This patch fixes the bad exmaples so everything is consistent.
(From OE-Core rev: 960ee8076e860353a05eb2eb7f825a455c54698d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit replaces earlier patch
(grub-1.99_fix_for_automake_1.11.2.patch) which did not work on all distros.
Fixes these errors observed with automake 1.11.2
The useof pkglibhas become more strict compared to the earlier release
of
automake resulting in these failures.
Fixed the files related to automake to avoid the issue.
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| Makefile.am:6: `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory
for `SCRIPTS'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory
for `SCRIPTS'
| Makefile.am:6: `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| Makefile.am:6: `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1
(From OE-Core rev: ecc383f72791c3c4a3e7ccc646469706b88e68fb)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes these errors observed with automake 1.11.2
The useof pkglibhas become more strict compared to the earlier release
of
automake resulting in these failures.
Fixed the files related to automake to avoid the issue.
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| Makefile.am:6: `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory
for `SCRIPTS'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory
for `SCRIPTS'
| Makefile.am:6: `conf/Makefile.common' included from here
| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory
for `DATA'
| Makefile.am:6: `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1
(From OE-Core rev: e9c5c354086546efe4114c6225d05116fb18b9fe)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Specify /EFI/BOOT as the grub prefix so the grub efi payload can find
the grub.cfg in the same directory. Ultimately, it might make more sense
to install the grub tools and the grub-core modules to sysroot and make the
grub-efi bbclass generate the image in the required format as part of the
bootimg generation. However, bootimg is currently the only user, so make the
correction here to resolve the immediate issue.
(From OE-Core rev: bc046c58c8f3c462972e9004dda2612b58376492)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without the efi_gop module, the GRUB menu would work, but the Linux
kernel messages would not be displayed to the physical console. Adding
efi_gop causes grub to pass the proper information in the boot parameters
pointer such that the Linux kernel can detect and use the EFI framebuffer.
(From OE-Core rev: 2c2770f89b3331f635647ba1ef87d8f63cfcdfe2)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop the anonymous python block in favor of the much simpler
COMPATIBLE_HOST mechanism.
(From OE-Core rev: 36654d6d393cb8c8a545835184a96be4ae0c885d)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The "apply=yes" doesn't appear to be necessary, drop it in favor of
a simpler SRC_URI specification.
(From OE-Core rev: 978fb865897a178c3ba6b6cf3672da53c25b5171)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a recipe to build the GRUB efi images. This recipe is written as
a native recipe as the resulting GRUB utils are required to assemble
the final image. Rather than build a native and a target recipe (and
increase build times), this recipe builds the utils for the host and
passes an appropriate --target argument to the GRUB configure script
to build the modules for the target arch. The only output of this
recipe is an EFI image in the deploy directory.
Care is taken to ensure changing targets will force a rebuild of this
native recipe by including the target arch in the PN.
(From OE-Core rev: f9518a368f041ceccb4a36061d91ae64cd4dabd4)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ming Liu
Jackie Huang
Jason Wessel
Paul Eggleton
Chen Qi
Saul Wold
Laurentiu Palcu
Martin Jansa
Darren Hart
Koen Kooi
Nitin A Kamble
Constantin Musca
Radu Moisan
Xin Ouyang
Richard Purdie
Jesse Zhang
Khem Raj
Otavio Salvador