Commit Graph

15090 Commits

Author SHA1 Message Date
Robert P. J. Day e64946e8c7 documentation/dev-manual/dev-manual-bsp-appendix.xml: Robert P. J. Day edits.
Two typos fixed.

(From yocto-docs rev: 6d99eb7f728b812be37a3865cbebd3c4cb4b67be)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:26:31 +00:00
Robert P. J. Day a8a25047c7 documentation/dev-manual/dev-manual-model.xml: Robert P. J. Day Edits
Two small corrections for better wording.  A mis-spelling also
fixed.

(From yocto-docs rev: 915ec9f9adbde86008ffb086ac81a435d5910733)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:26:30 +00:00
Robert P. J. Day bf1e5c6413 documentation/dev-manual/dev-manual-newbie.xml: Robert P. J. Edits
Robert suggested some minor wording changes that are good.

(From yocto-docs rev: 50822bc3722e2f3b0a73ed837842ddc5c7595c7b)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:26:30 +00:00
Robert P. J. Day 296fd7a7de documentation/dev-manual/dev-manual-newbie.xml: Robert P. J. Edits
Robert ear-marked some links to point to downloads.yoctoproject.org.
He also made several wording changes that resulted in better language
and in a couple of cases fixed incorrect subject/verb usage.

(From yocto-docs rev: 9106619c4264c2669be041c1e6d6124e022ab2d1)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:26:30 +00:00
Robert P. J. Day 54956b8d50 documentation/dev-manual/dev-manual-start.xml: Robert P. J. Edits
Robert isolated a few technical errors and made some other wording
suggestions.  I took the technical corrections and modified one
of his suggested wording changes.

(From yocto-docs rev: 3c6bbae05cdf2265e04d967050354ce75d62b4e2)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:26:30 +00:00
Robert P. J. Day 9f103615fb Documentation/dev-manual/dev-manual-intro.xml: Edits to Intro section.
Open-source changed to open source (no hypen).  Broken URL fixed for the
1.1 release notes.

(From yocto-docs rev: d34df01aef674448d4cc06cfe4ff63cab764fe64)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:26:29 +00:00
Eric Bénard d5175bb3ed useradd.bbclass: handle nativesdk case
* without this patch, building dbus-nativesdk leads to a missing
dependency on 'base-passwd-nativesdk'
This was added by commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
* this patch handle the nativesdk case in the class useradd
* close bug 1702 http://bugzilla.pokylinux.org/show_bug.cgi?id=1702
* v2 from Scott Garman with Richard Purdie's tricks

(From OE-Core rev: 140a3507fb5c14cd9bcebe4304f491aa1c5c47a2)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 16:22:48 +00:00
Dongxiao Xu 1ef442561d multilib: Drop MULTILIB_IMAGE_INSTALL
There should just be a single IMAGE_INSTALL variable. If the package
backends need this split into different multilib components they should
be responsible for doing this, not the user.

This commit removes the MULTILIB_IMAGE_INSTALL variable.

[YOCTO #1564]

(From OE-Core rev: 7736862a74c92fe1afe42e170822be13117575c2)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:55 +00:00
Joshua Lock f9735f3bac contacts: fix packaging of icons
(From OE-Core rev: 1f4028337d5e288e239f44ef34e1d707b785273e)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:55 +00:00
Joshua Lock 55a738ea0c pulseaudio: make X11 dependencies optional and add gtk+
Use the x11 distro feature to determine whether --with-x should be
passed. Further, if we're using X11 add gtk+ to DEPENDS (it's required
to build).

(From OE-Core rev: a37ed5b42717463cf1a836fd011132b16938765f)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:55 +00:00
Joshua Lock a1c15cb364 connman: split scripts into separate package
The connman scripts are useless without a Python interpreter so split
them into a separate package and add Python to its RDEPENDS.

(From OE-Core rev: 281510acd0ee3221dd804d7d9de567be2be675f4)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:55 +00:00
Joshua Lock 8b77079321 gypsy: fix packaging
(From OE-Core rev: 3c272ce9df811281029d028e96ab6bc644645592)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock 7a5f2fc84e libcanberra: add libvorbis to DEPENDS
(From OE-Core rev: 531151fdeba3779ba6f0976fc08aa8da483600f7)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock d06c35d341 mx: add mx toolkit 1.3.2
A widget toolkit built on Clutter

(From OE-Core rev: 67b2060714c70cf39224e5fbe83ca36263595c54)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock febb65c9af clutter-gtk-1.8: add clutter-gtk 0.11.4
(From OE-Core rev: e5568f9a569e6ff1cf45553edb18923a4f7843e9)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock 65ce67a64e clutter-gst-1.8: add 1.4.2 for use with clutter 1.8
(From OE-Core rev: acca04830aad1368f0a5cc2f48302cf272731174)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:54 +00:00
Joshua Lock 22fcc7c2b0 clutter-1.8: add 1.8.0
(From OE-Core rev: d59578fd9e2c45bdc2f030d68c84d05c5ad5be6b)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:53 +00:00
Joshua Lock 7ac57baf15 cogl: add cogl 1.8.0 recipe
Cogl has been split into a separate recipe as of the clutter-1.8 series

(From OE-Core rev: 3bddb7cd3400857ac724e91cb5b663bcf386ab37)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:32:53 +00:00
Eric Bénard a9091c9466 dbus: fix install for virtclass-nativesdk
* 46e6c3fa8034b12d178d605f3f5d7efe69671a13 changed do_install
which now fails for nativesdk (chown messagebus leads to no
such user)
* tested by building meta-toolchain-qte and running the generated
sdk

(From OE-Core rev: 5818a885df489f4bc9579d17c6b0efa7777f5ccc)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:13:24 +00:00
Scott Garman 27d70f9655 useradd.bbclass: fix how RDEPENDS is setup
Fix bug where only packages named PN included base-passwd in
RDEPENDS.

This fixes [YOCTO #1727]

(From OE-Core rev: 2c55d51afd71d708a54afc8377e10c4f80f810e3)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 14:13:24 +00:00
Koen Kooi 28940eb97d lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
As Martin Jansa pointed out before, bitbake will silently peek in DL_DIR before FILESPATH and use files from there if found.

The failure mode for lighttpd involves a 404 redirect placing index.html into DL_DIR, which will end up in the lighttpd packages. In my specific case iproute2 hit the linuxfoundation 404 redirect so lighttpd.ipk now serves the linuxfoundation frontpage :)

(From OE-Core rev: 0809f98e995d3a2ce24ad25bade3dcd5154061fd)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:42 +00:00
Paul Eggleton 24fb621732 qemugl: switch to new git repo
The qemugl git repository is now on yoctoproject.org.

(From OE-Core rev: da1759308bd2d8ca3bf4dc077c164aadb5ce3916)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:42 +00:00
Paul Eggleton b4f471ce09 core-image-minimal-initramfs: force IMAGE_FSTYPES
If the user has set their own value for IMAGE_FSTYPES, they may have
disabled the cpio.gz image type, preventing the initramfs from being
produced in the format that image-live.bbclass expects; so force
IMAGE_FSTYPES to cpio.gz within the initramfs image recipe.

(From OE-Core rev: 571919f49cbe6f8f5b21de844b00761314e697fd)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Prepend cpio.gz instead

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:42 +00:00
Paul Eggleton b96390473d allarch.bbclass: disable shlib and debug symbol processing
all-arch packages should not contain any binaries that need processing,
so disable the shared library dependency processing and debug symbol
splitting/stripping to save some time during packaging.

(From OE-Core rev: 9534b3efe94fb9a9cd927f29c375bbdb74b84035)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:41 +00:00
Saul Wold c4b3a97c1e fotowall: disable videocapture since we do not have a webcam
(From OE-Core rev: 837a0cf30491fefb051c036f0cdc0ac661615a9b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:41 +00:00
Bruce Ashfield 2f8d7a30e0 linux-yocto_3.0: update base to v3.0.8 + meta config changes
The board branches are updated to have v3.0.8 as their base kernel
revision, and the version in the recipe is updated to match.

This commit also updates the meta branch to pick up the following
4 commits:

  4095bb5 meta/common-pc-64: remove igb
  17565fa meta/crownbay: use power/intel feature
  8948937 meta/sugarbay: use power/intel feature
  fcbc8a9 meta: add power feature

(From OE-Core rev: c237410bbc177495dab2b12b3a7aa4a75fb61efa)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:41 +00:00
Martin Jansa 021b9daf6a libnl-2.0: add PE/PR bump for upgradable patch for meta-openembedded users
(From OE-Core rev: 2260b18590416940eec26aaf3d68e510ceff8d31)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:41 +00:00
Martin Jansa 5de5534486 libnl-2.0: split to more packages, as meta-openembedded does
(From OE-Core rev: 8720e063c7b43c278b3bb406b45390ed03f8ac96)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:40 +00:00
Martin Jansa 754e262e47 libnl-2.0: add patch from meta-openembedded to fix pkg-config file
(From OE-Core rev: 72227178bc74d6e2e24f8df6176c3d45b640e860)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:40 +00:00
Martin Jansa 6a390d540b libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch
(From OE-Core rev: a4882cd6f98c5b3df80ba96536d94d9f556f77a2)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:40 +00:00
Koen Kooi 163f7bda55 iproute2: update to 3.0.0 to fix build with updated iptables
(From OE-Core rev: addcb5106ca0b1849299d6ad4e734135da29b0ab)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:40 +00:00
Koen Kooi 4a279e2410 connman 0.75: bump PR for iptables library change
connmand[180]: /usr/sbin/connmand: error while loading shared libraries: libxtables.so.5: cannot open shared object file: No such file or directory

$ dpkg-deb -c ipk/armv7a/iptables_1.4.12.1-r0_armv7a.ipk  | grep libxtables
-rwxr-xr-x root/root     35252 2011-11-01 20:16 ./usr/lib/libxtables.so.7.0.0
lrwxrwxrwx root/root         0 2011-11-01 20:16 ./usr/lib/libxtables.so.7 -> libxtables.so.7.0.0

(From OE-Core rev: 6c7b71d9a3e855760acacef6949665a305bac2c0)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:39 +00:00
Martin Jansa 8138eafa31 python: improve packaging
* move 2to3 to separate package and include lib2to3 (was in python-misc)
* fix pattern for python-unittest (was in python-misc because it's in subdirectory now)
* add pydoc_data to python-pydoc (was in python-misc)
* add more stuff to smtpd, audio, codecs, ctypes, html, io, json, mime,
  pickle, stringold, xmlrpc
* move all FILES_ details from python recipe to manifest generator so it's in one place
* added manual line break in FILES_${PN}-core, because git send-email
  doesn't like too long lines
  $ git send-email -1 dfaae65839f0ab23e5b2ae2a68df0f370bca84d2
  fatal: /tmp/k8zbDajUNP/0001-python-improve-packaging.patch: 64: patch contains a line longer than 998 characters

(From OE-Core rev: f17f6b28ed2f62250f8690617e9126a43c3a8020)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:39 +00:00
Scott Garman 8b63b92781 distro_tracking_fields: updates for sudo, mtools, grep, and openssh
(From OE-Core rev: 696c26c3244cb11b1afe1870e54c838ea7815272)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:39 +00:00
Koen Kooi 03748f351c image_types bbclass: use 4k bytes per inode so we don't run out of space immediately
genext2fs only creates the minimum number of inodes, after this patch it will scale with the rootfs size

(From OE-Core rev: c31cb0bdc5a61d2d9f21a2cea34c3d8ac3b47cb9)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:39 +00:00
Martin Jansa fc50781c34 libcense.bbclass: fix OpenSSL mapping
[YOCTO #1712]

(From OE-Core rev: 56799ebcb5c55a7fc75458fc2be2e69a67e8fd21)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Fixed YOCTO bug format and location

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:38 +00:00
Dmitry Cherukhin d70ba51ad9 tslib: fix the bug with loading libts-1.0.so
Touchpad did not work in the qtdemoE if the library libts-1.0.so was not loaded
manually using the LD_PRELOAD variable. This problem was fixed in the tslib mainline
https://github.com/kergoth/tslib after the 1.0 release. We just import the patch.

(From OE-Core rev: 0ba6d91dc527908740890c896b834e7216b0d2fb)

Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:38 +00:00
Kumar Gala 49f9ca5d4c udev-164: Update init script to do an explicit add action
With udev 152 or greater the default action for 'udevadm trigger' was
modified to be 'change' instead of 'add.

To ensure initial coldplug events at boot are seen be scripts the are
expecting them as 'add' events we invoke udevadm with an explicit
'--action=add'.

(From OE-Core rev: eacafd21999ab37b60af29dc3e626c441716ef66)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:38 +00:00
Elizabeth Flanagan 8f78cf2030 buildstats: Fix for buildstats on tmpfs
tmpfs/encryptfs/(and most likely, but not confirmed)ramfs TMPDIRs
cause diskstats to choke. No device entry ends up in /proc/diskstats
for these fs types, which ends up causing the failure.

The short term solution is to exclude these fs types from diskstat
collection. Longer term we will want to see if we can collect
meaningful diskio for each of these, and other, use cases, but for
this cleans up Bug 1700.

[YOCTO #1700]

(From OE-Core rev: 2b14046c12855b6f484ba5bd6bc0a8022de6873e)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>

Corrected YOCTO bug location and format

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:37 +00:00
Saul Wold 953b45841f dtc: Add patch to correctly install shared libraries and links
(From OE-Core rev: 4c4143e0f0382118448c7c2a452dafac0db5130f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:37 +00:00
Matthew McClintock 35574646e7 dtc: update to latest git version
Also remove patches that are no longer needed, as well as use the
installation that is provided by the Makefile. Put all the extra
stuff in a new dtc-misc package

(From OE-Core rev: 43213fd610da7b550e6d738e224b49004776f799)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:37 +00:00
Saul Wold f7196be455 cogl: COPYING file Updated FSF Address
(From OE-Core rev: f3a7b6aaa9be4763d13214c3264b86a1c7bf5e9f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:37 +00:00
Paul Eggleton ba5537d768 scripts/combo-layer: skip empty commits
If a commit is empty (for example, commits brought over from svn where
only properties were changed) then attempting to apply it with "git am"
will result in the error "Patch format detection failed", so skip it
instead.

(From OE-Core rev: 5754bc7bcc2f57b6b56e67e2900eeaab5bc184d8)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:37 +00:00
Paul Eggleton c04305e695 scripts/combo-layer: improve some messages
Fix some grammar.

(From OE-Core rev: cc34f1bf136409d2e31c443dd5334c3a35d208af)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:36 +00:00
Paul Eggleton f82983034e scripts/combo-layer: auto-commit updated config file
If the config file is tracked within the combo-layer repository and it
is updated at the end of the "update" operation (because last_revision
has been changed), then automatically commit the file. This ensures that
multiple people can perform updates on different machines without the
last revision information going missing.

(If the file is outside the repository or is masked via .gitignore, this
will do nothing.)

(From OE-Core rev: 14f89acb43b0d9bec09b94668fbb056c7b5b1456)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:36 +00:00
Paul Eggleton 948d28e801 scripts/combo-layer: fix dirty repo check
Fix the dirty repository check to detect any changes, including
untracked files and uncommitted changes in the index.

(From OE-Core rev: f03fa8bbafa82ce6b09c08bf86011b6c51eb3531)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:36 +00:00
Paul Eggleton 25fc202e21 scripts/combo-layer: make component repo branch configurable
Add an optional per-component branch setting to allow specifying the
branch instead of always using master.

(From OE-Core rev: 8e2b8b05607103acd539808c5ab0cc80c0d481fc)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:36 +00:00
Paul Eggleton cb21ff1807 scripts/combo-layer: tidy up config example
Move all example configuration to the example config file, tidy up a few
long lines and fix some grammar.

(From OE-Core rev: ec099a32243ebc7eecd86e4bf40ed38da4af3fe5)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:35 +00:00
Paul Eggleton fd471a1337 scripts/combo-layer: make init set up initial component data
The "init" subcommand will now copy the current state of each component
repository into the combo layer repository, set last_revision for each
component, and then use "git add" to set up the initial commit (but will
not actually make the initial commit - that is left up to the user).
Also take the opportunity to bump the version number.

(From OE-Core rev: d4d491aa118b6cbe895167c62a46d883abc7b4ab)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:35 +00:00
Paul Eggleton 2293acaa7f scripts/combo-layer: ignore merge commits
The combo-layer tool had trouble handling merge commits as they were
included in the revision list but not the patches; these are now
excluded from the revision list. Note however that this will not handle
merge commits that resolved a conflict; since "git format-patch" cannot
construct a linear change history over such merges there is nothing we
can currently do with these.

(From OE-Core rev: b6b6b215675631d0e505ffc8b4890f85fb3169f9)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:35 +00:00