Commit Graph

12 Commits

Author SHA1 Message Date
Bruce Ashfield bfba970765 guilt: update to latest git version
Uprev guilt to the latest guilt version from its upstream repository.
As part of the uprev all of the previous changes required for the
yocto kernel tools to use git to manipulate series files have been
dropped. These changes were specific to circumventing parts of guilt's
internal santiy checking to allow specific Yocto kernel manipluation
of sub-series files.

Since the kernel tools no longer need guilt, we can use an up to date
and nearly pure upstream version of guilt.

(From OE-Core rev: 595c4469adc36d88ba2403915fc6c1d355014a58)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-26 11:29:45 +01:00
Bruce Ashfield 8d4b82e716 guilt: remove GIT_EXEC_BASE export
git-core provides the following routines (among others): git-sh-setup,
cd_to_toplevel, die, and more.  But it is not always in the same location
relative to the guilt binary if git is not part of a 'host tools'
sysroot. Modern git versions don't need this, so commenting it out (until it
breaks again) is the solution to the problem of it not existing, and the
library routines will sourced and provided by git itself.

Since bitbake.conf has git-native as ASSUME_PROVIDED, this means that
when the system git binary is used, errors such as this can be seen in
failed patch logs:

| /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/guilt: line 29: /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/../libexec/git-core/git-sh-setup: No such file or directory
| /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/guilt: line 717: cd_to_toplevel: command not found
| error: patch failed: Makefile:2
| error: Makefile: patch does not apply
| /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/guilt-push: line 137: die: command not found
| [ERROR] unable to complete push
| pending patches are:
| /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/guilt: line 29: /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/../libexec/git-core/git-sh-setup: No such file or directory
| /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/guilt: line 29: /opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/../libexec/git-core/git-sh-setup: No such file or directory
| links/linux-yocto-custom/0001-linux-version-tweak.patch
| ERROR. could not update git tree

With the export removed, we have a normal "clean" failure message when
the sysroot or system git is used.

(From OE-Core rev: 9ca697a7f83957205bc418acfd7f45fe4cbddbee)

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>
2013-02-04 13:18:27 +00:00
Bruce Ashfield 349e5bea53 guilt: add git 1.8.x support
Updating guilt to allow git 1.8.x as a supported version. This version has
no impact on other functionality within the scripts, so no other adjustments
are necessary.

[YOCTO #3275]

(From OE-Core rev: 18bc7b44ef58cbcbe32d45504d71eed54ef695a4)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-18 13:28:10 +00:00
Bruce Ashfield 989bc4e4c6 guilt: change upstream tgz location
The kernel.org mirror of the guilt tarball has been missing for a while
and the yocto mirrors have been keeping builds working. Switching to a
debian upstream is better than solely relying on the yocto mirrors for
serving the tgz.

(From OE-Core rev: 71f281f40e25bdd3ea052cb673d06c1a250e618f)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-20 15:31:52 +00:00
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
Saul Wold 7b15d99e6c Patch Upstream-Status Update
(From OE-Core rev: f58bb1692c5700091f960e0fb90e5c39ebf5ab96)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-05 11:24:48 +00:00
Saul Wold 541c7c8626 guilt-native: Add SRC_URI Checksums
(From OE-Core rev: 77528ac80ab8f41075150f3dded147b0feece67a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:44 +01:00
Phil Blundell ba3995d7ee guilt-native: eliminate hardcoded "/usr" in do_install
For some reason guilt-native seems to have gone out of its way to refer explicitly to /usr, which breaks on micro.
Let's use ${prefix} instead.

(From OE-Core rev: e3ada06e13820539425a4780cd749bf974b96b6f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:46 +01:00
Tom Rini d56080ff06 Various: Update KERNELORG_MIRROR for consistency
In mirrors.bbclass we point into /pub but we don't in bitbake.conf.
All uses of KERNELORG_MIRROR look into /pub anyhow, so lets make
use of that.

(From OE-Core rev: 67a0c8f48b5ef2ae5fc712c9204e4e99818c8134)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:44:04 +00:00
Tom Rini 4f85b60306 Various: Switch to KERNELORG_MIRROR
(From OE-Core rev: a0eeed089a5c185ef721b11828d4a27f0c03791c)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:44:03 +00:00
Saul Wold 4773a66b90 guilt: add LIC_FILES_CHKSUM
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-23 14:31:23 +00: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