diff options
author | Richard Purdie <richard@openedhand.com> | 2007-01-08 23:53:01 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-01-08 23:53:01 +0000 |
commit | f5665d5bfcfb13d01da9e4c7d5046453e80f7baf (patch) | |
tree | b8908549afaf3006bf3763419711090ac999c2a4 /bitbake/lib/bb/fetch/cvs.py | |
parent | aec95de5f7dca2afa3a4a0bdb0d4d553c13f680d (diff) | |
download | poky-f5665d5bfcfb13d01da9e4c7d5046453e80f7baf.tar.gz |
bitbake: Sync with upstream.
* File licence headers were sanitised causing most of the diff.
* cooker.py was created from bin/bitbake.
* cvs fetcher port option was added
* The -f force option was fixed to work correctly
* Multiple entries in rrecrdeps are now handled correctly
(allows adding do_deploy to image depends)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1129 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/fetch/cvs.py')
-rw-r--r-- | bitbake/lib/bb/fetch/cvs.py | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/bitbake/lib/bb/fetch/cvs.py b/bitbake/lib/bb/fetch/cvs.py index 3bdac177eb..bd3317166c 100644 --- a/bitbake/lib/bb/fetch/cvs.py +++ b/bitbake/lib/bb/fetch/cvs.py | |||
@@ -1,4 +1,3 @@ | |||
1 | #!/usr/bin/env python | ||
2 | # ex:ts=4:sw=4:sts=4:et | 1 | # ex:ts=4:sw=4:sts=4:et |
3 | # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- | 2 | # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- |
4 | """ | 3 | """ |
@@ -7,24 +6,26 @@ BitBake 'Fetch' implementations | |||
7 | Classes for obtaining upstream sources for the | 6 | Classes for obtaining upstream sources for the |
8 | BitBake build tools. | 7 | BitBake build tools. |
9 | 8 | ||
10 | Copyright (C) 2003, 2004 Chris Larson | ||
11 | |||
12 | This program is free software; you can redistribute it and/or modify it under | ||
13 | the terms of the GNU General Public License as published by the Free Software | ||
14 | Foundation; either version 2 of the License, or (at your option) any later | ||
15 | version. | ||
16 | |||
17 | This program is distributed in the hope that it will be useful, but WITHOUT | ||
18 | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
19 | FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
20 | |||
21 | You should have received a copy of the GNU General Public License along with | ||
22 | this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
23 | Place, Suite 330, Boston, MA 02111-1307 USA. | ||
24 | |||
25 | Based on functions from the base bb module, Copyright 2003 Holger Schurig | ||
26 | """ | 9 | """ |
27 | 10 | ||
11 | # Copyright (C) 2003, 2004 Chris Larson | ||
12 | # | ||
13 | # This program is free software; you can redistribute it and/or modify | ||
14 | # it under the terms of the GNU General Public License version 2 as | ||
15 | # published by the Free Software Foundation. | ||
16 | # | ||
17 | # This program is distributed in the hope that it will be useful, | ||
18 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
20 | # GNU General Public License for more details. | ||
21 | # | ||
22 | # You should have received a copy of the GNU General Public License along | ||
23 | # with this program; if not, write to the Free Software Foundation, Inc., | ||
24 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
25 | # | ||
26 | #Based on functions from the base bb module, Copyright 2003 Holger Schurig | ||
27 | # | ||
28 | |||
28 | import os, re | 29 | import os, re |
29 | import bb | 30 | import bb |
30 | from bb import data | 31 | from bb import data |
@@ -81,6 +82,10 @@ class Cvs(Fetch): | |||
81 | if "localdir" in ud.parm: | 82 | if "localdir" in ud.parm: |
82 | localdir = ud.parm["localdir"] | 83 | localdir = ud.parm["localdir"] |
83 | 84 | ||
85 | cvs_port = "" | ||
86 | if "port" in ud.parm: | ||
87 | cvs_port = ud.parm["port"] | ||
88 | |||
84 | cvs_rsh = None | 89 | cvs_rsh = None |
85 | if method == "ext": | 90 | if method == "ext": |
86 | if "rsh" in ud.parm: | 91 | if "rsh" in ud.parm: |
@@ -92,7 +97,7 @@ class Cvs(Fetch): | |||
92 | cvsroot = ":" + method + ":" + ud.user | 97 | cvsroot = ":" + method + ":" + ud.user |
93 | if ud.pswd: | 98 | if ud.pswd: |
94 | cvsroot += ":" + ud.pswd | 99 | cvsroot += ":" + ud.pswd |
95 | cvsroot += "@" + ud.host + ":" + ud.path | 100 | cvsroot += "@" + ud.host + ":" + cvs_port + ud.path |
96 | 101 | ||
97 | options = [] | 102 | options = [] |
98 | if ud.date: | 103 | if ud.date: |