Importing the following tools SRCREV:
kgit-meta: exclude explicit branches from name calculations
kernel branches are constructed during patching of the tree by
constructing a '/' based hierarchy of names as each branch
directive is encountered.
But if a "branch $name $branchpoint" is used, the entire branch
name is supplied so no additions to the hierarchy should
happen. As such, that type of branch command should not be part
of branch name calculation and preparation.
(From OE-Core rev: a3884938233c8a2d6861b1d4e6be5b9824d3b131)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
do_validate_branches ensures that the desired SRCREV is at
the tip of every branch that contains the revision. To do this,
it looks for containing branches and processes them.
This processing was mistakenly placed before the check for an
invalid SRCREV, hence a git error message is seen in the log
if a bad SRCREV is used, rather than a clear message.
reordering the checks, and fixing a check for master, ensures
that clear messages are generated in all cases.
(From OE-Core rev: 7e4518bf88af53b09536a3bafcd4c392a094023f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When patches fail to apply, the status of all pending patches should
be exported to the logs and to the user. Currently, a missing export
of GUILT_BASE makes it look more like an internal error, than a 'normal'
patch failure:
| [ERROR] unable to complete push
| pending patches are:
| Patches directory doesn't exist, try guilt-init
With this variable exported, we have this:
| [INFO] validating against known patches (qemux86-standard-meta)
| error: patch failed: Makefile:2
| error: Makefile: patch does not apply
| To force apply this patch, use 'guilt push -f'
| [ERROR] unable to complete push
| pending patches are:
| links/files/0002-makefile-patch.patch
(From OE-Core rev: b2b2512cbc4196fa0f814be3677517dab30e5b52)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
commit 7a79f7412 [linux-yocto: make KBRANCH the exception and not the rule]
ensures that a request branch is always built. The implementation of this
guarantee is a branch switch before the build starts. But that switch may
be before all patches are applied. If the proper routines are not called,
no patches can be applied to the tree.
Updating the SRCREV to pickup this fix:
updateme: use branch command when forcing branch switches
When forcing a branch switch to the desired branch we should be
using the proper 'branch' command. Since without this call, the
proper variables will not be set, and patches can't be applied
to the tree.
(From OE-Core rev: bede3086cb9ab0f79fb7775528b646817b2b9af0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Original recipe added by RP in fc128ab1e4
was saying GPL (later GPLv2)
* COPYING.GPL was added to reflect that
* Meta-oe has similar recipe with MIT license and even more scripts, so lets
change LICENSE here too
* Most code was derived from the meta-oe version or added to OE arguably
under MIT and the MIT license makes most sense here
(From OE-Core rev: 54a4a0b42d4515260841229d69f9cc43485bcb78)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Move parts of local.rules from udev to udev-extraconf
* Move mount.sh and network.sh to udev-extraconf along with rule fragments
* Add mount.blacklist to CONFFILES
* Change PV to 1.0 and bump PR to provide upgrade path from meta-oe's udev-extra-rules
including RREPLACE/RPROVIDES/RCONFLICTS trio
(From OE-Core rev: 0ca3a7823e97c4e4af6e89d852f98d29ed6193d7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* now with subversion-native we know those 2 options are supported
* with https protocol used for SVN checkouts we cannot confirm certificate and do_fetch fails
Error validating server certificate for 'https://foo:443':
- The certificate is not issued by a trusted authority. Use the
fingerprint to validate the certificate manually!
Certificate information:
...
(R)eject, accept (t)emporarily or accept (p)ermanently? svn: E175002: Unable to connect to a repository at URL 'https://foo/trunk'
svn: E175002: OPTIONS of 'https://foo/trunk': Server certificate verification failed: issuer is not trusted (https://foo)
ERROR: Function failed: Fetcher failure for URL: 'svn://foo;protocol=https;module=trunk'. Unable to fetch URL from any source.
(From OE-Core rev: 8f1cedaaafd1248e77db84ac238fa88a318df2e9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If libidn is just populated to sysroot but rpm packages are not created,
build ghostscript will check libidn automatically and then depends on
libidn. But package libidn doesn't exist, so build image which contains
ghostscript will fail with:
| error: Failed dependencies:
| libidn11 >= 1.25 is needed by ghostscript-9.05-r2.i586
| libidn.so.11(LIBIDN_1.0) is needed by ghostscript-9.05-r2.i586
| libidn.so.11 is needed by ghostscript-9.05-r2.i586
Disable libidn support to fix this issue.
(From OE-Core rev: 509eb624c89249ff169de24fed448e8d7894a6f6)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When libidn has been populated to sysroot but rpm packages are not
created, build msmtp will check libidn support automatically and then
depends on libidn. But package libidn doesn't exist, build image which
includes msmtp will fail with:
| error: Failed dependencies:
| libidn11 >= 1.25 is needed by msmtp-1.4.24-r3.i586
| libidn.so.11(LIBIDN_1.0) is needed by msmtp-1.4.24-r3.i586
| libidn.so.11 is needed by msmtp-1.4.24-r3.i586
Disable libidn support to fix this issue.
(From OE-Core rev: a304789cecb1a6ffa3c5a56f617eea4a5ac29a98)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a build issue with wget idn support. When libidn has been
populated to sysroot but rpm packages are not created, wget checks libidn
support automatically and then depends on libidn. But package libidn
doesn't exist, build image which includes wget will fail with:
| error: Failed dependencies:
| libidn.so.11 is needed by wget-1.13.4-r14.3.core2
| libidn.so.11(LIBIDN_1.0) is needed by wget-1.13.4-r14.3.core2
Disable iri/idn support to fix it.
Signer-off-by: Kang Kai <kai.kang@windriver.com>
(From OE-Core rev: 48a11f8dc9f70cfc205f558b4dc959c8b4d5e0cd)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently gettext and eglibc compete to provide for libintl on
nativesdk. So make choices to select eglibc nativesdk to provide
for both eglibc as well as uclibc based systems.
(From OE-Core rev: 1e7797a0a8e8fd565d218bd7b9993e16f158764f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Create a new packagegroup-core-device-devel which pulls in everything
that qemu-config used to, with the exception of anjuta-remote-run -
this is unlikely to be widely used
* Move the remainder of qemu-config to distcc-config and allow
DISTCC_HOSTS to be configured via a variable of the same name
* Use SUMMARY instead of DESCRIPTION for single-line description since
DESCRIPTION is defaulted from SUMMARY if not set
(From OE-Core rev: ac510cb82c007f987b481df74c7a5fede81fa85a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cleanly shutting down the machine from Sato is useful on other machines,
not all of which have a power button that otherwise enables this, so
make it not specific to qemu* and add it to task-core-x11-sato.
(From OE-Core rev: 738005f4713c0da7bc04582a41efa956efdb9cc0)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The qemu-config initscript was only starting oprofile-server, so move it
to the oprofileui-server recipe.
(From OE-Core rev: 3063126e2c8ec72e900a48f7048aaf9662606792)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Given that support for Anjuta is unlikely to be needed by everyone and
is by no means specific to qemu, split it out to a separate recipe. The
following changes were made in the process:
Also depend on dbus instead of dbus-x11 since dbus-launch is now back in
he main dbus package
Part of the fix for [YOCTO #1690].
(From OE-Core rev: e6755e3351ccf1116c06b9608728630505908ce4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Increase SRCREV to include an upstream patch that fixes the configure
script so that the server can be built separately without gtk+ and
avahi-ui, and create a separate recipe for the server.
Also fix the RDEPENDS so that oprofile actually gets pulled in by the
client and the server.
Part of the fix for [YOCTO #1690].
(From OE-Core rev: 971fbbd50ae147805fc7498b72a046be5bffc3c7)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These files are all trivial in nature; so avoid having to have another
copy of COPYING.GPL just for this recipe - especially as it's about
to be split apart.
(All of the files in SRC_URI have only ever been contributed to by
employees of Intel and/or OpenedHand.)
(From OE-Core rev: 4d29ef0fa885299392779042830b95176e31fe11)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
License checksum change due to the modification of the pre-compiled
binaries section (no change in the license part).
(From OE-Core rev: a0bfc2e014220ac97e7cd88c9579d5bcb2b1024b)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow references to the old task packages to continue to work. This does
not add RPROVIDES for everything, just those packages that are likely to
have been referred to.
(From OE-Core rev: b41c45972a6d359f034615471959c84aee2bc456)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Create package groups covering the Core, Desktop, Runtime Languages
sections of the LSB specification 4.1. Most of the packages were just
moved around or copied in from packagegroup-core-basic (which is
currently included in LSB images anyway) with the eventual aim of
having the LSB package groups be completely independent as well as
following the specification as closely as possible.
(From OE-Core rev: 61b134fd082b4ca2866b98655c5fc3a275834464)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove packagegroup-core-basic-rpm - we already have a mechanism for
ensuring that packaging tools are installed on the target if desired;
we don't need a package group to bring them in as well (especially if
packagegroup-core-basic is used with other packaging systems).
* Remove the poorly-named packagegroup-core-base-utils: we already get
busybox via packagegroup-core-boot.
(From OE-Core rev: e7abf8437c7128e8541411213d262137520456a7)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This provides one package group, packagegroup-core-apps-console, which
is usually brought in by adding "apps-console-core" to IMAGE_FEATURES.
Aside from the naming inconsistencies, this is a group of mostly
unrelated packages, none of which are actually "apps". Handling each
one:
* dbus: should mostly be brought in by package runtime dependencies
* avahi-daemon: if you are using packagegroup-base (as all images that
inherit from core-image do) this is brought in by having "zeroconf" in
DISTRO_FEATURES.
* portmap: not very useful by itself; should be brought in by selecting
NFS server/client through other means.
* psplash (or whatever SPLASH is set to): this has been changed to be
an explicit item "splash" in IMAGE_FEATURES. Since this is a fairly
fundamental feature, a piece of code has been added to automatically
handle this for images still using apps-console-core (and show a
warning).
(From OE-Core rev: 592d6e602466628d10704835a7b07d3d713f58e1)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since package groups don't actually fetch or distribute anything and we
no longer run do_configure we don't need to set this variable anymore.
(From OE-Core rev: 4c511f77e38cbc9d8d633fef3b1ab4cf93440258)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable tasks other than do_package* (similar to how image.bbclass
disables everything except do_rootfs). This saves a little time as well
as neatly avoiding the LIC_FILES_CHKSUM verification within do_configure
which is not needed for package groups.
(From OE-Core rev: fde2b0db798f03cf297a0d466a9c3a444f1321f3)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
openswan was only ever provided in unmaintained form in meta-demoapps
which has been removed, so we never really provided it in OE-Core.
(From OE-Core rev: 660fa4f58805a54bcb0ea0b218779e0abcf3fd65)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There's only one package, just make it the main one; also update
core-image-gtk-directfb to match and tidy it up a bit.
(From OE-Core rev: b3a49ebaa2149ac66e7d82b63dd29a83f6d96429)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Eliminate the -base package, there's only one package and it might as
well be the main one.
* Rename to packagegroup-core-qt4e to match other package group recipes
* Fix and tidy up qt4e-demo-image at the same time
(From OE-Core rev: 9dddc9dfdc84401fee3b48eb3aba0cabdcf4d05a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Now the Sato pieces have been moved out, rebase packagegroup-core-x11 on
packagegroup-x11-mini but using the structure/contents of meta-oe's
task-x11 so that it can replace that; rename packagegroup-core-x11-mini
to packagegroup-core-x11-base and pull in the xserver/utils packages via
packagegroup-core-x11, and move both of these recipes under
recipes-graphics.
x11-mini is renamed to x11-base as it's what people should build on top
of and since x11-mini is newer, the corresponding IMAGE_FEATURES item is
less likely to be used in existing user recipes.
(From OE-Core rev: 0cc9ced7d96b960994b0671095bc74becfc55e2c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move Sato applications to packagegroup-core-x11-sato.
Note that this eliminates both the apps-x11-core and apps-x11-games
IMAGE_FEATURES; in practice it is unlikely these were useful to anyone
outside of the Sato images however.
(From OE-Core rev: 46cc375f29d5ecac7311613514a474f288d7c781)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
