This includes following changes:
ba952d0 BUG: variable lists not released in close()
690f868 Variables are not removed when loading from file
9e3586a Make sure there's no file descriptor leakage in case of error
03647c4 Check config file defines a non-zero Sector size
3b2d4f1 Check environment size from fw_env.config
(From OE-Core rev: 174cd0d15fb8879a28b9a069a2e504617c0be1a7)
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Acked-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The fw_setenv and fw_printenv binaries should be on a specific package
as some systems may require just the library.
The upgrade path was kept using the RPROVIDES for the -bin package.
(From OE-Core rev: a60bf84b15be85ae0f16b5f85fec98b3365f15de)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
refresh the following patch:
configure.patch
(From OE-Core rev: 498e0f83040fe2e83805d8b13d69c17c74a520ba)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
U-Boot no longer requires OpenSBI to include a FDT for the HiFive
Unleashed, so remove the support from OpenSBI.
(From OE-Core rev: 472507b8c446dcfe3cb08deecfbca4e5928ca504)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For u-boot recipes without menuconfig support, running devtool results
in a do_configure error:
cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory
The problem arises because u-boot.inc supports recipes with and without
menuconfig.
Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool
can control logic that applies only for menuconfig support.
(From OE-Core rev: a6c430b0077eb56b4adbe391a0a05a52133cc8f0)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use the same value of B between u-boot and u-boot-tools.
This patch also enable the out-of-tree builds of u-boot-tools actually.
(From OE-Core rev: 26023b6b0f897842fd98b3e10a8acd5b3ad8f418)
Signed-off-by: Daisuke Yamane <yamane07ynct@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch also helps to build with EXTERNALSRC.
(From OE-Core rev: 8bd7a19b0177cc842d0fabfb9a602208c0617d9e)
Signed-off-by: Daisuke Yamane <yamane07ynct@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In case of multilib, the do_package fails with:
ERROR: libubootenv-0.2-r0 do_package: QA Issue: libubootenv: Files/directories were installed but not shipped in any package:
/usr/lib/libubootenv.so
/usr/lib/libubootenv.so.0.2
Issue is fixed in libubootenv repo - this patch updates SRCREV to the
commit with the fix.
(From OE-Core rev: 9e21387ba2bd04ca844481e42a5999e1d748c730)
Signed-off-by: Stefano Babic <sbabic@denx.de>
Reported-by: ChenQi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Also drop unreferenced (already merged) patches.
(From OE-Core rev: 7b1440dff8129a997400cd7d4b5372455ddd1fe4)
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This usually helps compiler to not use built-in optimizations
for string functions and mem* functions unnecessarily, since OE's
compiler is hosted for linux cross compile, this also means we instruct
it rightly for building a baremetal application
Refresh the patches to apply without fuzz
Fixes linking errors e.g.
platform/qemu/virt/lib/libplatsbi.a(sbi_string.o): in function `sbi_memset':
| /mnt/b/yoe/build/tmp/work/riscv64-yoe-linux/opensbi/0.5-r0/git/lib/sbi/sbi_string.c:102: undefined reference to `memset'
| collect2: error: ld returned 1 exit status
(From OE-Core rev: f599b6c77f3585c8917f4d685689da4cc8a8bf04)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libubootenv is a replacement for u-boot-fw-utils. It is
hardware-independent and provides fw_printenv and fw_setenv tools that
are full compatible with the ones provided by U-Boot. A library is
provided to access the environment from an own application.
License is LGPL-2.1 and this allow to link the library to proprietary
code. The user of the tools should install the configuration file
"fw_env.config", as he is already used to with u-boot-fw-utils. The
configuration file is compatible with u-boot-fw-utils.
A full discussion about issues on current u-boot-fw-utils can be read on
U-Boot's ML at:
http://u-boot.10912.n7.nabble.com/SWUpdate-U-Boot-environment-library-dependency-tt340530.html#none
(From OE-Core rev: 325a8dec3c24723e02c8c7a0b416321adc7a5717)
Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch also helps to build with EXTERNALSRC.
(From OE-Core rev: e63dc57f0950dbfc594efe8570333a16baadf51a)
Signed-off-by: Daisuke Yamane <yamane07ynct@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These aren't needed and just enlarge the patch.
(From OE-Core rev: ba540681ee2965c7222b9725f3755d5e8496f844)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Run gettextize and autoreconf and fix up the resulting problem so that
it builds more-or-less cleanly and "make dist" works. Some of the
existing patches that contained particular point fixes are now rolled
into a single big patch.
(From OE-Core rev: b045f83519807d645a22f74c590c037a4ebc4fbe)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
do_configure() essentially calls autogen.sh to generate some sources and then
autoreconf, but autogen.sh also calls autoreconf.
Pass a magic variable so that autogen.sh doesn't autoreconf for us.
(From OE-Core rev: 19e18446c09fef14c3dd54b0de12a8d21b280c93)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Grub uses pkg-config but is only in the sysroot via dependencies. Be explicit
and inherit pkgconfig directly.
(From OE-Core rev: 6cdf9a0712b136a1002e8a814274e23ee7a5f06d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Besides checking DISTRO_FEATURES for required or conflicting features,
being able to check MACHINE_FEATURES and/or COMBINED_FEATURES may also
be useful at times.
Temporarily support the old class name with a warning about future
deprecation.
(From OE-Core rev: 5f4875b950ce199e91f99c8e945a0c709166dc14)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Part of patch fixed upstream removed.
(From OE-Core rev: 82169fd7684389f9cdedd6f91a00698641741a8c)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use variables from image-uefi.conf instead of hardcoding them in the
recipe.
(From OE-Core rev: e6bb6d31c4285a62b3e9e324c36b2baf439e7bae)
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use variables from image-uefi.conf instead of hardcoding them in the
recipe.
(From OE-Core rev: b5a97272ba201537a766598d9c9a97c8cbc9ea1d)
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The diffutils runtime dependency was introduced from legacy grub since
the script grub-install invokes cmp command which is from diffutils
package. But in Grub2 the grub-install has been rewritten with C
language. So this package isn't needed anymore.
The freetype runtime dependency is for grub-mkfont but we have
explicitly disabled grub-mkfont build. It is safe to remove it.
(From OE-Core rev: 56e4e05417f8ddba60a8b76fa4c8834aa8ea4692)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
MACHINE = qemuarm64
IMAGE_INSTALL_append = ' grub grub-efi'
do_rootfs failed with error:
file /usr/lib64/grub/arm64-efi/acpi.module conflicts between attempted installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64
file /usr/lib64/grub/arm64-efi/adler32.module conflicts between attempted installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64
...
file /usr/lib64/grub/arm64-efi/zfsinfo.module conflicts between attempted installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64
For arm64, grub and grub-efi both compiled GRUBD2 with platform
arm64-efi, arm64 only support platform efi. So both packages have
almost same folder and content /usr/lib64/grub/arm64-efi/*
if Machine set to qemux86_64, do_rootfs will not have this problem,
since for grub, it compiled with platform i386-pc, for grub-efi,
compiled with platform x86-64-efi.
>From commit:
commit 4e9bb03238
Author: Hongxu Jia <hongxu.jia@windriver.com>
Date: Wed Jan 17 03:25:58 2018 -0500
grub/grub-efi: fix conflict
While installing grub and grub-efi, there are conflict files
in ${sysconfdir} ${datadir} ${bindir} ${sbindir}.
- Since all of the conflicted files are tools which is
common for grub and grub-efi, we split them (except
grub-editenv) to grub-common in grub.
common tools for grub and grub-efi are installed into grub-common,
for aarch64, also shipped libdir into this common packages.
in this way, for qemuarm64, package grub is empty, and package grub-efi
use lib in package grub-common
(From OE-Core rev: 933286bdcb9008b75007abedf30cc1b4b6e2f0d0)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Not only grub-efi-native, but also add grub-native to provide
grub utilities on host
(From OE-Core rev: 67dfa11f2d2fb5242814e133346e72515bfc0aca)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Inherit deploy bbclass and install files to DEPLOYDIR rather than in
DEPLOY_DIR_IMAGE.
(From OE-Core rev: f03ab9b21c2aeeae0bd020ee94ec9bb1d903500d)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the following warning by just deleting the files:
WARNING: opensbi-0.4-r0 do_package: QA Issue: opensbi: Files/directories were installed but not shipped in any package:
/lib
/lib/libsbiutils.a
/lib/libsbi.a
(From OE-Core rev: ecbf494b26db71076ad74902a75a3205c849d81e)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As part of the mission to remove the use of Python 2, explicitly use Python 3
when building grub.
(From OE-Core rev: f2286cc31bd92d75c7f8662abe816867ab041d50)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The OpenSBI licence was updated to include contributors in the
copyright notice.
The payload logic has been updated to fix some bugs and handle the new
optional dependency on the Linux kernel for device trees
(From OE-Core rev: 76350b19945db458c60d3f233770543c00cb2067)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
efivar.h is in usr/include/efirvar directory so it should be
added to include search path via -I to compiler cmdline to fix
make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'. Stop.
| make[1]: *** Waiting for unfinished jobs....
When running clang to generate dependencies -MM -MG -MF it still
parses the compile unit and complains if certain header is not found
where as gcc does not do that, hence the compile error is only seen
when compiling with clang.
(From OE-Core rev: db4fa7e765cb434119d816d86b943eeb62235601)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We no longer export these variables into the environment so we no longer
need this code.
(From OE-Core rev: fd85639bf3092491123e8747e44e7b30648c85cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Also set LDFLAGS=BUILD_LDFLAGS when compiling makeguids to ensure that any
target compiler flags are not passed to the native compiler.
[ YOCTO #13423 ]
(From OE-Core rev: f61e0676aabba9e006c32f0e53c69426368cd4f0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is used as a bootloader for RISC-V QEMU machines.
(From OE-Core rev: 112ca2174dd97f5ca9ea25f83007d44054abc487)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This was in meta-oe but EFI is sufficiently widespread now that we need it in
core.
The recipe is based on the one in meta-oe but with several updates.
(From OE-Core rev: 275e5e7ecf4f79b7892ae35a47902188d9905bd0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This was in meta-oe but EFI is sufficiently wide spread now that we need it in
core.
The recipe is based on the one in meta-oe but with several updates.
(From OE-Core rev: 53fe0133432f62024850e87456292b044d1280ee)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since commit [330fc83 grub: Use -Wno-error instead of doing this
on a per-warning basis] applied in oe-core, it missed a space
in append.
(From OE-Core rev: 62c3c8277fcea61940a4433d3796a4cec1b5f577)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 6fa60ac102f6d3977df4236bd5a22680298bdac2)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--
v2: Add comment in the patch header.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
