There are valid reasons to build repositories without meta
data present and there are times when this is an error. This
change adds sanity tests to the build process to detect missing
meta data and throw an informative error message.
Sanity checking is only triggered from recipes (linux-yocto)
that always require meta data to be present. Other recipes
are not impacted and can auto-generate meta data as required.
Without this change the build process suceeds, but incorrect
meta data will be used (with no user knowledge), which is not
the desired behaviour.
(From OE-Core rev: adf9f92e2f8f6cc3deba72a194ded85e160ad9e3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The machine configuration of the non-core (non-qemu) machines
exists in other layers. Moving the branch mappings, compatibility
and SRCREVs of these machines out of the main linux-yocto recipe
is the first step in that move.
(From OE-Core rev: 9187ac0173f26c6a621229ff588f495e9967e665)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the linux-yocto/2.6.37 SRCREVs to pickup:
perf tool: Fix gcc 4.6.0 issues
1/1 [
Author: Kyle McMartin
Email: kyle@mcmartin.ca
Subject: perf tool: Fix gcc 4.6.0 issues
Date: Thu, 5 May 2011 00:06:01 -0400
commit fb7d0b3cefb80a105f7fd26bbc62e0cbf9192822 upstream.
GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf
due to the -Werror=unused-but-set-variable flag.
I've gone through and annotated some of the assignments that had side
effects (ie: return value from a function) with the __used annotation,
and in some cases, just removed unused code.
In a few cases, we were assigning something useful, but not using it in
later parts of the function.
kyle@dreadnought:~/src% gcc --version
gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3)
Cc: Ingo Molnar <mingo@redhat.com>
LKML-Reference: <20110124161304.GK27353@bombadil.infradead.org>
(From OE-Core rev: efc68af7259b4bcbb1e03a090128289a7cdc7944)
Signed-off-by: Kyle McMartin <kyle@redhat.com>
[ committer note: Fixed up the annotation fixes, as that code moved recently ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[Backported to 2.6.38.2 by deleting unused but set variables]
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[Backported to linux-yocto kernel git version]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
in this case, those non poky distro can also use these recipe normally
(From OE-Core rev: 0a57bd226cdb8332707fa0f46fcf0b067f03701a)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Perf wants elfutils and elfutils on uclibc does not work due to
its usage of obstack_printf functionality missing from uclibc.
(From OE-Core rev: 8c2154fd5be3b7a633d87a23a1beffe9ce45c123)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Turn these off for now to avoid the host infection issues for perf.
Fixes yocto [BUGID #994].
(From OE-Core rev: 51cf1ecab860269b3d822e2e372756b8bb8ffe26)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The configuration chunks for profiling and latency top have
been enabled in tree now, so we can drop optional feature
additions in the recipe itself.
build tests show identical configurations.
(From OE-Core rev: 0f69382ac1eea1dea05581c29cf66e3214f0bd74)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The existing infrastructure uses an external build tree which references the
kernel source in the work dir. If run with rm work, building external modules
will fail.
This patch places a configured source tree in sysroots. Striking a balance
between minimal size and minimal maintenance is difficult. A fully configured
tree is about 500MB after a clean. This version leans on the side of caution and
removes only the obviously unecessary parts of the source tree to conserve
space, resulting in about 170MB. The arch directories would be some additional
pruning we could do. Given examples from the devel package from distributions, I
suspect this size could be reduced to 75MB or so, but at the cost of a much more
complex recipe which is likely to require a great deal more maintenance to keep
current with kernel releases.
Care is also taken to clean the hostprogs in scripts, and the modules are
responsible for building them as needed. Although it is unclear to me if this is
really necessary, especially considering that modules put these bits back as
soon as they compile. If we are not generating an sstate package, I suspect we
can ignore these.
Please try this with your modules and let me know how it does. I tried to take
non linux-yocto kernel recipes into account, but I have only tested with
linux-yocto and the hello-mod recipe so far.
(From OE-Core rev: a9d41062e24a6b99661b3a5256f369b557433607)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Acked-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #858] and [YOCTO #859]
common-pc-64.scc in the linux-yocto meta data omits latencytop and profiling
(but common-pc.scc includes them). The right fix is in common-pc-64.inc, but
this fix gets people people unblocked until Bruce can commit the proper fix to
linux-yocto.
(From OE-Core rev: e906c6ea72b0edcc509a2ef5f44cba5584432dd1)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
CC: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [BUGID: 773]
This consolidated SRCREV update addresses the following items:
- updates to 2.6.37.2
- updates the routerstation pro configuration for USB mass storage
- merges the PERF no scripting patch into the kernel tree
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [BUGID #488#734]
Enable audio for qemux86/qemux86-64 via the following kernel
configuration options.
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SND_RAWMIDI=m
CONFIG_SND_SEQUENCER=y
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_RAWMIDI_SEQ=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_ENS1370=m
CONFIG_SND_INTEL8X0=m
CONFIG_AC97_BUS=m
The mechanism to trigger these options is in the form of an
optional kernel feature that is only appended for qemux86
and qemux86-64, but is contained within the kernel tree.
This allows several things:
- the options to be available/shared for all boards
- the options to be in tree
- to not add the options to every board, which unecessarily
bloats the default configuration.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
linux.inc was used by older kernel recipes which have now been removed from the
core meta data. I references machines now only defined in meta-extras. The
configure prepend mangles the kernel .config in non-intuitive ways and the
install peroforms some odd boot image manipulation that is not used nor required
by supported machines. The required functionality, such as defconfig setup, has
already been moved to the kernel bbclass. Remove linux.inc to avoid confusion
for new kernel recipe authors and clean up the kernel meta data.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
The one machine listed for this kernel recipe does not have a machine config.
This recipe uses some older mechanism which are being phased out. Remove it to
avoid confusion and clean up the kernel recipes metadata.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
These are all moving to meta-extras. Ideally in the future machines
such as these will be maintained to topic specific layers as we move
to a more layer oriented model. If this causes a problem for anyone
please discuss it on the mailing list.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Linux is licensed under GPL so add appropriate LIC_FILES_CHKSUM to
linux.inc file.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [BUGID #610]
The powerpc linux-yocto kernels were not creating dtb images
in the deploy directories. This was due to two problems:
- the dtb generation rules were not being configured
- the boards were not specifying a device tree in their config
This change addresses the first point by factoring out the
dtb generation routines into a new include that can be used by
multiple recipes.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
In order to build BSPs that were not already integrated into
the upstream linux yocto kernel AND keep the git fetcher happy,
some fairly complex anonymous python sections were required.
These sections cause problems with variable expansion and SRCREV
processing.
With the updated git fetcher code, we can streamline the BSP
boostrapping process and drop 99% of the anonymous python code.
This commit has the following changes to support BSP boot strapping
and simplication for existing BSPs.
- KMETA is set per-recipe rather than in python code
- undefined machines are no longer used, but instead common
branch names are set per-recipe
- fallback machine SRCREVs are present in the default revisions
file
- A new variable YOCTO_KERNEL_EXTERNAL_BRANCH should be set in
the local.conf for new BSPs instead of being programatically
determined in the anonymous python.
- No more explicity KMACHINE variable expansion and manipulation,
since the tools and build phases no longer require it due
to the per-recipe fallbacks.
Integrated/merged BSPs are unaffected by the changes and have been
regression tested.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
foo
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Support has been added for basic Beagleboard xM functionality,
including networking, to the linux-yocto kernel repository.
Tested on the Beagleboard xM.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating for the sugarbay and beagleboard BSPs. To make the sugbay
inhert common-pc-64 generic config/changes/fixes it has been
branched in the kernel as yocto/standard/common-pc-64/sugarbar, as
a result, we'll bump the common-pc-64 to be yocto/standard/common-pc-64/base.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [BUGID #692]
Previously the information dumped by the kernel configuration audit
scripts was only placed in log files. This isn't as useful as it
could be, since they are rarely checked. This change takes the
output from kconf_check and explicitly displays it to the user.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This package fails to build because of missing LIC_FILES_CHKSUM option.
This patch adds GPL and LIC_FILES_CHKSUM to this recipe.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
ExtUtils::Embed ccopts is getting the host's -I/usr/local/include and
using it to compile perf, which results in a compilation error that
started appearing just recently.
This turns the code that makes use of ExtUtils::Embed off and simply
hard-codes NO_LIBPERL.
It does the same for LIBPYTHON while we're at it, since it probably
suffers from a similar underlying problem and just by chance hasn't
broken anything yet.
This will be re-enabled after I familiarize myself with the perf
recipe and am able to create a proper fix.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
The routerstation pro and mpc8315e-rdb have been validated
on 2.6.37 so we can switch their preference to linux-yocto
and update the machine compatibility to add them to the support
list.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
SRCPV is intended being used by PV, some recipes still use
SRCREV for PV, which is not correct. This patch fix all the
misusage.
Signed-off-by: Yu Ke <ke.yu@intel.com>
The mapping of qemu to kernel branch name for the stable
kernel had a small leak from the devel kernel. Nothing
broke since qemux86 prefers the 2.6.37 kernel and this was
hidden.
This fixes the mapping for anyone who does want a 2.6.34 based
qemux86 kernel.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The existing 2.6.34 kernel tree uses _ where poky typically
uses -. This is a historical artifact, since working with
gnu Make and shells means avoiding - is wise. The opposite
is true in Yocto.
To avoid using the _ reserved character wherever possible
we can simply remove it from the branch names in the
new 2.6.37 kernel, but to keep the content stable in the
0.9 2.6.34 kernel, we map _ to - for the purposes of
packaging.
To further faciliate this switch, the branch names no
longer need to be shortened in the KMACHINE mappings, but
can be fully specified and the tools/processing adapt as
required. This gives us the flexibility to map multiple
boards to a single branch for building.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
During the last phase of the recipe factoring, the board compatibility
lists ended up in the wrong place, which meant we had an incomplete
list of boards, and the same set of boards for both kernels (stable
and devel).
To fix this, I've yanked the compatibility to the recipes themselves and
updated the emenlow to have a -stable bbappend.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
In order to extend and create more kernel recipes based on the
supported yocto kernel common routines need to be placed in
re-usable blocks.
To accomplish this meta/recipes-kernel/linux/linux-yocto_git.bb
is broken into three parts:
- meta/classes/kernel-yocto.bbclass: contains common routines
for checking out and configuring a yocto kernel git repository.
This should be inherited by recipes that need this functionality.
- meta/recipes-kernel/linux/linux-yocto.inc: Contains the machine
mappings, compatibility, build directives and common task
definitions for a yocto kernel based recipe. This inherits
kernel-yocto, and is the typical point of entry for other recipes.
- meta/recipes-kernel/linux/linuux-tools.inc: tasks and function definitions
for kernel recipes that want to build/export perf
It also updates the linux-yocto recipe to default to 2.6.37.
As part of the update to 2.6.37 the branch naming and conventions
have been modified to show inheritance, and be more generic.
For example:
master
meta
yocto/base
yocto/standard/arm_versatile_926ejs
yocto/standard/base
yocto/standard/beagleboard
yocto/standard/common_pc/atom-pc
yocto/standard/common_pc/base
yocto/standard/common_pc_64
yocto/standard/fsl-mpc8315e-rdb
yocto/standard/intel_atom_z530
yocto/standard/intel_core_qm57_pch
yocto/standard/mti_malta32_be
yocto/standard/preempt_rt/base
yocto/standard/preempt_rt/common_pc
yocto/standard/preempt_rt/common_pc_64
yocto/standard/preempt_rt/intel_atom_z530
yocto/standard/preempt_rt/intel_core_qm57_pch
yocto/standard/qemu_ppc32
yocto/standard/routerstationpro
In this structure:
master: tracks the mainline kernel
meta: meta information for the BSPs and kernel features
yocto/base: baseline kernel branch
yocto/standard/base: 'standard' kernel, contains features
and configs for all BSPs
yocto/standard/<machine>: represents a BSP with specific
features or configurations
The tools, tree and libc-headers have all been updated to
deal with this new structure. Also in addition to dealing with
the new structure, they continue to work with the existing
tree and will adapt at runtime to the differences.
The linux-yocto-stable_git.bb recipe continues to build the
2.6.34 based tree,and linux-yocto_git.bb builds 2.6.37. As
boards are enabled for the new kernel they will move from
-stable to the development kernel. As of now, only the
emulated targets have moved to 2.6.37-rcX
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
The existing preferred yocto kernel wasn't named appropriately
and needs to be updated.
In keeping the changes small and isolated, this commit simply
renames the recipe and some internal variables. Future commits
will refactor the code into more usable blocks.
Now that linuy-wrs has been renamed linux-yocto, we need
to rename and update an board configurations and append
files.
Now that linux-wrs has been renamed linux-yocto, we need to
update the SRCREVs to have the new name.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
When creating a new BSP there isn't always an upstream branch
to validate SRCREVs against. Therefore, creating a new BSP
required extra manipulations of the git repository, even though
the branch for the build would be dynamically created.
To fix this, provide a fallback to the 'standard' branch if
WRMACHINE is not assigned a specific value for the given MACHINE.
The fallback saved in KBRANCH, and represents the branch that
we should build, even if no fallback is required. Some substeps
of the recipe have been updated to use KBRANCH rather than
enforcing MACHINE-KERNELTYPE.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
It is useful to override revision checking from a layer or other
recipe. In order to show the global nature of the variable rename
it KERNEL_REVISION_CHECKING and make it a weak assignment.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [BUGID #199]
Although an optional feature to a base BSP, most of the machines
currently supported want/need the netfilter options. To enforce
this configuration, it is temporarily forced in the kernel
recipe itself, but can move to machine configurations in the
future.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [BUGID #199]
Reinstate the ability to specify optional/additional kernel features
when updating the tree.
This is done via the variable KERNEL_FEATURES which specifies
a list of features to be appended to the current branch and
config. These features are part of the wrs_meta branch in the
kernel repository and hence are self contained within the
kernel tree waiting to be activated. This saves multiple
branches simply to allow a machine to have many profiles.
The kernel patching/configuration phases will locate these
features and add them to the meta_series, which in turn
modifies the tree.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Bruce Ashfield
Yu Ke
Khem Raj
Tom Zanussi
Richard Purdie
Darren Hart
Ilya Yanok
Saul Wold
Gary Thomas
Richard Purdie