From 1ef8b0b133419b3aeffc8505c22de5f99e0d94d3 Mon Sep 17 00:00:00 2001
From: Pawel Dembicki <p.dembicki@wb.com.pl>
Date: Thu, 6 Aug 2020 14:32:38 +0200
Subject: [PATCH] doc: Update instructions for building for OpenWrt

Frr was added to official OpenWrt repo. No need to use
unofficial sources from Github PR.

Signed-off-by: Pawel Dembicki <p.dembicki@wb.com.pl>
---
 doc/developer/building-frr-for-openwrt.rst | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/doc/developer/building-frr-for-openwrt.rst b/doc/developer/building-frr-for-openwrt.rst
index 5d8f82f27e..9bd1296dad 100644
--- a/doc/developer/building-frr-for-openwrt.rst
+++ b/doc/developer/building-frr-for-openwrt.rst
@@ -1,6 +1,8 @@
-OpenWRT
+OpenWrt
 =======
 
+General info about OpenWrt buildsystem: `link <https://openwrt.org/docs/guide-developer/build-system/start>`_.
+
 Prepare build environment
 -------------------------
 
@@ -13,16 +15,16 @@ For Debian based distributions, run:
 
 For other environments, instructions can be found in the
 `official documentation
-<https://wiki.openwrt.org/doc/howto/buildroot.exigence#examples_of_package_installations>`_.
+<https://openwrt.org/docs/guide-developer/build-system/install-buildsystem#examples_of_package_installations>`_.
 
 
-Get OpenWRT Sources (from Git)
+Get OpenWrt Sources (from Git)
 ------------------------------
 
 .. note::
-   The OpenWRT build will fail if you run it as root. So take care to run it as a nonprivileged user.
+   The OpenWrt build will fail if you run it as root. So take care to run it as a nonprivileged user.
 
-Clone the OpenWRT sources and retrieve the package feeds
+Clone the OpenWrt sources and retrieve the package feeds
 
 ::
 
@@ -30,21 +32,15 @@ Clone the OpenWRT sources and retrieve the package feeds
     cd openwrt
     ./scripts/feeds update -a
     ./scripts/feeds install -a
-    cd feeds/routing
-    git fetch origin pull/319/head
-    git read-tree --prefix=frr/ -u FETCH_HEAD:frr
-    cd ../../package/feeds/routing/
-    ln -sv ../../../feeds/routing/frr .
-    cd ../../..
-
-Configure OpenWRT for your target and select the needed FRR packages in Network -> Routing and Redirection -> frr,
+
+Configure OpenWrt for your target and select the needed FRR packages in Network -> Routing and Redirection -> frr,
 exit and save
 
 ::
 
     make menuconfig
 
-Then, to compile either a complete OpenWRT image, or the FRR packages, run:
+Then, to compile either a complete OpenWrt image, or the FRR packages, run:
 
 ::
 
@@ -54,10 +50,16 @@ It may be possible that on first build ``make package/frr/compile`` not
 to work and it may be needed to run a ``make`` for the entire build
 environment. Add ``V=s`` to get more debugging output.
 
+More information about OpenWrt buildsystem can be found `here
+<https://openwrt.org/docs/guide-developer/build-system/use-buildsystem>`_.
+
 Work with sources
 -----------------
 
-To update to a newer version, or change other options, you need to edit the ``feeds/routing/frr/Makefile``.
+To update to a newer version, or change other options, you need to edit the ``feeds/packages/frr/Makefile``.
+
+More information about working with patches in OpenWrt buildsystem can be found `here
+<https://openwrt.org/docs/guide-developer/build-system/use-patches-with-buildsystem>`_.
 
 Usage
 -----
-- 
2.39.5