summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
...
* yocto-bsp: add a LICENSE_FLAGS_WHITELIST blurb for emgd to READMETom Zanussi2012-09-021-0/+8
| | | | | | | | | | | | Add a text snippet to the README to say that if emgd-driver-bin is included in the BSP, LICENSE_FLAGS_WHITELIST needs to be set to for a successful build. (From meta-yocto rev: e9437a58a99eefa23402b82a1d9a85e7381e109f) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update the help regarding the meta-intel layerTom Zanussi2012-09-021-6/+6
| | | | | | | | | | | | | | With move of ia32-base to oe-core, the only case remaining where meta-intel needs to be added to bblayers.conf for a new BSP is the case of an x86 BSP that selects EMGD. Update the documentation to note that fact. (From meta-yocto rev: b63c199c716d68147def036eb06481245e595802) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: include meta-intel.inc if emgd selectedTom Zanussi2012-09-021-0/+2
| | | | | | | | | | | | | | | With move of ia32-base to oe-core, the intel-specific variables were split off into meta-intel.inc, which needs to be included when using components present only in meta-intel. In the case of i386, that's currently just emgd, so conditionally include emgd if emgd is selected as the xserver choice. (From meta-yocto rev: b9cc7ce3407d3bc3909e7cc57c8a1290cb84a58b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bsp: set default XSERVER for PowerPC and MIPS machines to XorgRoss Burton2012-09-022-4/+10
| | | | | | | | (From meta-yocto rev: f43d6ca8ecd96321d62b11b5db3bb2a6de873939) 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>
* crosstap: new scriptTom Zanussi2012-09-021-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script makes it easy to run a systemtap script on a remote target from a build host. The script itself contains documentation on basic setup and usage - see that for details. In a nutshell, if you have a systemtap script on the build host, this script allows that systemtap script to be compiled and run on the target host and for the output appear on the host terminal. The crosstap script requires to an sdk build of the target (or a build with 'tools-profile' added to EXTRA_IMAGE_FEATURES) because it needs to be able to run the native systemtap built by the systemtap recipe, which in turn needs access to the kernel built for the target in order to build the kernel modules that implement the systemtap probe specified by the systemtap script and which ultimately get shipped to the target and insmod'ed there. The crosstap script also needs to be able to ssh to the target host in order insert the modules on the target, so the target system needs to support incoming ssh connections. (From OE-Core rev: c6da6b648328377ba3590fd38cb12dad26a46a13) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate-cache-management.sh: fix it for downloaded fileRobert Yang2012-08-301-1/+19
| | | | | | | | | | | | | | | | | | Fix it for the downloaded sstate cache file * The downloaded sstate cache file is in SSTATE_DIR, and there is a symlink points to it, the sstate cache file should not be removed if the corresponding symlink is kept, it would be removed when the symlink is removed (with -L option). * Fix a comment line. [YOCTO #2897] (From OE-Core rev: 12ed7e6bb215e70b119d5ce123e36e2fd380ff1e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' casesTom Zanussi2012-08-2924-24/+48
| | | | | | | | | | | | | | | The new yocto-kernel way of specifying that the branch sanity check doesn't need to be run is to specify a default kbranch and build that. In the case where we have a new kbranch but it's not yet in the repo, we need to tell it that our new branch is the default and we're building the default and that's how we avoid the sanity check and the subsequent do_validate_branches() failure. (From meta-yocto rev: dadd020c67e901609be3ac13a4ffd8cb28532966) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove obsolete referencesTom Zanussi2012-08-297-18/+0
| | | | | | | | | | | | The logbuf-normal feature is obsolete, so remove any references to it. The dmaengine and hpet features have changed, but don't really need to be added by default to i386 - leave that to the BSP developer. Also, remove a couple duplicate feature references in the .scc files. (From meta-yocto rev: 3f37864d474912d680c2e6ee2a962e9fa61df39b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-export-rootfs and friends: don't put pseudo db in target fsPeter Seebach2012-08-292-7/+10
| | | | | | | | | | | | | | | | | | | | In a few places, we have scripts which use <rootfs>/var/pseudo for the pseudo state directory controlling a given filesystem. This seems possibly risky because it means that stuff running under qemu or whatnot could wipe out the data being used to handle that rootfs. Move this to: <rootfs>/../$(basename_rootfs).pseudo_state to avoid problems. This also solves at least one case (not directly hit by yocto's tree) wherein you could end up trying to remove a rootfs while pseudo was using a database inside that rootfs, and thus the remove would fail. (From OE-Core rev: aa5d6bd006d3b4eede21d8987451876ed3385ab8) Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: compile tar-replacement firstlyRoy.Li2012-08-291-1/+6
| | | | | | | | | | | | | | | | | | | | | Compiling tar-replacement or not is decided by version of host tar, if the host tar version is lower than 1.23, Compiling tar-replacement is needed. When doing popoluate tar-replacement sysroot to write the tar to sysroot, but writing is not finished. other packages probably use the being written tar to unzip file, which will lead to failure and report the below error: "bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/tar: Text file busy" Now we compile tar-replacement firstly to ensure that a being written tar command will not be used. (From OE-Core rev: 3c1c4719fc96f6f1fbb257413d6baf3d91fdf4e8) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add missing xserver-xf86-config .bbappend for qemuTom Zanussi2012-08-251-0/+2
| | | | | | | | | | Re-add xserver-xf86-config which was inadvertently removed. (From meta-yocto rev: 08c0c5c53ba625f28eb243968c9c3844ba99d780) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use base branches for qemu 'newbranch' caseTom Zanussi2012-08-254-8/+8
| | | | | | | | | | | The branch updating for the [YOCTO #2587] fix inadvertently changed some of the qemu branch names incorrectly, fix it. (From meta-yocto rev: dde4cd9f88093b8c520a6a42f9dda917f4aff5e4) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove YOCTO_KERNEL_EXTERNAL_BRANCH usageTom Zanussi2012-08-2524-82/+0
| | | | | | | | | | | YOCTO_KERNEL_EXTERNAL_BRANCH is now obsolete, so remove it from the templates. (From meta-yocto rev: 0c440984f3f429d5282559208313dfe7492b8b90) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use emgd 1.14 for i386 templateTom Zanussi2012-08-252-5/+5
| | | | | | | | | | Make i386 template use emgd 1.14, along with associated changes. (From meta-yocto rev: 69f49f7e8370112164b70b9a5ae6f3c0e1ce0bfa) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update standard branch mappingTom Zanussi2012-08-251-3/+3
| | | | | | | | | | Remove mapping for 3.0 and add mapping for 3.4. (From meta-yocto rev: e4ddfcda2cc6aad0c3e99066d43d69f5c1ab2f18) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add 3.4/remove 3.0 kernel from templatesTom Zanussi2012-08-2523-155/+152
| | | | | | | | | | For 1.3, 3.4 is the preferred kernel and 3.0 isn't supported. (From meta-yocto rev: ef7f8257ec9830e3eab0acec20564105d23a74f7) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: generate default properties even if json specifiedTom Zanussi2012-08-251-2/+2
| | | | | | | | | | | | | Users seem to want to specify incomplete property sets when using json input. Allow this by generating default properties before the user-specified properties are applied; the user will then get the defaults for any unspecified values, and avoid cryptic backtraces. (From meta-yocto rev: 3f0361f77cf64844da93ba4a76c42cd5befff5ad) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use emgd 1.10 for i386 templateTom Zanussi2012-08-253-4/+9
| | | | | | | | | | | Make i386 template use emgd 1.10 for denzil, along with associated changes. (From meta-yocto rev: 7a93139bcaca7639da0f182356153d2a7539e0c3) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add i586 option for i386Tom Zanussi2012-08-251-2/+5
| | | | | | | | (From meta-yocto rev: e5bc15354dccd7ecff3cc61af4299befb9d2bc86) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add some standard policyTom Zanussi2012-08-254-0/+28
| | | | | | | | | | Add some useful default options to to the i386 and x86_64 templates. (From meta-yocto rev: 2f98c6dfce82d670acf54bb93c827cf142539b98) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove 'branch' statements in .scc if reusing branchTom Zanussi2012-08-257-8/+7
| | | | | | | | | | | If reusing a branch (need_new_branch == 'n') we don't need to branch in the .scc, so make it conditional on need_new_branch. (From meta-yocto rev: 1e698ad2d18249c6224821bd52e3b979750db256) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use rstrip() for assignment linesTom Zanussi2012-08-251-1/+1
| | | | | | | | | | | | strip() isn't necessary and causes unintended formatting changes in the output; rstrip() remove the trailing newlines as intended while leaving indenting whitespace intact. (From meta-yocto rev: 0caa6cd8c094b531ee8e78154dbf5a8e6014d1fd) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use standard branch mapping in bsp templatesTom Zanussi2012-08-253-4/+4
| | | | | | | | (From meta-yocto rev: 716fdb4b1bd7cb91b07753b6747767ae55eeb1d2) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add standard branch mappingTom Zanussi2012-08-251-0/+21
| | | | | | | | | | | Add a mechanism to distinguish common-pc variants of standard branches. (From meta-yocto rev: c313ad936499104235c47f05bd98ef86b990d713) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use branches_baseTom Zanussi2012-08-2524-80/+80
| | | | | | | | (From meta-yocto rev: 027c010b6864741cbbefdc710e36963767d7a431) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: allow branch display filteringTom Zanussi2012-08-252-0/+26
| | | | | | | | | | | Add a "branches_base" property that can be used to allow only matching branches to be returned from all_branches(). (From meta-yocto rev: c3481e22fc4690ff5e449f9c16c2453fa964205d) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update default branch namesTom Zanussi2012-08-2524-46/+46
| | | | | | | | | | | | | Make sure the default branch names match branch names found in the kernel branch listing. Fixes [YOCTO #2587]. (From meta-yocto rev: a46fc3dad25eac4a28265c956913f46ef25c0cee) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: strip '/base' from kernel branches in templatesTom Zanussi2012-08-2524-48/+48
| | | | | | | | | | | | | For new branches, users can specify /base branches, but we don't want the '/base' in the resultant branch name, so remove it. Fixes [YOCTO #2693]. (From meta-yocto rev: 40e925862884fd981dec63fc598326c73e4a4c20) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: Move the KVM check after the MACHINE/KERNEL ChecksSaul Wold2012-08-251-15/+16
| | | | | | | | | | | | The MACHINE/KERNEL Checks setup MACHINE is it's unset, the KVM checks valid MACHINE is qemux86 or qemux86-64 and fail if it's unset! [YOCTO #2970] (From OE-Core rev: 8d5e6999caff50a4b7d9a9ba69f9875285270459) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/combo-layer: specify branch when getting current revisionPaul Eggleton2012-08-231-2/+3
| | | | | | | | | | | | Handle the case during update where the configured branch is not currently checked out in the component repository by just specifying it in the places where it was not previously. (From OE-Core rev: a3ddf39af7e7cd47156677d8ae753964ee582745) 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>
* runqemu: Honor KERNEL and ROOTFS settings from environmentKhem Raj2012-08-231-2/+2
| | | | | | | | | | | | Expand the usage to be able to specify KERNEL and ROOTFS on commandline. This helps in using the script for booting images that are essentially not part of OE-Core (From OE-Core rev: c985b02130658dd64581ecf14b16e2c70d1d8db5) 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>
* sstate-cache-management.sh: update for the SSTATE_MIRRORSRobert Yang2012-08-201-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | Several fixes: * We have put the sstate file to SSTATE_DIR/??/ currently, but the sstate file on the SSTATE_MIRRORS or the obsolete one is still in SSTATE_DIR/ (no subdir), update the script to support manage them. * Remove the related ".done" file in the SSTATE_DIR. * Add a "-L, --follow-symlink" which will remove both the symbol link and the destination file * Change the "ls -u file_list" (access time) to "ls -t file_list" (change tiem), since the "ls -u" and readlink will change the symlink's access time, which would make the result inconsistent. A solution is save the access time before every "ls -u" and "readlink", save it back after the command, but this would cause performance lost since it needs check each file and modify the symlink's status. Use the "-t" doesn't cause much different. [YOCTO #2897] (From OE-Core rev: 209ec08787981345a7f62b10a8a5c2ace0887c8e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/runqueue-internal: Drop enable-gl optionRichard Purdie2012-08-201-2/+2
| | | | | | | | This is no longer necessary since we've dropped the GL passthrough patches. (From OE-Core rev: b6bc580f1cf56c2e771e87dfeadbb1e5d8416fce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core: Prefer mesa-dri as virtual/libopengles1/2 providerDamien Lespiau2012-08-191-0/+2
| | | | | | | | | | | Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's prefer the accelerated version. (From meta-yocto rev: 13f847744aa842ef38b3f2adf3764425319b5507) 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>
* runqemu: work with yocto-bsp created kernel filenamesScott Garman2012-08-191-1/+1
| | | | | | | | | | | | | | The yocto-bsp tool generates kernels with additional strings within the filename, e.g. zImage-myqemuarm.bin. Loosen the MACHINE detection regex to work with these filenames. Fixes [YOCTO #2890]. (From OE-Core rev: 17d616adffc3514b6778acc6ab5d6da34a7366b5) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: support booting ramfs-based imagesScott Garman2012-08-172-0/+11
| | | | | | | | | | | | | Added support for booting ramfs-based images (e.g, poky-tiny) which do not have block device support. This fixes [YOCTO #2612]. (From OE-Core rev: b09c45f017da71ff966004752f8e926ea00ac451) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate-cache-management.sh: update it for the new layoutRobert Yang2012-08-151-20/+19
| | | | | | | | | | | | | | | Update it for the new layout of sstate-cache. Note: It doesn't handle the old sstate-cache/sstate-xxx.tgz (or siginfo), the user should remove it manually (rm -fr sstate-cache/sstate-* would be OK). [YOCTO #2897] (From OE-Core rev: fcb61aa552a641faafdf2216fa57ba5ac6b9991f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-gen-tapdevs: add UID to CL optionsElizabeth Flanagan2012-08-021-7/+9
| | | | | | | | | | runqemu-if* now requires UID as a command line option which means runqemu-gen-tapdevs needs to take it as an option. (From OE-Core rev: a624ec02c4acec83efbe66406f22abafbdce5d63) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@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>
* 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>
* createrepo 0.4.11: add rpm-createsolvedb.pyRobert Yang2012-08-011-64/+0
| | | | | | | | | | | | | 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>
* 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>
* 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>
* 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>
OpenPOWER on IntegriCloud