summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstreamZhai Edwin2012-01-3013-144/+17
| | | | | | | | | (From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa) (From OE-Core rev: 1194935707f4acd9029b36769bc0320ba0a90163) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cups: Fix recipe to use the correct cups directoriesMark Hatle2012-01-302-7/+15
| | | | | | | | | | | | ${libdir} is not used, instead they use a common ${exec_prefix}/lib directory structure for helpers, filters, renderers, etc. (From OE-Core rev: 24ae432b1a3906956381d83c1984687e45c5a1d1) (From OE-Core rev: 72da8109de9c2b1e237655706cdf4de447d38393) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* eglibc-2.12: Fix build on powerpc/603eKhem Raj2012-01-302-1/+28
| | | | | | | | | | | | | | | | | | We pass --with-cpu to eglibc now. Which breaks the configure for cpus that it does not support We add support for ppc603e which gets 2.12 building for qemuppc. (From OE-Core rev: 465a988e2370ec377875b599045f2a7bad913ac6) (From OE-Core rev: f6dbd42382d980d90f3e64a94178a0050af537cf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Conflicts: meta/recipes-core/eglibc/eglibc_2.12.bb
* gcc: include plugin-related headers into packaged SDKDmitry Eremin-Solenikov2012-01-303-2/+3
| | | | | | | | | | | | Include headers necessary to compile gcc plugins into cross-canadian gcc packages. (From OE-Core rev: d12aa92b3dac1109d510e7b6f74055d1ab927817) (From OE-Core rev: 51c96c98fca5a4a51cb38a6442ab9b4a03938721) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* e2fsprogs: include devtools scriptsDmitry Eremin-Solenikov2012-01-301-1/+2
| | | | | | | | | | | | Some scripts are necessary to develop programs with libcom_err and libss. Include those into e2fsprogs-dev package. (From OE-Core rev: 46332c2313abb273f6fc889fac4daa91cf43faa3) (From OE-Core rev: f1f22acd15591e5394254441c4364899875a0fbc) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glib-2.0: include glib-gettextize stuffDmitry Eremin-Solenikov2012-01-303-3/+3
| | | | | | | | | | | | glib-utils already includes glib-gettextize program. Include some files necessary for glib-gettextize to work. (From OE-Core rev: c98356e9c46cd28b7ca8e84fe0ea56dc6d812a8d) (From OE-Core rev: 0f0d5c7d980400bb45e78b7f178844c5a6dbf630) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* alsa-lib: Don't use versioned symbols on uclibc builds as it causes strange ↵Daniel Lazzari2012-01-301-0/+2
| | | | | | | | | | | | | hangs alsa-lib: Don't use versioned symbols on uclibc builds as it causes strange hangs. Taken from oe-classic. (From OE-Core rev: b354eb957ce08ac7814ce46c13ca3a8449b4063a) (From OE-Core rev: 16852546234a252103337414fe536a3b97443539) Signed-off-by: Daniel Lazzari Jr <dlazzari@leapfrog.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: v3.0.10 + rt27Bruce Ashfield2012-01-302-13/+14
| | | | | | | | | | Updating the BSP base to the kernel.org v3.0.10 baseline and importing the latest stable rt27 release. (From OE-Core rev: e8aa8fe6e299104d4eb6da16134272a1dc7e929b) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: change SRC_URI to 3.0 maintenance kernelBruce Ashfield2012-01-302-4/+4
| | | | | | | | | | | | The 3.0 yocto kernel is updated for both new feature development and for maintenance purposes. The maintenance kernel repository takes updates once they have been applied to the development repository and have been deemed safe/suitable for point releases. (From OE-Core rev: 0b6eedfe26fca031e84543cab92b20e121364fb7) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* README.hardware: declare support for BeagleBoard xM rev BPaul Eggleton2012-01-301-1/+1
| | | | | | The BeagleBoard xM revision B has been tested (by me, if nobody else.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* README.hardware: update atom-pc instructionsPaul Eggleton2012-01-301-17/+9
| | | | | | | | | The -live and -directdisk images have been superseded in the Yocto Project 1.1 release, so update the instructions for atom-pc relating to this change. Also fix a couple of other minor atom-pc related capitalisation. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* poky: set linux-yocto-rt preferred version for qemu machinesJoshua Lock2012-01-301-0/+5
| | | | Signed-off-by: Joshua Lock <josh@linux.intel.com>
* local.conf.sample.extended: Fix bug 1674Xiaofeng Yan2012-01-301-0/+3
| | | | | | | | | | | | | [YOCTO #1674] local.conf.sample.extended: An image based on gtk+-directfb don't need x11 for DEFAULT_FEATURES Remove "x11" from DEFAULT_FEATURES and add "directfb" to it because someone could don't need x11 in their project, perhaps gtk over directfb will meet his reqirement. (From OE-Core rev: 5def790bdecd2726692b40a57bc12c8bdfea9179) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machine/atom-pc: enable soundJoshua Lock2012-01-301-1/+1
| | | | | | | Add alsa to the MACHINE_FEATURES - looks like this was an oversight. Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ui/crumbs/hobprefs: trigger a reparse after changing IMAGE_FSTYPESJoshua Lock2012-01-301-0/+1
| | | | | | | | | | | | | | | As reported on the mailing list[1] when changing IMAGE_FSTYPES through the hob preferences a reparse is required before the changes will be picked up by the system. This patch sets the reload_required property of the class to true when the image types have been modified to ensure the reparse is triggered. 1. https://lists.yoctoproject.org/pipermail/yocto/2011-December/006002.html (Bitbake rev: 6c0babf08909307ab69a66ed06e77e8818b2a8c5) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ui/crumbs/runningbuild: handle InvalidTask eventsJoshua Lock2012-01-301-0/+4
| | | | | | | | | | | | The knotty UI just ignores these and so should RunningBuild, if these events aren't handled the UI appears to hang. Fixes [YOCTO #1665] (Bitbake rev: 540ba78075bd525776aa23bf38bee66350c66534) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* siggen.py: If both sigs have a variable in it's whitelist then don't say ↵Matthew McClintock2012-01-301-3/+3
| | | | | | | | | | | | | it's changed Some BB_HASHBASE_WHITELIST variables are in the lists of variable dependencies for signatures. Ignore those differences in lists since this difference does not matter (Bitbake rev: 71b53a3f0766ca464560a1f6a449f9424fbdf7ae) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: Update and fix bitbake-runtaskRobert Yang2012-01-301-66/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since bitbake switched back to the fork instead of the exec model, it no longer used bitbake-runtask and the code has suffered some bitrot. bitbake-runtask is a useful tool for excuting the task without the scheduler of bitbake, so that the external tool can invoke it easily. It also provides a useful example of how to invoke exec_task() with low overhead without a lot of the bitbake threading/UI overhead. Significant changes: * This patch changes the argument order so that the commonly used and mandatory arguments come first. * The taskhash file and dryrun options are now optional * It now uses the bitbake logging mechanisms to provide processed logging output to the console. * The process handling to do with stdout/stderr redirection are removed since they're no longer required. [YOCTO #1229] RP: Logging updates to the patch based on Roberts original patch Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/siggen.py: Don't backtrace if the taskhash data isn't presentRichard Purdie2012-01-301-2/+2
| | | | | | | | | | This allows the code to safely fall back to dumping the basehash data if the taskhash data isn't present for some reason. We could effecitvely obsolete the runtime option and use this approach instead exclusively. (Bitbake rev: 5ace320ccc01f4e326f90b7ba060dcbff3380dca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* build.py: Be determistic about a function's cwdRichard Purdie2012-01-301-2/+1
| | | | | | | | | | | | | | | | | There is a subtle but nasty problem that a function's cwd can vary depending on whether ${B} (often ${S}) exists before the funciton is called or not. Most functions in the system can cope with this but its bad practise and I've just witnessed build failures resulting from this during image generation from bootimg.bbclass. I also suspect this could explain some odd fetcher behaviour witnessed in the past. This change ensures we always call funcitons with a specific build directory making things deterministic. (Bitbake rev: ef0888f83fa4408eb768257d7e03700202faad18) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cooker.py: Allow the -e option to work with virtual classes and -bRichard Purdie2012-01-301-1/+3
| | | | | | | | | | | | | Using bitbake -e -b virtual:xxxx:/path/to/the.bb would result in zero matches since the virtual:xxxx piece wasn't being processed. This adds in the necessary functionality to handle it correctly. [YOCTO #1793] (Bitbake rev: bd5a727c8447bcb747c1d2463b7de2ab6d21a7de) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Nothing uses USERNAME, remove it - can cause sstate-cache conflictsMatthew McClintock2012-01-301-1/+0
| | | | | | | | | | USER is the correct variable to use, also this can affect sstate cache as well. (Bitbake rev: d7f9edda65dae2e046871afa275c5a51dff48fc4) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: silence non-literal warnings for vardepsChristopher Larson2012-01-303-9/+37
| | | | | | | | | | If the vardeps flag is not None, we now silence the warnings about non-literal usage for that variable. (Bitbake rev: e724b9f417d1baf898f5afc6376c73c1a2ad8db9) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: drop expand trackingChristopher Larson2012-01-301-11/+0
| | | | | | | | | | | | | | | | | | | | | | There are two usual cases involving bb.data.expand: - Calling it with a string literal -- "bb.data.expand('${FOO}/${BAZ}/bleh', d)". - Calling it on getVar results (legacy) -- "bb.data.expand(bb.data.getVar('FOO', d), d)" Nothing in any of the usual layers uses it in any other way, and I'm having trouble coming up with any real use cases beyond this. The first of the above cases is already tracked, via the expandWithRefs called on the python code string. The second didn't emit a warning anyway, since the getVar was already handled. Given this, I see no reason for us to maintain explicit expansion tracking. Further, we weren't using its results anyway (the var_expands member). (Bitbake rev: 405dfe69e6a608826e599ebf2f83ef8cf5083b96) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: accept a name for better messagesChristopher Larson2012-01-303-11/+13
| | | | | | | | | | | | | | | | | | | | - If a name is passed to the parser, prepend the messages with "while parsing <name>:". This gives a bit more context. - Tweak the warning messages slightly (they had to be altered anyway to inject the variable being parsed). Before: DEBUG: Warning: in call to 'bb.data.getVar': argument ''%s' % var' is \ not a literal After: DEBUG: while parsing emit_pkgdata, in call of bb.data.getVar, argument \ ''%s' % var' is not a string literal (Bitbake rev: 1060193ae4d54e667735dbff5d1d2be49a3f95c9) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: simplify how we compare the called node namesChristopher Larson2012-01-301-52/+20
| | | | | | | | | | | | | | With the previous method, using the compare_name methods, we split the requested match name by '.', reversed it, then compared them piecemeal during the node traversal. The new method walks the nodes and hands back the name of what's being called, and then we check that. This also consolidates the two different implementations of traversal of the attribute/name nodes (one in compare_name, one for the execs). (Bitbake rev: 84e535b5165c7e936c5b1486bdf4626ed3649f5f) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: merge the nested python parsing classesChristopher Larson2012-01-301-102/+87
| | | | | | | | | | The split is even less necessary now that we use ast.walk rather than an actual NodeVisitor subclass. (Bitbake rev: d6c44fac184abae8395bfa7078f06675218aa534) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* data/siggen: Add vardepvalue mechanism to allow the variable dependency code ↵Richard Purdie2012-01-302-13/+17
| | | | | | | | | | | | | | | | | | | | | | | to be forced to specific values We have a problem if we want to inject specific information into the variable dependency code. There are cases for example where we want a dependency on the value of X but it doesn't matter how X was constructed or what dependencies it might have had, we only care about the absolute value. With the current code, its near enough impossible to do this. This patch adds such a mechanism so the user can trigger this with code like: baselib[vardepvalue] = "${baselib}" It also refactors some of the code so we do variable lookups once instead of doing this in two different functions. [YOCTO #1583] (Bitbake rev: 6c879b44ccf42dc73fe4467076e114700d7ba81b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fetch2: Improve uri_replace to handle paths with no trailing '/'Richard Purdie2012-01-301-3/+10
| | | | | | | | | | | | | | | | | | | | | | Currently if you specify a mirror like: file://.* http://linux.freescale.net/yocto/sstate-cache it won't work as you expect whilst: file://.* http://linux.freescale.net/yocto/sstate-cache/ will since it has the trailing slash. This patch handles both cases correctly. It also adds some debug to the uri_replace function since its near impossible to debug it without some kind of output. [YOCTO #1578] (Bitbake rev: a0246bf09c93bb657eaf6ba61d090b247ed33640) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqueue.py: Fix debug message to reference the correct taskRichard Purdie2012-01-301-1/+2
| | | | | | (Bitbake rev: 035c673c463ca450245acf824e7b7e8f889bdc89) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fetch2/local: Don't default to files in DL_DIR for file:// urlsRichard Purdie2012-01-301-3/+1
| | | | | | | | | | | | | | | Defaulting to any file in DL_DIR as the first match for a file:// url doesn't make much sense and can lead to unexpected results. This patch changes the logic so this is the last fallback location instead. Whether it should be using DL_DIR at all for this is a good question but something for another patch. [YOCTO #1710] (Bitbake rev: 5597a68fac0954c682b67471722c2643e2415f99) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* siggen.py: sort task hash depedencies with basepathMatthew McClintock2012-01-301-11/+14
| | | | | | | | | | | | | | | Without this patch the tash hash dependencies can be in a order that is dependent upon directory/filesystem layout. With this change the data is sorted the same regardless. Without this the dependent hashes could be in different orders on different systems and consequently final md5 hash would differ as well even though nothing else changed. (Bitbake rev: 9a2029899c946ce9aa8adbc85f2cfe7a85b92182) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: print out symmetric difference when comparing sigsMatthew McClintock2012-01-301-0/+4
| | | | | | | | | | This is useful for really longs lists to pinpoint what has actually changed (Bitbake rev: f1eb6d3dcc10c42bb09383a87bde3afa69bc6ed9) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqueue.py: Ensure we fully process the covered listRichard Purdie2012-01-301-3/+4
| | | | | | | | | | | | | | | The existing looping code can mask an existing "found = True" by forcing it to False each time. This can lead to dependency lists not being fully searched and results in dependency errors. An exmaple of this was the autobuilder building linux-yocto from sstate but then rebuilding some of the recipe's tasks for no apparent reason. Separating the logic into two variables solves this problem since any "found = True" value is now always preserved. (Bitbake rev: 61017fc5d30b7a13308d038872ec92efc1a84cef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqueue.py: Ensure setscene tasks don't break dependency orderRichard Purdie2012-01-301-4/+7
| | | | | | | | | | | | | | | If A depends upon B which depends upon C and the setscene for B succeeds but C is going to get rebuilt, we should wait for C to try and build A but currently we don't. This is due to the timing of when we run the task_skip() as this triggers other tasks to become buildable. This patch moves the timing of that call to a more appropriate place allowing dependencies to behave as expected. (Bitbake rev: b7114d8e5d9b0720339bd5d24d243c0f2a7c1f3b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/runqueue.py: Sort the list of skipped tasks as it makes searching ↵Richard Purdie2012-01-301-1/+1
| | | | | | | | | | the list easier when debugging (From Poky rev: 5de8a495fba657e1febc616bbc737a8136cc88f9) (Bitbake rev: 110f6cccbcc5907e15262c05d5c47da101e1a47d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/runqueue.py: Fix incorrect task number reference in debug messageRichard Purdie2012-01-301-1/+1
| | | | | | | | (From Poky rev: 45887bbd5479041be05b914668f14de6ec9b9831) (Bitbake rev: dc4439ca8c7db7ceee78bd0552f65ceddcff17a7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* parse_py: Use absolute paths for FILERichard Purdie2012-01-302-2/+2
| | | | | | | | | | | | Its possible for relative paths to creep into FILE. These confuse the build system no end as its not clear where they might be releative to. This patch ensures we always use resolved absolute paths for FILE so that things behave in a deterministic way. (Bitbake rev: 658d7daa70e46c2b20973b90ee53f0bbadc8bf5d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* siggen.py: Include list of variables in hashesRichard Purdie2012-01-301-0/+1
| | | | | | | | | | | | | Ensure that the list of dependencies is included in the hash as well as their contents Prior to this, adding or removing dependencies with values of "None" would not change the hash, despite diffsigs reporting this difference. (Bitbake rev: 727ca945177ce9bd44515cf611e3e95a09466d98) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* siggen.py: Fix diffsigs output for filename comparisionsRichard Purdie2012-01-301-3/+15
| | | | | | | | | | | | | | | When comparing sig files, if the recipe locations had changed, the dependent tasks list would show as changed even if the actual hash had not changed. This updates the code to only compare the base part of the pathnames. It also tweaks some of the output to add newlines to aid comparing two lists of variables as it makes the location of the difference clearer. (Bitbake rev: 165a22ddcc647b945707fb5c483146bb336d5f66) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: make var_expands actually hold useful informationChristopher Larson2012-01-301-1/+1
| | | | | | | | | | | Previously, it was calling var_expands.update() rather than add(), with a string argument, resulting in adding each character of that string to the var_expands set, rather than the string itself. (Bitbake rev: 8e4e75383e43d6da2c16ec5286186a0d0569b0f8) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lib/bb/runqueue: avoid marking runtime dependencies as coveredPaul Eggleton2012-01-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | The code which populates setscene_covered list was adding a task to the covered list if all of the tasks that depend upon it were also covered; however, this means that tasks that would have installed "runtime" dependencies were being marked as covered also, e.g. gmp-native and mpfr-native are needed by gcc-cross at runtime since they are shared libraries that gcc links to, but their do_populate_sysroot tasks were being marked as covered, resulting in failures later on if gcc-cross was available from sstate but mpfr-native and gmp-native weren't. Since we currently have no real way to handle runtime dependencies for native packages, add a workaround which avoids marking tasks as covered if one or more of their revdeps are from a different recipe. Fixes [YOCTO #1536]. (Bitbake rev: e492eb4dc9016cd0bed194377c6f2b85cf0ad113) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.py: Fix lockfile retry handlingRichard Purdie2012-01-301-1/+1
| | | | | | | | | | The lockfile retry parameter is expected to return immediately after attempting to take the lock. There was a bug in the logic which this patch fixed to ensure it does that. (Bitbake rev: f421ef819f00ac659504d9af41bcc8323422ff8c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* hob: fix backtrace when dismissing open dialogJoshua Lock2012-01-301-2/+2
| | | | | | | | | | | | Clearly a logic/indentation error - we should only try and load the recipe should the file-chooser return OK. Fixes [YOCTO #1668] (Bitbake rev: db59297aa1861614ffaea4295b9b054baa8a12b9) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fetch2: Export additional variables to the fetchersMatthew McClintock2012-01-301-1/+2
| | | | | | | | | | git could need these environment variables when working behind a proxy (Bitbake rev: dca46cc2e1c75b6add2c4801e2994a4812745f5b) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fetch2/git: Make git fetch run with -f so rebased branches don't failMatthew McClintock2012-01-301-1/+1
| | | | | | | | | | | | | | git fetches can fail (or at least return failed) when trying to fetch and prune rebased branches. This patch simply adds a -f to the git fetch command so these failure are ignore Generally, if some SHA was rebased away it's not coming back so there is no point in not doing this force (Bitbake rev: a7b75e4db52445b30ec0fc0053dcf454f5f7d2db) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* documentation/Makefile: new 'edison' variable for YP dev manual.Scott Rifenbark2012-01-301-18/+44
| | | | | | | | | | | | | | | | | | | | I discovered that the figures used in this manual differ depending on the branch. There are two figures that are different. Thus, the TARFILES variable in the makefile needed to be conditionalized. If it is not, then the process that makes the tarball throws errors because it cannot find the two figures from the other branch. To fix this I introduced the 'BRANCH' variable. It is to be used only when you make or publish the YP Development Manual. And, you only use it to specify 'edison'. If you are building from the 'master' branch you don't need to use it. Comments in the file have been updated to explain usage. (From yocto-docs rev: 0341b19f75176fd4133fd66cb5536b765edf0294) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* documentation/Makefile: fixes for missing tarfilesScott Rifenbark2012-01-301-3/+11
| | | | | | | | | | | | | | I had added some edison-specific figures and they needed to be included in the TARFILE variable for the YP development manual. The fix now makes the TARFILE variable all-inclusive for all .PNG files regardless of branch. Consequently, there can be some missing files when the manual is made but the errors are okay. I documented the exceptions above the variable. (From yocto-docs rev: be731afde47dfc85da6ba88f93910899ec259e87) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* documentation/dev-manual/dev-manual-kernel-appendix.xml: edits to exampleScott Rifenbark2012-01-301-34/+82
| | | | | | | | | | | | Poor flow for the config_smp example. Upon reading this example it did not stand well on its own. I added some text, albeit redundant but necessary I felt, so that the example would stand on its own. (From yocto-docs rev: 1677a873e9bd1124a5ff0234edc1ee05938c19b0) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* documentation/dev-manual/dev-manual-kernel-appendix.xml: Fixed repo nameScott Rifenbark2012-01-301-1/+2
| | | | | | | | | | I left "work" off the name of the copy of the clone repo for the kernel example. (From yocto-docs rev: 26f3dd9c82beb3c8d6e50c2132756bdb4b29b56d) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>