* Add support for different suffixes found with later u-boot
versions which have switched from .bin to .img
* Allow recipes that include u-boot.inc to also package an
SPL if they build one.
* Minimum requirement is to set the SPL_BINARY value to add
the SPL to the u-boot package as well as into the deploy
directory.
(From OE-Core rev: 2965aa2faaccce43f6c3e451c0a2ded3734766e4)
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
configure.patch was missing a closing quote in a sed expression which
causes script execution to error on less forgiving shells such as dash.
(From OE-Core rev: ad72484a2783afa948966263629006558fbde476)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Second version of the patch that adds grep to RDEPENDS.
Fixes [YOCTO #1887]
(From OE-Core rev: 6d4ff87b935d61aae63260262c0f48fe7e9d2a48)
Signed-off-by: Marc Ferland <ferlandm@sonatest.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>
alsactl creates the state files in /var/lib/alsa by default so switch
alsa-state to use files in that location.
Further, update the alsa-state init script to have the location of the
state files sed'ed into the script at do_install time (so as to remove
hard coding of directory paths).
(From OE-Core rev: 896924c72e7b37c18819229e8160c34cdf4465c8)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
alsa-state adds an init script and configuration files to enable a
consistent and centralised mechanism for setting and restoring alsa
configuration.
(From OE-Core rev: 8bc43c40cf72d5543924229146fa4106ad87b147)
Signed-off-by: Joshua Lock <josh@linux.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>
These patches were marked by "UpstreamStatus:" line, fix it to use
"Upstream-Status:" instead.
(From OE-Core rev: b33b373c9a33fe0ff51104c96d1e5b105efc63ed)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
HOMEPAGE pointed to an sf.net page that said that the
page did not exist any more and after that it redirected
to the denx.de page; updated HOMEPAGE to point to that page
Also improved the description to use the official capitalisation
(From OE-Core rev: e0ebe12541a6628b7629a9be5918d0e7ea92aa33)
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.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>
recipe dirs normally have the name of the (main) package and the official name is u-boot
(From OE-Core rev: e9899d52ade2181bd97dcf79bec64650e8b0f718)
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
to avoid this build error on x32:
| strip: Unable to recognise the format of the input file `test-libacpi'
| make: *** [test-libacpi] Error 1
| ERROR: oe_runmake failed
(From OE-Core rev: 4d7882a57210c88dd9e2b8619b2bd0fa4bdbf9f8)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
libacpi doesn't use base_libdir for install. This patch adds
base_libdir support so that x32 libraries are installed properly.
(From OE-Core rev: 98a363ef0202511cf32f8408011c4ad178173af7)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
dbus-x11 could be not needed by an image without x11.
So I modified this bb file to enable dbus-x11 when x11 is in DISTRO_FEATURES and disable \
dbus-x11 without x11 feature.
[YOCTO #1674]
(From OE-Core rev: f78cb9fbc90f6e40cd20c59ba544389662d87659)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.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>
libtool-cross uses ${HOST_SYS}- prefix while building and installing.
In some cases that may be different from ${TARGET_PREFIX}, that is currently
used in apmd recipe. It's better to have them consistent.
(From OE-Core rev: 5f1fac618fa099f6fc78cbc98f18d1c0ab792abf)
Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is QA warning about this package for an architecture mismatch but
this is inappropriate in this case since the bootloader needs 32 and 64
bit code. We therefore flag the QA check to be skipped.
(From OE-Core rev: 43723e19eb5a6119c7546dc812428e792999a928)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1507]
We need to remove the file qemuarm/shutdown.desktop, or else, on qemuarm,
due to the PACKAGE_ARCH overriding from all to qemuarm in base.bbclass,
the generated deb file will be stored at
tmp/deploy/deb/qemuarm/qemu-config_1.0-r21_allarch.deb rather than
tmp/deploy/deb/all/qemu-config_1.0-r21_all.deb, and the package qemu-config
won't be installable -- task-base finally rdepends on qemu-config, so we get
the do_rootfs failure:
The following packages have unmet dependencies:
| task-base-extended: Depends: task-base but it is not going to be installed
| E: Broken packages
There is also a generic shutdown.desktop, we can keep it and use a proper
pkg_postinst to cope with the case of qemuarm.
(From OE-Core rev: 751212d5effdceab91d95705e647cf07e6820940)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
pkgconfig files belong in the -dev package. They automatically add
a runtime dependency (when packaging with RPM) for "pkgconfig", which
is not desired to be installed with this package.
(From OE-Core rev: 79cd09017693e0fd1634ea9748c797fcec4dac14)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
RDEPENDS is package-specific, so add ${PN} to it.
(From OE-Core rev: 2beec7ff9b177f82a897f281fa72e5d7f96246bc)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This adds the grub-1.98 from meta-intel while upgrading it to 1.99.
(From OE-Core rev: ccd2148e686f93518dc1a80376f7ddb24587a3da)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some place pnum=1 is used which is removed as well since
striplevel=1 is default
(From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
in multilibcase, PN has multilib prefix, so it is not
correct to use PN in SRC_URI and S. instead, we've
dedicately pruned multilib prefix in BPN, so BPN is
the right alternative for PN.
(From OE-Core rev: d6dca85028640034b1a5356920aad3268bd4f1c2)
Signed-off-by: Yu Ke <ke.y@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1198]
Addes the 2011.06 version, while keeping the older 2011.03 version since
other layers might be using it still. This will need to be fixed in the
future as oe-core should only be keeping the current versions and layer
management addresses this somehow.
(From OE-Core rev: 8aec526820f9b7d3a32142ae6849d67dc273c1a6)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
