summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* bitbake: bitbake-layers: fix help for show-overlayed to match behaviourPaul Eggleton2012-08-021-1/+1
| | | | | | | | | | show-overlayed actually lists the same recipe in multiple layers regardless of priority, so change the help description to match. (Bitbake rev: 17217ff707e41780cb473b9cdd2621dd18b982c2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: Hob: change the Build failure scenario as ui designLiming An2012-08-021-50/+33
| | | | | | | | | | | As ui design 'build-fail-spec.pdf' to change the GUI [YOCTO #2183] (Bitbake rev: f9b81e44b2e71b4de6729bd2c69b25fd619b5fed) Signed-off-by: Liming An <limingx.l.an@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: Hob: log for Hob and allow users to show logs after successful buildLiming An2012-08-025-18/+129
| | | | | | | | | | | | | | | | | | If users build images in Hob, record logs and allow users to retrieve the lo after successful build. The logs are generated if and only if: - users do "just bake" - users do "build image" after "build packages" - users do "build packages" only [YOCTO #1991] (Bitbake rev: 291289787bb042b99f0599babc2d67c220aadb87) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Liming An <limingx.l.an@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: fetch2: print checksums when they are different then expectedMartin Jansa2012-08-021-0/+6
| | | | | | | | | | | | | | | | * in form which can be copied into a recipe without modification * like oe-classic did since: http://git.openembedded.org/openembedded/commit/?id=68abc465559a68e9201c9525be3c4acc6297eaed * it shows them in right form when they are missing completely, but in more verbose form when different * it needs to print that only when checksums were requested, e.g. fetching from sstate mirror sets both md5mismatch and sha256mismatch, but your checksums shouldn't be shown (Bitbake rev: 9eb34fc866775fd8310759a0111f232a9dc98981) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: fetch2: handle broken symlinks in local mirror handlingChristopher Larson2012-08-021-1/+5
| | | | | | | | | | | | If a file:// mirror is being used, the fetcher will create a symlink to the local file. However, if the local file gets removed, that link will be dead, and os.path.exists() returns False in that case, so it tries and fails to recreate the link. Now we unlink such a dead link if it exists. (Bitbake rev: 229ed3857e826e3e215e843cb51f729c1e13ed37) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: knotty: ensure that directory for BB_CONSOLELOG exists before using itMartin Jansa2012-08-021-0/+1
| | | | | | | (Bitbake rev: 1e06d8012868ba5a31503dc99cbf18570be629d9) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: fetch2/__init__.py: Add NoChecksumError exceptionMark Hatle2012-08-021-1/+13
| | | | | | | | | | | | | | | | Without the new exception, when the system is configured to use premirrors, but not allow network access (via BB_NO_NETWORK), when a recipe was lacking a checksum the wrong error message(s) were being generated. Instead of complaining about trying to perform network access, if the system was able to find the item in the premirror, it should inform the user of the lack of checksums, and the two SRC_URI fields they should use to update their recipe. (Bitbake rev: cb10e9c03a3f96d94e27e18330009616dde5e2b3) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* guile: updated to 2.0.6Bogdan Marinescu2012-08-027-132/+23
| | | | | | | | | | | | Some patches (disable_goops_optimizations, fix_cross_compilation) don't seem to be needed anymore. Others (change-install-data-hook, mark-unused-modules) were updated to work on 2.0.6. Tested by building and running guile under QEMU with core-image-sato-sdk and also builing guile on MIPS. (From OE-Core rev: 310f169d3d89f3a4fc6a540974a30c7eb565db3a) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: udhcpc shouldn't be a serviceJesse Zhang2012-08-023-31/+3
| | | | | | | | | | | | | | | | | | udhcpc is invoked from the networking service, so it shouldn't exist standalone. If /etc/init.d/busybox-udhcpc is present, it will cause udhcpc to be started two times. And since the script doesn't support the stop action, it will cause udhcpc to be started even when system is being shutdown. Remove /etc/init.d/busybox-udhcpc to resolve the issues. [YOCTO #2840] (From OE-Core rev: 8329c4679ec0ce319d2a81d755a0da5b05474688) Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: hob: deal event DiskFullKang Kai2012-08-022-1/+14
| | | | | | | | | | | | Part of [Yocto #2168] When bitbake runqueue is teminated by disk monitor, it will send event DiskFull. Update to handle it. (Bitbake rev: a691de10d8b8de552628b277e78d47c607ee3a46) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: monitordisk: fire event DISKFULL when terminate buildKang Kai2012-08-022-0/+13
| | | | | | | | | | | | | | | Part of [Yocto #2168] Add a event DiskFull to descript the termination by disk monitor. Update check() to fire the event DiskFull when terminates the build. This could help UIs to deal this scenario and show more information to end user. (Bitbake rev: 0a0fca3d94a1db6458ae21501a66461a334410ed) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* dbus: Ensure dbus-nativesdk doesn't RPROVIDE dbus-x11Richard Purdie2012-08-021-2/+5
| | | | | | | | | dbus-x11 should not RPROVIDE dbus-x11 as this is incorrect and confuses builds. This fixes the nativesdk case. (From OE-Core rev: 09e3ebdb77c090ddc45fed7c6acc1591cd4b3595) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* python-setuptools: Fix setuptools install libdir != /usr/libMark Hatle2012-08-021-1/+3
| | | | | | | | | | | --install-lib= is required to be passed via distutils install otherwise the install location gets set to whatever the python-native location is. (From OE-Core rev: d8ca8b21c6959e772fa1b437ce498b7759fae0ab) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: change RPATHs for nativesdk packagesLaurentiu Palcu2012-08-021-0/+5
| | | | | | | | | Change binaries RPATHs, to include $ORIGIN, to make them relocatable. (From OE-Core rev: f6362c5248914485fc8bf3c3f0ca6cc962bf753e) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* relocatable.bbclass: split it up, to reuse codeLaurentiu Palcu2012-08-022-89/+91
| | | | | | | | | | | Most of the code in relocatable.bbclass will be used for relocating the SDK binaries. So, create another class chrpath.bbclass that will contain the core of the relocatable.bbclass, so we can reuse it. (From OE-Core rev: b50677b1641b201fd69942fd82a360907338234d) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_base.bbclass: create self-extracting archiveLaurentiu Palcu2012-08-021-0/+86
| | | | | | | | | | | | | In order for the SDK to be relocatable, the user would need to call a setup script to change the binaries acordingly. Having an auto-extracting archive has the advantage of being more user friendly and the user does not have to call the setup script separately after extracting the SDK. It is called automatically. (From OE-Core rev: d4e976849da845d595db7029d8089946ae16d982) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts: add script for relocating the SDKLaurentiu Palcu2012-08-021-0/+200
| | | | | | | | | | | This script will be embedded in the SDK tarball and will be called by the SDK installer. It replaces the interpreter path in all binaries and it also changes the ld.so.cache and SYSDIRS in dynamic loader. (From OE-Core rev: 3d366f4953962566f33a3d77d65ed0bd2c48f922) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* binutils: relocatable SDK: change PT_INTERP section sizeLaurentiu Palcu2012-08-022-0/+27
| | | | | | | | | | | This patch is needed so that all SDK binaries have the PT_INTERP section size set to 4096 (max path size in Linux) in order to be able to parse the binaries later and change the interpreter to the path we want. (From OE-Core rev: 9bf657bbdfe7c1a9dff1cc121eab496e3e407197) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* eglibc: relocatable SDK changesLaurentiu Palcu2012-08-024-4/+197
| | | | | | | | | | | | | | | | Modifying the dynamic loader path in all binaries by the SDK installer would not be possible because we cannot know in advance the SDK target location. Hence, the PT_INTERP section size has been set to 4096 (which is the maximum path lengh in Linux). Also, for the dynamic loader SYSDIRS and ld.so.cache paths, special 4096 bytes sections were allocated so that we can easily parse the ELF binary at install time and modify the paths. (From OE-Core rev: 6be55d36333e0c81a4926332d036246d28d995c4) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kmod: Upgrade to upstream version 9.0Radu Moisan2012-08-022-4/+4
| | | | | | | (From OE-Core rev: 9fcbd447e99af5228cccb6a84dd6398c61574caf) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* send-pull-request: Make -a really imply -cDarren Hart2012-08-021-1/+2
| | | | | | | | | | | | The switch statement does not fall through as the comment suggests. This results in -a not implying -c as was intended. Add the two lines from -c to -a to achieve the intended behavior. (From OE-Core rev: 319d2cc8e60450106b665ee4172e2e6dc90e14b5) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix qt4-native build failure on SLED-11Wenzong Fan2012-08-022-2/+41
| | | | | | | | | | | | | | | | | | This issue is that with C++ compiler process an old version of kernel header file, coincidently that file has a variable named 'new': * 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h'; * '/usr/include/linux/vt.h' has below code on SLED-11.x: + unsigned int new; On mostly hosts it has been changed to: new -> newev. [YOCTO #2845] (From OE-Core rev: bb4b71552da0d1f4396955f35db5819f88a7d2ae) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sip.bbclass: fix sip-native dependencyMartin Jansa2012-08-021-0/+3
| | | | | | | (From OE-Core rev: 5f1af539b3d34e6689a69d09c69d9099eee983d4) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* python-dbus: updated to 1.1.1Bogdan Marinescu2012-08-021-2/+2
| | | | | | | (From OE-Core rev: 191f06e8886209341a1822f5078fdf410dc86202) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* watchdog: Upgrade to upstream v5.12Radu Moisan2012-08-022-6/+6
| | | | | | | | | | | sourceforge.net link is broken at the time of this patch, so I added a mirror. License changed to GPLv2+ (From OE-Core rev: 1452b5e60eff29e7423ecdd51d2d942e88dcc263) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* usbutils: Upgrade usbutils to upstream v006Radu Moisan2012-08-021-4/+3
| | | | | | | (From OE-Core rev: 375cddcc2241016a3114d707b1938c2190642a4f) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot.inc: fix regexp used when ld-is-goldMartin Jansa2012-08-021-1/+1
| | | | | | | | | | | | | | | | | | * with old regexp it wasn't reentrant, causing stuff like this: -LD = $(CROSS_COMPILE)ld +LD = $(CROSS_COMPILE)ld.bfd.bfd -LDR = $(CROSS_COMPILE)ldr +LDR = $(CROSS_COMPILE)ld.bfd.bfdr when do_compile was reexecuted, also breaking LDR variable and http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch when it was used together with u-boot.inc from oe-core (meta-ti is using own u-boot.inc) * This patch is also better solution to ld-is-gold problem then regexp in metadata. (From OE-Core rev: f78044f85ab1a0acce852a7032fc0c81285cd4c1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* tiny-init: Setup /dev/ptmx in initDarren Hart2012-08-012-1/+4
| | | | | | | | | | | | | | | | Fixes [YOCTO #2382] Without /dev/ptmx, ssh logins fail with: "PTY allocation request failed on channel 0" As the kernel support already exists in the linux-yocto-tiny kernel, create the /dev/ptmx device in tiny-init so it works as intended. (From meta-yocto rev: 1b71b9363aa49521896694e43a63cb6fca487da4) Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gcc-configure-target: Set native-system-header-dir for target gccRichard Purdie2012-08-011-0/+1
| | | | | | | | | | | | | | | Without this set, in the case host=target (which it does for on-target gcc), the native header directory is set to the target sysroot with no prefix. This means it would look for sdt.h on the build system instead of in the target headers and this can lead to build failures and is host contamination of the build. The correct fix is to explicitly set the native header directory to the correct location and then the headers get detected correctly. (From OE-Core rev: 404d2d490fc347203e89d274530c17fb5f0aa20f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core-image.bbclass: Fix typo in comment, "IMAGE_FEAETURES"Robert P. J. Day2012-08-011-1/+1
| | | | | | | (From OE-Core rev: af274b1b266b5aa661823bd702eacc62cc3aefff) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* createrepo 0.4.11: create wrapper for python scriptRobert Yang2012-08-011-1/+14
| | | | | | | | | | | | | The native python is installed to ${STAGING_BINDIR_NATIVE}/python-native/python, so we should use wrapper for the python script. [YOCTO #2822] (From OE-Core rev: 1e96a8460b93ba9c0c9a6c4ea4ffd6a19302831c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* createrepo 0.4.11: add rpm-createsolvedb.pyRobert Yang2012-08-013-2/+4
| | | | | | | | | | | | | Move scripts/rpm-createsolvedb.py to meta/recipes-support/createrepo/createrepo/ since we should wrap it to use the native python. [YOCTO #2822] (From OE-Core rev: 72d673bef385e756bd858f9eca7fe419efaceb39) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* imagetest-qemu.bbclass: Fix whitespace issuesRichard Purdie2012-08-011-18/+18
| | | | | | (From OE-Core rev: 674d65c94478a1ff33ef9d9c1e49f677091301f4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Accomodate dash when using arraysKhem Raj2012-07-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | we were assigning local variable to an array coming through positional arguments. local is a non posix contruct thats also supported by dash luckily but operates differently in this case it exapnds the array before assignment. so local pkgs="$@" turns into pkgs=locale-base-en-us locale-base-en-gb ant we see errors run.do_rootfs.25593: 932: local: locale-base-en-gb: bad variable name So lets not use defining and assigning local in one go first define a local and then the assignment (From OE-Core rev: 4029ce1a15e1dbd374444ee77ccf2a915e463b7b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/oe-pkgdata-util: exclude unpackaged in glob outputPaul Eggleton2012-07-311-0/+4
| | | | | | | | | | | | Check for .packaged file and exclude packages if this file does not exist - this avoids attempting to install empty packages during complementary package installation within do_rootfs that didn't end up being created (and failing as a result). (From OE-Core rev: 4a85d8a4026cf1d1603513ed9780f80c603cc611) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: ensure init works with split local configPaul Eggleton2012-07-311-4/+23
| | | | | | | | | | | | If the local configuration is already split out, ensure the init action works properly and does not error in the case that last_revision is not set. Additionally, if the local configuration is within the repository, prevent it from being committed and add it to .gitignore. (From OE-Core rev: de339b0cb201035e27df1128ccf526937b8325ec) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* dbus: include dbus-launch in the main dbus packageRadu Moisan2012-07-311-4/+6
| | | | | | | | | | | | | | | | | | | Followed suggestions from Bugz 2261: 2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature. This makes the build dependencies reflect the feature list. 3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency is now back in dbus where is belongs. 4) make dbus provide dbus-x11, for compatibility. Fixes [Yocto #2261] (From OE-Core rev: c02364f36e228835ea5d7fd4e1d347fd451f8544) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glib-2.0-nativesdk: Fix build on ubuntu 11.10Khem Raj2012-07-311-0/+1
| | | | | | | | | | | | | | | | | | When you have a distro which has older version of glib-2.0 installed then it does not have compile_resources installed which essentially glib-2.0 nativesdk is looking for on build host. So like in a cross build we disable the configure check which will force it to build an internal copy and use it. This problem may not be seen on newer distros like ubuntu 12.04 since they have newer version of glib-2.0 installed (From OE-Core rev: 69bd94173294c1ae2cf5e300ada7116e99a5b0c7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: fix TypeError in runstripMartin Jansa2012-07-311-6/+10
| | | | | | | | | | | | * some packages have .ko files which are not elf, without this change it fails with TypeError, with this change only runstip fails and reports where: ERROR: runstrip: ''arm-oe-linux-gnueabi-strip' '/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/emacs-23.4-r0/package/usr/share/emacs/23.4/etc/tutorials/TUTORIAL.ko'' strip command failed (From OE-Core rev: a834ab8a6d53cae504fa112a89bab93d726539ec) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* slang: change char type to signed char in macrosRoy.Li2012-07-311-2/+2
| | | | | | | | | | | | | [YOCTO 2726] The patch of converting char type to signed char is only applied to arm, in fact it should be applied to powerpc too since powerpc has the same assumption for char type. To x86 and mips, this patch has not impact. (From OE-Core rev: 8c6a9bd7b4fea62b5765caecad660d372379e412) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/bitbake: unbreak the git version comparisonChristopher Larson2012-07-311-1/+4
| | | | | | | | | | | | | | | With the current code, we're calling awk to do a floating point comparison between '1.7.0.4' and '1.7.5' (on an ubuntu 10.04 LTS machine). These clearly aren't proper floating point numbers, and the comparison is incorrect. It's returning true for 1.7.0.4 >= 1.7.5. Instead of using a floating point comparison for this, call out to python and let it do it. (From OE-Core rev: f28f6267271edbbef16caec323e9ba76e2216723) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* trace-cmd: Update for python-native changesMorgan Little2012-07-311-2/+2
| | | | | | | | Add pythonnative to the inherits list (From OE-Core rev: b3ef5a986e3bc1a29ba2b4a25d063a0267e2f72f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lib/oe/lsb.py: Map unknown distributions to 'Unknown'Richard Purdie2012-07-311-2/+8
| | | | | | (From OE-Core rev: e12df2ca5c71ad672ebbfefbc47cabbac3333d61) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: allow splitting out local configPaul Eggleton2012-07-311-8/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow splitting the local parts of the configuration (mostly local_repo_dir and last_revision, although there is no limitation) to a side-by-side -local.conf file, with component sections optionally tagged with the combo layer branch name. This effectively allows you to: * avoid polluting the history by committing the updated last revision to the combo repository for every update * avoid putting local repo paths into the combo repository * manage multiple branches of the combo repository whilst avoiding the possibility of mixing the configuration for one branch with another. An example split configuration (note, values may be artificial): ------------------- combo-layer.conf ------------------- [bitbake] src_uri = git://git.openembedded.org/bitbake dest_dir = bitbake hook = scripts/combo-layer-hook-default.sh [oe-core] src_uri = git://git.openembedded.org/openembedded-core dest_dir = . hook = scripts/combo-layer-hook-default.sh -------------------------------------------------------- ---------------- combo-layer-local.conf ---------------- [bitbake] local_repo_dir = ../repos/bitbake [oe-core] local_repo_dir = ../repos/oe-core [bitbake|master] branch = master last_revision = db689a99beffea1a285cdfc74a58fe73f1666987 [oe-core|master] branch = master last_revision = 121a1499a81706366acc0081272a6bff634d4d62 [bitbake|denzil] branch = 1.12 last_revision = 24b631acdaa143a4de39c6e1328849660c66f219 [oe-core|denzil] branch = denzil last_revision = 741146fa90f28f7ce8d82ee7f7e254872d519724 -------------------------------------------------------- It is assumed that the local config file will be added to .gitignore. (From OE-Core rev: f0065d7a6973628803a17c57f2265512aba3234c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: check that last_revision is validPaul Eggleton2012-07-311-0/+21
| | | | | | | | | | | If the user edits the configuration file by hand and sets last_revision, we need to ensure that the revision is valid and on the specified branch. (From OE-Core rev: 05382932257257247b8c18bc06e9c0039d134d06) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: improve patch list handling and outputPaul Eggleton2012-07-311-22/+45
| | | | | | | | | | | | | | | | | | * Ignore blank lines in patch list * Don't fail in interactive mode if patch list is deleted * Show patch counter * Show relative path for patches * Print headings before applying patch list for each component Also change to using a "with" block to read the patch list so it gets closed properly when we're finished. Fixes [YOCTO #2455]. (From OE-Core rev: 65461d7c35fdadb5b008052798731dce19ed187f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: drop to a shell when apply fails during updatePaul Eggleton2012-07-311-11/+23
| | | | | | | | | | | If applying a patch fails during the update process, drop to a shell instead of exiting; at that point the user can manually apply the patch, do nothing and "exit" to skip it, or "exit 1" to abort the process. (From OE-Core rev: c82b28982c4f630c130c827a7da3ac0454cd93b6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: ignore patch-* temp directories in dirty checkPaul Eggleton2012-07-311-1/+4
| | | | | | | | | | Make the dirty repo check somewhat less strict by ignoring old patch directories created by this tool. (From OE-Core rev: fea477ac55e2555c5bb0aad36db641aaa27aa915) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: allow component pull to be done separatelyPaul Eggleton2012-07-311-12/+39
| | | | | | | | | | * Add a -n option to disable component repo pull during update * Add a 'pull' action to pull the component repos only (From OE-Core rev: 61983b2191253b24117b63f586d5aac00c7eb48e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: remove &> bashismPaul Eggleton2012-07-311-1/+1
| | | | | | | | | &> does not work with dash - use > xxxx 2>&1 instead. (From OE-Core rev: 5582cc58e42402c4680877e669d8c1ce058e7098) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>