On 3/1/11 7:44 PM, Daniel A. Nagy wrote:
I had this issue as well. Here is a patch that I think does the right thing. I am no svn expert though ... and I added src-cvs as a source protocol as well. This patch works with a feeds.conf that looks like:Hello, On 03/02/2011 04:36 AM, devendra.aaru wrote:hello,you can do this by touch package/your-package-name/Makefile and compile openwrt which ensures that your-package-name compiles. or you can delete whole build_dir and compile again which also the same. regards, dev.I guess, we are having a bit of a misunderstanding here. My problem is that the packages feed configured as src-svn packages svn://svn.openwrt.org/openwrt/packages is continually evolving and I am not sure how to compile some released version of OpenWrt (say, 10.03 backfire) in such a way that the packages from this feed are the same versions as those in the official binary distribution. The source tree is tagged. LuCI is tagged. But "packages" apparently isn't. Regards,_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel src-cvs cortina design/sw/common/openwrt/package;GOLDEN src-svn packages svn://svn.openwrt.org/openwrt/packages;25461 src-svn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package;6853 diff -Naur old/scripts/feeds new/scripts/feeds
--- old/scripts/feeds 2011-02-04 15:59:09.000000000 -0800
+++ new/scripts/feeds 2011-02-23 13:02:49.000000000 -0800
@@ -104,8 +104,15 @@
my %update_method = (
'src-svn' => {
'init' => "svn checkout '%s' '%s'",
+ 'init_branch' => "svn checkout -r '%s' '%s' '%s'",
'update' => "svn update",
+ 'update_branch' => "svn update -r '%s'",
'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' => ""},
@@ -154,7 +161,11 @@
system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
}
} else {
- system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
+ if ($m->{'update_branch'} and $branch ) {
+ system("cd '$safepath'; " . sprintf($m->{'update_branch'}, $branch)) == 0 or return 1;
+ } else {
+ system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
+ }
}
return 0;
@@ -283,6 +294,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 [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
