summaryrefslogtreecommitdiff
path: root/bitbake/lib
Commit message (Collapse)AuthorAgeFilesLines
* bitbake/fetch2: When encoding a file:// url, drop user and host informationRichard Purdie2011-02-031-2/+2
| | | | | | | | When processing a cvs SRC_URI to a file:// mirror, the user and host information will break the mirror processing. This patch addresses it by only constructing valid urls. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/lib/bb/fetch2: Assign a default name in the names array as empty ↵Richard Purdie2011-02-031-1/+1
| | | | | | strings as names cause problems for python Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/fetch2: Add missing parameter to localcount_internal_helperRichard Purdie2011-02-021-1/+1
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/fetch2/git: Ensure target directory exists when copying filesRichard Purdie2011-02-021-0/+1
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fetch2: Allow multiple src rev to be used in one src_uriYu Ke2011-02-025-64/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SRC_URI format: the SRC_URI are extended to allow multiple src rev: name=<name1>,<name2>,...<name-n> branch=<branch1>,<branch2>,...,<branch-n> also SRCREV can be defined with SRCREV_<name1> = xxxxx SRCREV_<name2> = xxxxx * FetchData extention to support multiple src rev, several FetchData data are added: - FetchData.names: list of name in SRC_URI, one name per srcrev. name is the index of revision and branch - FetchData.revisions: dictionary of name->revision. - FetchData.branches: dictionary of name->branch. For example, linux-yocto recipes becomes: SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;branch=${KBRANCH},meta;name=machine,meta" FetchData.names = ['machine', 'meta'] FetchData.revisions = { 'machine':xxxxx, 'meta':xxxxxx } FetchData.branches = { 'machine':${KBRANCH}, 'meta':'meta'} * generic revision handling extension the related revision handling code in fetch2.__init__.py are changed accordingly. the major change is add name parameter to indicate which src rev to handling. originally there is one src rev per FetchData, so FetchData parameter is enough. now since one FetchData has multiple src rev, it is necessary to use FetchData + name to specifiy src rev. * git extension git fetcher are also revised to take advantage of the multiple src rev in FetchData. especially the download() method are enhanced to fetch multiple src rev. * other fetcher (svn, hg, ...) does not support multiple src rev. they just sync the API to add name, and then simply ignore the name. no actually functional change Signed-off-by: Yu Ke <ke.yu@intel.com>
* git.py: Remove the source tree tarball archivesYu Ke2011-02-021-58/+5
| | | | | | | | Since we're now always providing the git source control files it becomes pointless to handle the tarballs of specific git revisions so drop this part of the fetcher. Signed-off-by: Yu Ke <ke.yu@intel.com>
* bitbake/fetch2/git: Add nocheckout option to disable checkouts and always ↵Richard Purdie2011-02-021-9/+12
| | | | | | add scm data to checkouts Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bb.fetch2: Add git unpackYu Ke2011-02-021-0/+25
| | | | | | | | | | | | | | The git download method clones the git repository to the local machine. The unpack process can be optimised to be a local to local machine clone or a direct readtree operation to the destination using git.will clone git repo to local, so git unpack can be simplified to only checkouting the code to the work dir. For fullclone case, we also need to manually copy all the ref info, which is needed by the later do_kernel_checkout(). Rather than use hardlinks, we reference the repository using alternatives since the download directory may be on a different filesystem. [Change to use -s by Richard Purdie] Signed-off-by: Yu Ke <ke.yu@intel.com>
* bitbake/fetch2: Ensure the local revision counter takes a default value of ↵Richard Purdie2011-02-011-1/+1
| | | | | | 0, not None Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/runqueue.py: Avoid starvation of events to the serverRichard Purdie2011-01-281-1/+1
| | | | | | | | | | | | | | The server UI was reading 1024 bytes, then sleeping for 0.25 seconds. Since most new LogRecord events are larger than this it leads to a build up of data which is only processed slowly, leading to a bottleneck and a slow down of all bitbake processes. Thanks to Dongxiao Xu <dongxiao.xu@intel.com> for the great work in debugging this. A large value has been left in for the read() command just to ensure some fairness amongst process handling if a task tries to log truly huge amounts of data to the server, or goes crazy and ensures the main loop doesn't stall. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/build.py: When looking up extra stamp info for setscene tasks, use ↵Richard Purdie2011-01-271-2/+6
| | | | | | | | the real taskname (Fixed based on a bug reported by Dongxiao Xu <dongxiao.xu@intel.com>) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/unlockfile: Fix exception handlingRichard Purdie2011-01-261-1/+1
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/fetch2: Instrument fetchers when making network accessYu Ke2011-01-259-1/+22
| | | | Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2: add "BB_NO_NETWORK" optionYu Ke2011-01-251-0/+10
| | | | | | | | | | Sometime user want a purely local fetching, i.e. using local mirror without any remote netowrk access. BB_NO_NETWORK option is introduced for this purpose check_network_access() is the guard for BB_NO_NETWOKR option. it should be put in any place that fetcher use network access Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2: remove the obsolate Fetch.try_mirrors referrenceYu Ke2011-01-251-7/+0
| | | | | | Fetch.try_mirrors is no longer exists, so the code is obsolate Signed-off-by: Yu Ke <ke.yu@intel.com>
* git.py: split download to download() and build_mirror_data()Yu Ke2011-01-252-3/+9
| | | | | | | | the download is to fetch the source from URL, the build_mirror_data is to create the mirror tar ball. the original go() method mix them together, it is more clean to split them. Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2: rename "go" with "download" to better reflect its functionalityYu Ke2011-01-2513-19/+19
| | | | | | no functional change Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch: add fetch version to distinguish bb.fetch and bb.fetch2Yu Ke2011-01-252-0/+4
| | | | | | | | there is case that we need to distingush bb.fetch and bb.fetch2, and use different API for bb.fetch and bb.fetch2. so it is necessary to add version info for distinguish purpose Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2: revise the Fetch.unpack APIYu Ke2011-01-251-18/+15
| | | | | | | | | | change the unpack to use the urldata and rootdir parameter - urldata is the FetchData instance - rootdir is the dir to put the extracted source. the original unpack use current dir (os.getcwd) as destination dir, which is not flexible and error-prone (error will occur if caller not chdir to dest dir) Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2: add unpack method in fetcherYu Ke2011-01-251-0/+84
| | | | | | copy exactly the base.bbclass:oe_unpack_file() to bb.fetch2 as the code base Signed-off-by: Yu Ke <ke.yu@intel.com>
* bitbake/utils: Ignore OSError in unlockfileRichard Purdie2011-01-241-1/+1
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* siggen.py: better print for task hash comparisonKevin Tian2011-01-211-5/+12
| | | | | | | | | current bitbake-diffsigs simply print out the whole 'runtaskdeps' when there's mismatch, which is not very readable. On the other hand, 'runtaskhashes' comparison is broken which assumes same key existing in two sides. This commit provides better output by figuring out differences from addition, removal or hash change. Signed-off-by: Kevin Tian <kevin.tian@intel.com>
* bitbake: fix parameter order for flaglist()Dongxiao Xu2011-01-201-2/+2
| | | | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
* bitbake/providers.py: Fix runtime providers problemsRichard Purdie2011-01-201-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Take a real world testcase where you have two recipes, each of which contains PACKAGES_DYNAMIC = "gdk-pixbuf-loaders-*" and recipes which RDEPEND on some gdk-pixbuf-loaders-xxx package. To select between these you need to set a PREFERRED_PROVIDER. These are specified in the PN namespace so the locgical conclusion is that setting PREFERRED_PROVIDER_gdk-pixbuf = "gtk+" should work. It doesn't and instead checks crazy things. The code was correctly finding the two possible providers, gtk+ and gdk-pixbuf. It was however only accepting PREFERRED_PROVIDER_gtk+ = "gdk-pixbuf" to resolve this problem which reads as the exact opposite to what was wanted. This patch changes the code to do something that makes sense. I suspect that before these changes it was pretty much a null operation rubber stamping the single provider case. For Poky at least it exposes a few cases where -nativesdk recipes were providing the same things as their normal counterparts but these are genuine bugs in the metadata. I've also attempted to make the multiple provider error message human readable as I counldn't understand it and I doubt anyone else could either. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/utils.py: Teach unlockfile about shared mode lockfilesRichard Purdie2011-01-191-1/+7
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/utils.py: Add option of holding shared lockfilesRichard Purdie2011-01-191-2/+6
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: Introduce stamp-extra-info task flag into stamp filenamesDongxiao Xu2011-01-184-14/+29
| | | | | | | | | | | For certain tasks, we need additional information in build stamp file other than the task name and file name. stamp-extra-info is introduced as a task flag which is appended to the stamp file name. [Code simplifcations/tweaks from Richard] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/build.py: Allow FuncFailed error to have an optional messageRichard Purdie2011-01-171-2/+5
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/build.py: Rename message field to avoid DeprecationWarning: ↵Richard Purdie2011-01-171-3/+3
| | | | | | BaseException.message warning Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/siggen.py: Fix whitelisted variable handlingRichard Purdie2011-01-122-10/+22
| | | | | | | | | Even when a variable was whitelisted, any dependencies of that variable could still creep into the task hash due to the way the whitelisting code worked. This patch changes thing to ensure that when whitelisted, that whitelisting applies to the variable and any dependencies it has. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* build: remove duplicate import of utilsBernhard Reutner-Fischer2011-01-121-1/+0
| | | | | | | (Bitbake rev: 86c6434f093ce5e55d1febfb424a8e595ffc2d17) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* *: use utils.remove() some moreBernhard Reutner-Fischer2011-01-125-23/+13
| | | | | | | (Bitbake rev: d3489b141cac1197324661680fe38b8a88bc49b4) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* codeparser: fix spacing in diagnostic messagesBernhard Reutner-Fischer2011-01-121-2/+2
| | | | | | | (Bitbake rev: 8c5555f5ed6d61db57de80d2820c8cec64a27239) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/knotty.py: Ensure task note messages are only surpressed at default ↵Richard Purdie2011-01-121-2/+6
| | | | | | log levels Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/goggle: don't drop eventsJoshua Lock2011-01-121-1/+1
| | | | | | | We had a logic inversion that meant we where dropping quite a significant number of events on the floor.... Fixed! Signed-off-by: Joshua Lock <josh@linux.intel.com>
* bitbake/depexp: closing progress dialog kills guiJoshua Lock2011-01-121-0/+1
| | | | | | | It seems safe to assume a user hitting the close button on the dialog wants to kill the whole UI. Signed-off-by: Joshua Lock <josh@linux.intel.com>
* bitbake/goggle: closing the progress dialog kills the UIJoshua Lock2011-01-121-0/+1
| | | | | | | | It's unlikely that someone wants to close the progress dialog yet leave the UI (and BitBake process) running, so hook up the progress dialogs delete-event to exit gtk. Signed-off-by: Joshua Lock <josh@linux.intel.com>
* bitbake/uievent: fix queueing of events for xmlrpc before UI has loadedJoshua Lock2011-01-121-2/+5
| | | | | | | | | | | | | | | The recent change to Queue up events before the UI is spawned (in 26eda933379801ef1c8b4b09e67d14f498cd3813) broke the xmlrpc server because the uievent implementation of BBUIEventQueue expects pickled strings for its queue_event() method. This is because the RPC exposed event.send() method must accept pickled strings, but for xmlrpc event.send() is just mapped to queue_event(). Work around this by adding a send_event method which unpickles strings and hands them off to queue_event() which can then be used for the remapping. Signed-off-by: Joshua Lock <josh@linux.intel.com>
* runqueue.py: Renable check_stamp_fn() for now since we still fork for task ↵Richard Purdie2011-01-101-14/+10
| | | | | | execution (as per bitbake-upstream) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/runqueue.py: Simplify hashdata storage since we're not using an ↵Richard Purdie2011-01-101-17/+14
| | | | | | external script for tasks anymore, in line with bitbake-upstream Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* msg: no need to hardcode the logging levelsChris Larson2011-01-101-2/+2
| | | | | | | (Bitbake rev: 8385bfb7da3a3b71f340a787d7f1502ba61c5b81) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Inject taskpid into log records via our log handlerChris Larson2011-01-102-8/+4
| | | | | | | | | | | | It turns out that while log filters added with addFilter are only associated with that logger, and not its children, handlers are inherited, and handlers can be filters. So, let's add filtering to our existing LogHandler class which dispatches our log records as bitbake events. (Bitbake rev: 0153ace246e7c88366f45c8f035a2b4505a1c115) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake/runqueue.py: Fix del_stamp calls and -f option to bitbake with the ↵Richard Purdie2011-01-101-5/+6
| | | | | | BasicHash siggen code Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Fetcher: only set __BB_DONT_CACHE when SRCREV = "${AUTOREV}"Yu Ke2011-01-101-3/+3
| | | | | | | | we should cache SRCREV whenever possible, the only exception is when SREREV is auto rev. so change the logic to only set __BB_DONT_CACHE at SRCREV = "${AUTOREV}" case Signed-off-by: Yu Ke <ke.yu@intel.com>
* Fetcher: break the "SRCREVINACTION" deadlockYu Ke2011-01-106-53/+18
| | | | | | | | | | | | | | | | | | | | | Current fetcher has annoying "SRCREVINACTION" deadlock, which occurs when SRCREV=${AUTOREV}=@bb.fetch.get_srcrev(): get_srcrev()->setup_localpath()->srcrev_internal_helper() ->evaluate SRCREV->get_srcrev() current fetcher resolve the deadlock by introducing a "SRCREVINACTION" condition check. Althoguh it works, it is indeed not clean. This patch use antoehr idea to break the deadlock: break the dependency among SRCREV and get_srcrev(), i.e. assign a specific keyword "AUTOINC" to AUTOREV. when Fetcher meet this keyword, it will check and set the latest revision to urldata.revision. get_srcrev later can use the urldata.revision for value evaluation(SRCPV etc). In this case, SRCREV no longer depends on get_srcrev, and there is not deadlock anymore. Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2.bzr: add bzr urldata_initYu Ke2011-01-101-2/+5
| | | | | | | move the bzr specific urldata init from localpath to urldata_init so that it can be called early Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2.hg: add hg urldata_initYu Ke2011-01-101-5/+9
| | | | | | | move the hg specific urldata init from localpath to urldata_init so that it can be called early Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2.svn.py: add urldata_initYu Ke2011-01-101-1/+5
| | | | | | | move the svn specific urldata init from localpath to urldata_init so that it can be called early Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2.git.py: add git urldata_initYu Ke2011-01-101-4/+9
| | | | | | | move the git specific urldata init from localpath to urldata_init so that it can be called early Signed-off-by: Yu Ke <ke.yu@intel.com>
* bb.fetch2: add urldata_init call for Fetch classYu Ke2011-01-101-0/+2
| | | | | | | | | | | FetchData has some fetch method specific data, and only fetch method knows how to initialize it. originally it is mostly initialized in Fetch.localpath(). But now there is requirement to call Fetch.latest_revision() before Fetch.localpath(), thus require another earlier place for initialization. so urldata_init is introduced for this purpose. it will be called in FetchData:__init__ and make all the Fetch functions useable after that. Signed-off-by: Yu Ke <ke.yu@intel.com>