Commit Graph

227 Commits

Author SHA1 Message Date
Martin Jansa 2c5079be86 recipes: bump PR to rebuild after libffi5 -> libffi6
(From OE-Core rev: 211200fb98a72ba815e7c411fbebfd781879064c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-19 17:56:26 +01:00
Ross Burton 13221b222b webkit-gtk: work around Make bug by re-running make
GNU make 3.82 has a bug where it drops required dependencies.
https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+
bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug.

Work around this by running make again if it fails just in case the failure is
due to the bug.

Based on a patch by Andreas Müller <schnitzeltony@googlemail.com>.

[ YOCTO #2816 ]

(From OE-Core rev: af5bdc8ca413d6cabeb4f4b4c5836912a17f28be)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:37 +01:00
Paul Eggleton 29c19460e2 packagegroup-*: add RREPLACES/RCONFLICTS
These are needed to support upgrading from task-* to packagegroup-*
within existing target images at runtime.

Note: these settings will very likely be moved out to a separate inc
file at some point in the future.

(From OE-Core rev: 5dd4de086d744c81d2275077ad0e0022204b0a68)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-04 18:03:18 +01:00
Paul Eggleton 54b8e84356 qemu-config: split out shutdown icon to its own recipe
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>
2012-09-04 12:53:07 +01:00
Constantin Musca 1bb944a3df puzzles: upgrade to r9594
(From OE-Core rev: 76c2c84551c62ff417ca337ea14dc9ddd6c8ccdd)

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>
2012-09-04 12:53:06 +01:00
Paul Eggleton 4a0bec4277 packagegroup-*: add RPROVIDES for backwards compatibility
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>
2012-09-04 12:53:03 +01:00
Paul Eggleton c946fc03a8 packagegroup-*: set reasonable SUMMARY/DESCRIPTION
(From OE-Core rev: 996291ef305ddacf852377cc402dbbac299bc215)

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>
2012-09-04 12:53:01 +01:00
Paul Eggleton 2a21c83300 packagegroup-core-console: remove
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>
2012-09-04 12:53:00 +01:00
Paul Eggleton b9052eec6f packagegroup-*: drop LIC_FILES_CHKSUM
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>
2012-09-04 12:52:59 +01:00
Paul Eggleton 8eba44660e packagegroup-core-x11*: adjust X11 package groups
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>
2012-09-04 12:52:58 +01:00
Paul Eggleton ce1f15059a packagegroup-core-x11: move out Sato applications
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>
2012-09-04 12:52:57 +01:00
Paul Eggleton 9bb6f42763 packagegroup-*: change to inherit from packagegroup.bbclass
Also clean out items already handled by that class (dev/dbg packages,
ALLOW_EMPTY, etc.)

(From OE-Core rev: 65fca4458cfe1d647c7ea1d4588dc449739a73eb)

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>
2012-09-04 12:52:57 +01:00
Paul Eggleton 272cb74d70 Rename task to packagegroup
"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.

(From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf)

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>
2012-09-04 12:52:55 +01:00
Paul Eggleton 153d413b47 classes/core-image: remove *_IMAGE_FEATURES variables
This indirection does not add anything in terms of configuration and
only serves to increase confusion; and given the nature of these it is
unlikely they are being used outside of OE-Core. Change the sato-sdk and
sato-dev images to be based on the main Sato image (avoiding the need
for a common SATO_IMAGE_FEATURES variable) and eliminate all references
to them.

Fixes [YOCTO #2458].

(From OE-Core rev: 6488842b0d03cfec9f8675eca5a2e05675decf66)

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>
2012-09-04 12:52:54 +01:00
Paul Eggleton 5f0e3d8c89 classes/core-image: remove SSHSERVER_IMAGE_FEATURES
This variable was added in the very same commit that added a mechanism
that makes it obsolete: if you have dropbear and you want openssh, you
just add ssh-server-openssh to your IMAGE_FEATURES and it will replace
dropbear via IMAGE_FEATURES_REPLACES_.

(From OE-Core rev: 6c78d99cc2e54a99af22357d7567f64e864949b9)

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>
2012-09-04 12:52:54 +01:00
Ross Burton dbc8cc458b task-core-x11: default to xserver-xorg instead of kdrive
(From OE-Core rev: 9af014091359b07c10afa3a04961bcbcfd74bc1e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-02 05:52:08 -07:00
Ross Burton a102793b15 libowl-av: patches merged upstream, bump srcrev
(From OE-Core rev: 5b0d8cb8463da423035484f42659926b472c53b3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 18:04:20 +01:00
Ross Burton 75bb9025ea owl-video: patches pushed upstream, so bump srcrev
(From OE-Core rev: 65c62f8734dc56d411d33f638716e99790f2895f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 18:04:19 +01:00
Andreas Müller 883d199d93 webkit-gtk: update to 1.8.2
run tested with midori 0.4.5:
* google maps
* google mail (https)

(From OE-Core rev: 8a2ecf231851ae0c4bde0c4edb43c64883b91c5c)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 13:10:07 +01:00
Ross Burton 5e775b5e5c pimlico: Remove
Remove the Pimlico applications (Contacts, Dates, Tasks).  oe-core isn't a
reference PIM stack, so we don't need this.

(From OE-Core rev: 373895e6c691277e15a09aee3504243448c55b50)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 15:26:26 +01:00
Saul Wold 7f515e942e rxvt-unicode: cleanup update-alternatives deprecated code
(From OE-Core rev: 0dc9024cb6e5f75f5b568b42b03925c413093f4e)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:25 +01:00
Saul Wold 5b8a9e3980 rxvt-unicode: remove setting of LD_LIBRARY_PATH
This is no longer needed as we do not run tic at install time

(From OE-Core rev: c73ab3c1ef27af0577617b0d992da535958b0aed)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:25 +01:00
Richard Purdie e496e3df23 eds-tools: Drop this recipe, its inapproriate in OE-Core
(From OE-Core rev: 302a1251be7ec81fc1d270d9d7b6db6d140d4692)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-28 09:20:53 +01:00
Robert P. J. Day b882a12ef2 webkit-gtk: Replace superfluous "+=" with "=", and add leading space
(From OE-Core rev: 201fa631175bb0a32c53922c630d403493e61bad)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-26 14:40:46 +01:00
Ross Burton 27b4cf2db0 webkit-gtk: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 56011bb732950da207ab55a891aa8fc228a9f5e9)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:19 +01:00
Ross Burton a2afa6955f evolution-data-server: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 18ef5e7d691a05565db88ffd0c13475ad9b0dcf3)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:19 +01:00
Ross Burton 35a0c103c1 webkit-gtk: bump PR
Accidently ommitted the PR bump from the previous patches, which change the
build.

(From OE-Core rev: 294b34416921ed6ff5dd800656b44552561beb09)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-20 12:32:53 +01:00
Khem Raj ceb0f25ac1 puzzles, mkelfimage: Use svn protocol instead of http
These repos are not setup to serve through http protocol

(From OE-Core rev: add617cbeac9fcf4621cca45a0800c5ab6239c5a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-20 12:32:53 +01:00
Richard Purdie 73cf0335c4 Remove a number of unneeded import os/bb calls
The bb and os modules are always imported so having these extra import calls
are a waste of space/execution time. They also set a bad example for people
copy and pasting code so clean them up.

(From OE-Core rev: 7d674820958be3a7051ea619effe1a6061d9cbe2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 12:24:50 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Saul Wold 18d4ed7324 puzzles, mkelfimage: Add protocol=http
This would fail in some firewall situations otherwise

(From OE-Core rev: 4c1a768238fe9a36b7ed714c9c40951b7357410a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:30 +01:00
Ross Burton 12e68d410b webkit-gtk: remove spurious install_prepend hack
This "fix" causes an (ignored) error now, so at some point it was fixed.

(From OE-Core rev: 03690060fe13e083723a572ec0438a1381e418db)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:30 +01:00
Ross Burton e4c43e2f18 webkit-gtk: remove no-parallel bodge
This workaround was originally for GNU Make 3.82 which upstream was blaming
for a parallel build failure.  Since then I've changed numerous variables
and now parallel builds are working with 3.82 (and succeed in 20 minutes
instead of 2 hours).

Revert the change until we've more data about what causes the breakage, then
we can bring it back with more finesse.

(From OE-Core rev: 90ca88a6f9dd5e2bc055739f84cb224f9a82455a)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:30 +01:00
Ross Burton 4343662a04 web-webkit: don't link using g++, it's not needed anymore
(From OE-Core rev: cd9a97c063a6c58b022d95ca9de8bcce784f1d3a)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:29 +01:00
Ross Burton 12f5b06fe4 web-webkit: push make whitespace fix upstream
(From OE-Core rev: 9073ec0610a9e28c4b2bc90ace7a6b1c0cc99f75)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:29 +01:00
Ross Burton e4ce4b41a8 web-webkit: remove unused dependencies (taken from the gecko-based recipe)
(From OE-Core rev: cc156badafe1e42653b9eb080c0dffd47d2a6130)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:28 +01:00
Ross Burton 7765ad4d69 webkit-gtk: remove svn recipe
(From OE-Core rev: ecb18e2b6a8fc16b323f93c62ed5ff5b080c5dd0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:06 +01:00
Ross Burton c9f855e040 webkit-gtk: add 1.8.1 recipe from tarball
License checksums changed as new years were added.

(From OE-Core rev: e6c5f1edcccfc78259caac853361c14ebe6d2677)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:06 +01:00
Nitin A Kamble d108b8a884 webgit-gtk: fix build with automake 1.12.1
Added a new patch:
  webgit-gtk_fix_build_with_automake_1.12.patch

More comments in the patch header.

(From OE-Core rev: f3ea68cdd2559d84d5b2cd95323d186fff14c7b7)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:05 +01:00
Nitin A Kamble fc537f3447 evolution-data-server: fix build with automake 1.12.x
Added 2 patches:
   avoid_automake_errors.patch
   fix_for_automake-1.12.x.patch

More information in the patch headers.

(From OE-Core rev: 64c2aa566f022525c7ef0acd7a80359446675990)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:04 +01:00
Nitin A Kamble 6dfb17b488 dates: fix build with automake 1.12.x
automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.

cleanup the do_install_append for automake 1.12.x

(From OE-Core rev: 0d333c61c6ce74666ce87593dc2797ca45a97766)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:03 +01:00
Nitin A Kamble 33ec0e115c pcmanfm: fix build with automake 1.12.x
Added a patch:
  pcmanfm_fix_for_automake_1.12.patch

More information in the patch header.

(From OE-Core rev: fee7861dcaef40ab86888a12fc2550d03463f98a)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:03 +01:00
Saul Wold e789c1b406 puzzles: convert to use SVN
Recently the tarball has been changing due the fact it gets rebuilt
nightly and timestamps are getting updated and changed internal to
the tarball.  Moving back to SVN to try and address this.

(From OE-Core rev: 8f30d41ede28a86564c402ce5b467e51aec6b15d)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:53:56 +01:00
Saul Wold 14c4a41f88 Update proto -> protocol for recipes
(From OE-Core rev: 247fbed5a93800c44dc36e403f13bdc8dd704553)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:53:55 +01:00
Robert P. J. Day cf94f383bd core-image-*.bb: Remove usage of EXTRA_IMAGE_FEATURES from some .bb files
Replace the usage of EXTRA_IMAGE_FEATURES in a small number of .bb
files with IMAGE_FEATURES, and leave the use of EXTRA_IMAGE_FEATURES
for developers in their local.conf files, to avoid the possibility of
undesirable side effects.

(From OE-Core rev: 347fc6e82a3d1c1ac7dbabd9e5cdd08abd864bfb)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-10 14:21:58 +01:00
Paul Eggleton adad2923d8 core-image-*: remove copyright notices
These image recipes are meant to be examples that people can copy and
modify completely for their own purposes, and most of them are so
trivial they don't really need copyright notices anyway, so trim them
off.

(From OE-Core rev: 22db8917f6301595a48f6dcbcccc27627c8a3941)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-10 14:21:57 +01:00
Martin Jansa cd0bc2dd61 matchbox-panel-2: bump PR because libxcb-util soname was changed
(From OE-Core rev: 31b8fe8d1a9921e4efc64b6ab00c26e4bd09ed2c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 10:47:57 +01:00
Lianhao Lu 286b2666dc image/core-image: Handle conflicting IMAGE_FEATURES.
IMAGE_FEATURES such as 'ssh-server-dropbear' and 'ssh-server-openssh'
can't be both enabled. User can use the following variables to define
the relationship of image features:

IMAGE_FEATURES_REPLACES_foo = "bar" means including image feature "foo"
would replace the image feature "bar".

IMAGE_FEATURES_CONFLICTS_foo = "bar" means including both image features
"foo" and "bar" would cause an parsing error.

(From OE-Core rev: e36d12a9c1cf69540079e48a1dfadbc343758e48)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-03 14:55:01 +01:00
Darren Hart bd2d6016c0 core-image*sdk: Add kernel-dev to sdk images
While sdk images already have dev-pkgs included, the kernel-dev package
is special and does not get installed. Add kernel-dev explicitly to the
*sdk image recipes.

Note: We have to be careful with "IMAGE_INSTALL +=" as it must appear
after "inherit core-image" which makes an "IMAGE_INSTALL ?=" assignment.

(From OE-Core rev: 337428316de3612a8e1efa70b3a4ba7cb6e058d2)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Jessica Zhang <jessica.zhang@intel.com>
CC: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-03 14:54:57 +01:00
Ross Burton 6d0b60a15d sato-icon-theme: inherit the GNOME icon theme (Yocto #2594)
Many apps want to use the full GNOME icon theme and install it, but if our theme
doesn't inherit it the the icons are not available.

(From OE-Core rev: bece29110ead367fe501641ec83251e5f87f2430)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-21 14:42:25 +01:00