From f5665d5bfcfb13d01da9e4c7d5046453e80f7baf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 8 Jan 2007 23:53:01 +0000 Subject: 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 --- bitbake/lib/bb/fetch/cvs.py | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'bitbake/lib/bb/fetch/cvs.py') diff --git a/bitbake/lib/bb/fetch/cvs.py b/bitbake/lib/bb/fetch/cvs.py index 3bdac177e..bd3317166 100644 --- a/bitbake/lib/bb/fetch/cvs.py +++ b/bitbake/lib/bb/fetch/cvs.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # ex:ts=4:sw=4:sts=4:et # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- """ @@ -7,24 +6,26 @@ BitBake 'Fetch' implementations Classes for obtaining upstream sources for the BitBake build tools. -Copyright (C) 2003, 2004 Chris Larson - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA. - -Based on functions from the base bb module, Copyright 2003 Holger Schurig """ +# Copyright (C) 2003, 2004 Chris Larson +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +#Based on functions from the base bb module, Copyright 2003 Holger Schurig +# + import os, re import bb from bb import data @@ -81,6 +82,10 @@ class Cvs(Fetch): if "localdir" in ud.parm: localdir = ud.parm["localdir"] + cvs_port = "" + if "port" in ud.parm: + cvs_port = ud.parm["port"] + cvs_rsh = None if method == "ext": if "rsh" in ud.parm: @@ -92,7 +97,7 @@ class Cvs(Fetch): cvsroot = ":" + method + ":" + ud.user if ud.pswd: cvsroot += ":" + ud.pswd - cvsroot += "@" + ud.host + ":" + ud.path + cvsroot += "@" + ud.host + ":" + cvs_port + ud.path options = [] if ud.date: -- cgit v1.2.3