Commit Graph

25 Commits

Author SHA1 Message Date
Martin Jansa 3349b88a76 More quoting fixes
* 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>
2012-02-26 22:51:58 +00:00
Bruce Ashfield 5d02d8dc17 kern-tools: remove explicit 'yocto' references from auto-bsp handling
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>
2012-02-08 00:50:27 +00:00
Bruce Ashfield 278e53ca6b kern-tools: import config audit and branch manipulation updates
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>
2012-02-01 15:07:43 +00:00
Bruce Ashfield b3cc230429 kern-tools: import flexible branching support
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>
2012-01-06 12:11:31 +00:00
Bruce Ashfield 6ede5cf045 kern-tools: update SRCREV to pickup git operation fixes
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>
2012-01-03 12:12:37 +00:00
Bruce Ashfield 8885163a35 kern-tools: use Makefile provided install rules
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>
2011-12-02 15:20:27 +00:00
Bruce Ashfield 19b4f42db4 kern-tools: add pre_config and merge_config.sh to the list of tools
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>
2011-12-02 15:20:27 +00:00
Bruce Ashfield 093c27a8fd linux-yocto: kernel configuration cleanups
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>
2011-09-22 04:50:08 +01:00
Bruce Ashfield 593b2e277b linux-yocto: generalize kernel config search pattern
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>
2011-09-05 20:25:46 +01:00
Bruce Ashfield d7b152da65 kern-tools: allow flexible branch points
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>
2011-08-24 15:27:33 -07:00
Bruce Ashfield 5e4a6bd7e2 linux-yocto: allow configuration of arbitrary branches
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>
2011-08-08 13:41:21 +01:00
Bruce Ashfield a7d38bca9c kern-tools: update SRCREV
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>
2011-07-22 11:51:03 +01:00
Bruce Ashfield afe43ed090 linux-yocto: detect and avoid branch revision checking for AUTOREV
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>
2011-05-17 15:14:43 +01:00
Bruce Ashfield b0e6fc76a8 kern-tools: error if features are not found
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>
2011-05-13 10:29:01 +01:00
Bruce Ashfield 5aa69f20f2 linux-yocto: error if meta data not present
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>
2011-05-10 09:56:21 +01:00
Bruce Ashfield 1e54b756e9 linux-yocto: safely process unbranched repositories
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>
2011-05-05 12:26:47 +01:00
Bruce Ashfield 1fc3964657 linux-yocto: apply meta data to external repos
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>
2011-05-05 12:26:47 +01:00
Yu Ke 61018fda65 poky-default-revisions: move the SRCREV to recipe file
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>
2011-05-04 15:06:36 +01:00
Richard Purdie 5164821975 Fix git.pokylinux.org urls to git.yoctoproject.org
(From OE-Core rev: adbf55721ee956897c0951cff63aeb1defb3c738)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:31 +01:00
Bruce Ashfield db9b8bc9a3 kern-tools: update to the new repository
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>
2011-01-25 12:01:13 -08:00
Bruce Ashfield 97cb3124ec linux-yocto: allow multiple BSPs per branch
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>
2011-01-24 14:42:55 -08:00
Bruce Ashfield 12b0f4903a createme/patchme: use kgit-checkpoint to restore meta data
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>
2010-10-04 09:40:59 +01:00
Bruce Ashfield 1225cc4486 kern_tools: allow patching on autocreated/empty branches
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>
2010-10-04 09:40:59 +01:00
Kevin Tian 5c1638ced3 kern-tools: add dependency on guilt-native
Fix [BUGID #262]

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
2010-09-03 08:57:57 +01:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
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>
2010-08-27 15:29:45 +01:00