Re: [OpenWrt-Devel] [PATCH] add src-cvs to feeds script

2011-04-12 Thread Jo-Philipp Wich
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi,

patching file scripts/feeds
Hunk #1 FAILED at 106.
Hunk #2 FAILED at 283.
2 out of 2 hunks FAILED -- saving rejects to file scripts/feeds.rej


Can you rebase your patch?

~ Jow
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2ks18ACgkQdputYINPTPPmQgCeIxbWWe/Pz6IQEsiwWcohDrIt
5t8An2x7DFxFy3lji5l68nJ9OZiCG1oi
=6OA/
-END PGP SIGNATURE-
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] add src-cvs to feeds script

2011-02-22 Thread Andrew Peebles
 This adds CVS as a possible source in feeds.conf files.  This patch 
supports local CVS checkout of a package repo.  Example:


src-cvs mypkgs design/sw/common/openwrt/package

Will execute:

cd feeds; cvs checkout -Pd mypkgs design/sw/common/openwrt/package

This patch also supports branch syntax:

src-cvs mypkgs design/sw/common/openwrt/package;GOLDEN

which will add "-r GOLDEN" to the checkout line.

Note that these checkouts (and update) require the use have a valid 
$CVSROOT already set up in their environment.


Signed-off-by: Andrew Peebles 

diff -Naur old/scripts/feeds new/scripts/feeds
--- old/scripts/feeds   2011-02-04 15:59:09.0 -0800
+++ new/scripts/feeds   2011-02-22 17:31:07.0 -0800
@@ -106,6 +106,11 @@
'init'  =>  "svn checkout '%s' '%s'",
'update'=>  "svn update",
'controldir'=>  ".svn"},
+   'src-cvs' =>  {
+   'init'  =>  "(module='%s'; path='%s'; mkdir -p \$path; 
bn=`basename \$path`; cd `dirname \$path`; cvs checkout -Pd \$bn \$module)",
+   'init_branch'   =>  "(branch='%s'; module='%s'; path='%s'; mkdir -p 
\$path; bn=`basename \$path`; cd `dirname \$path`; cvs checkout -r\$branch -Pd \$bn 
\$module)",
+   'update'=>  "cvs update -Pd",
+   'controldir'=>  "CVS"},
'src-cpy' =>  {
'init'  =>  "cp -Rf '%s' '%s'",
'update'=>  ""},
@@ -283,6 +288,7 @@

 my %install_method = (
'src-svn' =>  \&install_generic,
+   'src-cvs' =>  \&install_generic,
'src-cpy' =>  \&install_generic,
'src-link' =>  \&install_generic,
'src-git' =>  \&install_generic,


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel