From: "Eugene San (eugenesan)" <eugene...@gmail.com>
Signed-off-by: Eugene San (eugenesan) <eugene...@gmail.com>
---
docs/build.tex | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-
feeds.conf.default | 4 +++
scripts/feeds | 2 +-
3 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/docs/build.tex b/docs/build.tex
index 6e1539a..910ad0a 100644
--- a/docs/build.tex
+++ b/docs/build.tex
@@ -41,12 +41,71 @@ So let's take a look at OpenWrt and see how this all works.
\subsubsection{Download OpenWrt}
-OpenWrt can be downloaded via subversion using the following command:
+OpenWrt can be downloaded via subversion and git.
+
+For downloading using pure subversion (svn) use the following command:
\begin{Verbatim}
$ svn checkout svn://svn.openwrt.org/openwrt/trunk openwrt-trunk
\end{Verbatim}
+To install additional components (feeds) use the following command:
+
+\begin{Verbatim}
+$ make package/symlinks
+\end{Verbatim}
+
+In future to update main tree and feeds use the following commands:
+\begin{Verbatim}
+$ svn up
+$ ./scripts/feeds update
+\end{Verbatim}
+
+For downloading using pure git use the following command:
+
+\begin{Verbatim}
+$ git clone git://nbd.name/openwrt.git openwrt-trunk
+\end{Verbatim}
+
+In case you are planning to use git also for additional components (feeds and
luci),
+please create copy of feeds.conf.default as feeds.conf in which only lines
starting
+with src-git are uncommented.
+
+To install additional components (feeds) use the following command:
+
+\begin{Verbatim}
+$ make package/symlinks
+\end{Verbatim}
+
+In future to update main tree and feeds use the following commands:
+\begin{Verbatim}
+$ git fetch origin
+$ git rebase origin/master
+$ ./scripts/feeds update
+\end{Verbatim}
+
+For downloading using git (while upstream repository is tracked as SVN) use
the following command:
+
+\begin{Verbatim}
+$ git svn clone svn://svn.openwrt.org/openwrt/trunk openwrt-trunk
+\end{Verbatim}
+
+In case you are planning to use gitsvn also for additional components (feeds
and luci),
+please create copy of feeds.conf.default as feeds.conf in which only lines
starting
+with src-gitsvn are uncommented.
+To install additional components (feeds) use the following command:
+
+\begin{Verbatim}
+$ make package/symlinks
+\end{Verbatim}
+
+In future to update main tree and feeds use the following commands:
+\begin{Verbatim}
+$ git svn fetch
+$ git svn rebase
+$ ./scripts/feeds update
+\end{Verbatim}
+
Additionally, there is a trac interface on
\href{https://dev.openwrt.org/}{https://dev.openwrt.org/}
which can be used to monitor svn commits and browse the source repository.
diff --git a/feeds.conf.default b/feeds.conf.default
index c4ac535..3281049 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -7,3 +7,7 @@ src-svn luci
http://svn.luci.subsignal.org/luci/trunk/contrib/package
#src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
#src-svn lxde svn://svn.openwrt.org/openwrt/feeds/lxde
#src-link custom /usr/src/openwrt/custom-feed
+#src-git packages git://nbd.name/packages.git
+#src-git luci git://nbd.name/luci.git
+#src-gitsvn packages svn://svn.openwrt.org/openwrt/packages
+#src-gitsvn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
diff --git a/scripts/feeds b/scripts/feeds
index 6121a62..1b6633b 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -115,7 +115,7 @@ my %update_method = (
'src-git' => {
'init' => "git clone --depth 1 '%s' '%s'",
'init_branch' => "git clone --depth 1 --branch '%s' '%s'
'%s'",
- 'update' => "git pull",
+ 'update' => "git fetch; git rebase",
'controldir' => ".git"},
'src-gitsvn' => {
'init' => "git svn clone -r HEAD '%s' '%s'",
--
1.7.6
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
