The kern-tools scripts can support a meta branch and directory of a name that
isn't "meta", but they need the name passed through the environment variable
KMETA. ensuring that KMETA is exported in the shell environment sets the stage
to support flexible meta branch name.
(From OE-Core rev: 9b90c8ace04c88ac6105f0bf686f9abc70fe8074)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The kernel branch is no longer required by the yocto-kern-tools
to locate BSP feature descriptions (it is the MACHINE:KTYPE
descriptor), so we no longer require that the BSP branch be
explicitly set.
If a kernel branch is explicitly set, it is now used to trigger
a checks to ensure that the branch really is being built.
Otherwise the branch that the machine description creates will
be built (just as it always was).
This further simplies the use and configuration of a linux-yocto
based kernel recipe.
(From OE-Core rev: 3cac3ce65abae9dc253641a2004440a2b38fd44d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the kern-tools SRCREV to pickup the following functionality:
- buildall: provides the ability to build all kernel branches
without a build system, only a cross compiler and configme
are required.
- robustness/cleanups: obselete/unused code removal and general robustness
fixes from Paul Gortmaker and Bruce Ashfield
The following kern-tools commits are part of this series:
b8dfd3d buildall: add whitelist/blacklist support
0ef039c configme: catch errors found during fragment sanitization
5b6498c buildall: remove all instances of it using/reading scc files
2e57550 buildall: support semi seamless restarts
4b5dd4d kconf_check: simplify cmdline args, dont store data per branch
58fbb6e configme: relieve it of all knowledge of scc files
a03e291 configme: strip out alternative meta series logic.
96d2bcf kgit-init: check for valid branchpoint
5598db6 buildall: allow a max cap on the number of builds done
b46abec buildall: add support for randomizing build order
68a04e9 buildall: dont copy failed build logs into main build dir
5575d85 buildall: script to independently build all board kernels
86d6200 configme: delete unused variable
8d4e29d configme: delete unused KPROFILE setting
7e15436 configme: ensure we have a valid machine type set
152b9cb scc: remove depreciated/unused commands
bb4e96a scc: allow includes within conditional statements
7da7951 configme: derive path to tools from $0
152dc45 configme: test for BUILD_DIR != ""
129f7b0 kgit-scc: add warnings about bad input args.
e977662 kgit-scc: add text for no arg and invalid arg case.
[YOCTO #843]
(From OE-Core rev: be3cff86d55db6255e036d68e943e527802b4f4c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the kern-tools SRCREV to pick up the following fix:
Out of tree feature descriptions (.scc files) take two forms: normal
features and BSP descriptions.
A normal feature is detected and added to the end of the current machine
being processed. During tree processing, it's configuration and patches
will be applied.
A BSP description on the other hand must be matched based on three
critera (which are in the .scc file via "define <foo>"):
- machine
- kernel type
- architecture
Since features that define machines are only explicitly added, they
are removed from the list of features that should be automatically
added.
The criteria for removing them from the auto-add list is the
definitions found in the .scc file. The existing check was simply
for KMACHINE anywhere in the file. This meant that a conditional
or even a comment containing that phrase would exclude a file.
Properly anchoring the KMACHINE test to "^define.*KMACHINE" fixes the
problem of overly agreesive exclusions.
(From OE-Core rev: 75a973328d50ef3c007edb7a471ea77fb97911ea)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the kern-tools SRCREV to pick up fixes that remove unused
code, transition code (tree format changes) and to remove assumptions
about branch and directory naming.
There are no user visible changes with this update, but the plumbing
changes will be used in future updates for more generalized support.
The commit details are below:
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri May 11 12:13:12 2012 -0400
kgit-publish: remove --remote option
The ability to publish and automatically push a repository was
never used, and is error prone. The complexit isn't needed in
the script, so removing it is the best option.
An explicit push after tree publication is suggested, or a
wrapper script (specific to a particular infrastructure) around
this script.
(From OE-Core rev: 5b1a096211ebeb8dac4f1a39d96ae2f9a3d00634)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri May 11 12:04:09 2012 -0400
kern-tools: remove unused code, scripts and transition code
The period of supporting old trees with a different meta
branch name and directory structure are gone. So the cleanup
and removal of the old structure can be completed.
The meta branch and directory are now controlled via command line,
or via the KMETA environment variable. No testing and conditional
processing of the tree are required.
Additionally, the generate_cfg script is no longer used, or is the
branch conditing code in createme. So they can be safely removed
from the tools and repository.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu May 10 12:18:19 2012 -0400
kern-tools: remove meta tag and directory assumptions
During repository sanity checks (createme) and during the
checkpoint process, there were several assumptions about the tree
that either relied on a tag, or a particular directory name.
With this set of changes, simply passing the meta branch name is
enough to sanitize and restore the checkpoint. If no meta branch
name is passed, the default of 'meta' is used for both the branch
and meta data directory name.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The LICENSE field for kern-tools was generic and leads to QA warnings
from the license classs:
"No generic license file exists for: GPL in any provider"
Updating to a specific GPL version that matches the source fixes the
warning.
(From OE-Core rev: 72101b324062642474d67ee90356489993a973d0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The linux-yocto repository and scripts can support a mode of
meta data management that merges a base meta branch to every
BSP branch. In this case, the scripts don't have to restore
a checkpoint for the meta data to be globally accessible.
The decision to restore or not is made based on whether or
not the meta branch is part of all branches or not.
The linux-yocto recipes have a sanity check to determine if
the requested SRCREV for meta data matches the head of the
meta branch (via do_validate_branches). If the wrong commit
is at the head, the meta branch is moved aside and the branch
reset to the right commit. This creates two meta branches that
contain the base meta data.
The test for integrated meta data mistakes this for a globally
merged set of meta data and doesn't restore the checkpoint, which
leads to build failures.
The immediate fix is to allow two branches to have the meta
data. The long term fix is to make the detection only consider
if the build branch contains the meta data.
(From OE-Core rev: bd794b92d12ceda2728520701e980b7a3cabd23d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREV to pick up two minor fixes:
1/2:
kgit-init: correct spelling of createme
kgit-init copies the kern-tools scripts and intends to copy createme.
The typo is in the usage() of updateme as well.
(From OE-Core rev: 043871d7e5d2d19c2ff43e54d2ff180c09e8903e)
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
2/2:
kconf_check: fix bad quoting around missing_required.cfg
missing_required.cfg won't have it's path truncated (if applicable), since
the quoting it wrong.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In order to support repositories of various types (with or without
meta data, branched, pristine, custom, etc) information about the
type of processing that is required was passed to the processing
phases via variables.
The combination of variables involved in coordinating the processing
creates a learning curve and overly complicates recipe extensions.
With minor tweaks to the kern-tools, adding flexibility and keying
off the existence of the meta branch it is possible to remove all
of the variables that were added to support different repository
types.
(From OE-Core rev: 06e5f45c8f38925cd5902a3a3f436f5e9451dd16)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In fixing an existing patch migration bug, the list of valid extensions
got out of sync from the core patch class. As a result, valid patches
were not being applied to the tree.
Updating the tools to migrate .diff files fixes the issue.
Also in this fix is the removal of .patch in the find_sccs() routine, since
it will never be returned by patch.bbclass when all non-patches are
requested, it is simply confusing.
(From OE-Core rev: 0ade3f26f40b67d7296725b1e956c46be9a86089)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
During testing/extension of the linux-yocto-tiny kernel it was found that
defconfigs were not always properly applied. This was due to two issues:
- not being able to fully control the order of objects applied to the
git tree on the SRC_URI
- defconfigs triggering --allnoconfig before being applied
To fix this, the recipe space code that previously detected and generated
automatic features moves back to the kernel tools (where it was before) and
is updated to also process .cfg and defconfigs. Moving this back to the
tools allow other recipes to automatically benefit from the additional
support.
The second issue is addressed by allowing configme to take --alldefconfig
when a recipe wishes to pass a defconfig and override the default
behaviour.
Fixes [YOCTO: 2250]
(From OE-Core rev: 08c368b9980716e459d846dd7183940a5bf8bea4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
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>
To adapt to different branch names in a repository, removing explicit
references to 'yocto' in automatically created BSPs ensures that they
are consistent with the merged variants. Existing BSPs and auto BSPs
are not impacted by this change.
(From OE-Core rev: 74613d02aa844cac3be0626cc64139643fe17a4f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the kern-tools SRCREV to import the following changes:
a7a9930 kgit-meta/scc: allow multi-line defines
e3442c6 kern-tools: add required and optional kernel configuration processing
b56b67b configme: extract redefinition and mismatch information
6118eaf kern-tools: remove branchname assumptions
These are required to support the kernel configuration policy changes
implemented in the yocto 3.2 kernel repository.
(From OE-Core rev: 5a3759f4b23361dd2c1968ce51e5c3695a661972)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The commit:
kern-tools: update SRCREV to pickup git operation fixes
Brought in the ability to trap failed git operations on the working tree,
but what it missed were some branching changes that allow arbitrary
branch points and the ability to create a branch multiple times (if a feature
is included multiple times). The graphics driver branches used by some
BSPs need this part of the change to properly handle graphics driver
branches.
Updating the SRCREV to pickup the associated kern-tools changes for this
support.
(From OE-Core rev: 229036a961bae61847a05546a92dfc93a88c6f67)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the kern-tools SRCREV to pickup the following commit:
[
kgit-meta: add error checking and autoconfiguration to git commands
When git commands are embedded into feature descriptions, they can
fail for a variety of reasons. The current meta series processing does
not trap errors, and will continue to process potentially failing
commands. All git commands are now checked for their return code, and
in case of error, the error code is passed up via early exit.
A second common git issue is on a new machine that has not been
configured with a username/email for commits. This is now detected
by checking for a global user.name. If one is not found, a local
user name of "Auto Configured" and email of "auto.configured" is
created to allow git operations to succeed.
]
Fixes [YOCTO #1838]
(From OE-Core rev: 015cb39ccf490de07bfd007fafc6d75c6c152add)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously the install of the kern-tools was manual and fully controlled by
whatever build system was integrating/using the utilities. To make this more
generic a Makefile is now provided to take care of installing and removing to
DESTDIR.
Updating the kern-tools recipe to take advantage of this new facility.
(From OE-Core rev: 8af13cc0038111cbb13d9718256d491d326ed5e8)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As a transition step to moving kern_tools into the kernel tree
itself this change adopts merge_config.sh as a common base for
merging configuration fragments. So we add merge_config.sh and
pre_config to the list of kern_tools.
(From OE-Core rev: 78efb73e0bca09c09574ce23622859db412a26c8)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There were some config fragment warnings that were being hidden
by virtue of being output while generating the full config versus
the ones that were generated during the configuration audit task.
This change does the following:
- Updates the kern-tools SRCREV to include changes that move
all kernel configuration warnings to the audit script
- Updates the meta SRCREV for linux-yocto to get updated
kernel configuration fragments that are warning-free. These
are duplicated configs, and other changes that have a net
result of no runtime changes.
(From OE-Core rev: 8e67d4dd1e1bc64a84791abc613e237e29dd2aaa)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After constructing a kernel configuration file it then needs
to be located in the tree so it can be audited against the
final .config. The previous string that was used for the search
pattern contains the kernel version. If the recipe space kernel
version and internal tree version are out of sync, this will
cause the constructed config to not be found. By removing the
version from the search string, we can still find out config and
gracefully adapt to minor version skew.
(From OE-Core rev: f072ddc43828ebe8df4dd7433726775dd547580b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREV to pickup a series of changes to the
kern-tools that allow more flexible creation of trees from
scratch. This functionality is not used by the normal
kernel build process and has no impact on existing builds.
(From OE-Core rev: faaa03c2a166e37a11edd52011799e6a8cff144d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building an external tree or bootstrapping a BSP the
external branch may not have been checked out. The tools now ensure
that the tree is ready for configuration, so we no longer need to
force the checkout of the external branch.
This change is coupled with some kern tools tweaks as follows:
40d9bab updateme: allow the location of board descriptions based on defines
59859ca createme: use branch name when creating meta data
91b4275 configme: determine meta branch based on directories, not branch naming
f5a915c kgit-meta: make branch creation and renaming more robust
(From OE-Core rev: 02c82bf5255b09bb27a0a4509861a3d2bd84b09f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #1261]
Updating the SRCREV to pickup some branch creation fixes that
were causing an invalid branch name to be used on a repository
that couldn't support it (i.e. standard/base on a 2.6.34).
With this the 2.6.34 and 3.0 -rt branches will build.
(From OE-Core rev: e1df34c9d4614adc04528b73a8860e973c5db54d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When a BSP or layer specifies an AUTOREV for SRCREV, the logic
that matches expected vs real branch heads doesn't apply. We
always want the latest.
To solve the issues with invalid git revs causing validation
failures, we detect the AUTOINC value and do a early return,
skipping validation.
(From OE-Core rev: b4f1845f7cf42059984112e3f41a323b4c9d6dfd)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes bug: [YOCTO #955]
Updating the SRCREV to pickup the kern-tools change:
[
updateme: error if features are not found
Rather than silently dropping addon features, we emit a warning
and then exit with a failure code. The caller can then abort a
build and not simply miss features.
Passing --no-strict to the script disables this new functionality
if for some reason a feature description is missing on purpose.
]
(From OE-Core rev: d7f3e91c15328440ffbf501c502098133fd34d3a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 BSP bootstrap and -dev use cases can be applied against
unbranched or repos without meta data. To allow the proper
and safe processing of those repositories, slight modifications
to the tools are required to pass the branch on the command
line (rather than detecting it always) and to only checkout
branches that exist.
(From OE-Core rev: ae754be8b43677604a853ec6f62b2490a91d8836)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To support quick uprev and testing, it is desireable to build
repositories that do not have embedded meta data. In this scenario
the meta data can be automatically created or provided externally.
This commit supports the first situation by detecting the lack
of meta data and then automatically creating a base set of meta
files.
(From OE-Core rev: 32c56cd6a5756f21d19d8a32239b783a7854aed3)
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>
As the first of several changes to the kern-tools coupled to
the branch management in the yocto kernels the repository
is being renamed to it proper name. This change switches us to
that newly created repo.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
By default the linux-yocto recipes operate on the current branch
and use it as a trigger to locate the description of a board. This
model works well when using the git repo outside of a build system
since the commands can be simply invoked and will do something
useful. However, it does mean that you can't have two BSPs that
differ only by configuration, building out of a single branch
in the repository.
This means that you must have many branches for very similar
BSPs. This model is still preferred, but having the choice of
branching strategies is better.
With this change we can have multiple BSPs using a single branch
with the preferred description being hinted from the build
system by passing the $machine value to updateme/configme.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [BUGID: #390]
The custom de-checkpoint routines used in createme/patchme
destroyed data each run. This meant that incremental and
expermental work couldn't be done directly in the kernel source
tree itself. Using the more robust kgit-checkpoint allows that
data to be persistent (until a clean is done).
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes [BUGID #388]
Even if we aren't creating the branch from scratch, it is possible
that it has never been patched before. So let's make sure the
infrastructure for patching is always in place.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Bruce Ashfield
Martin Jansa
Yu Ke
Richard Purdie
Kevin Tian
Richard Purdie