circinus: updated options to use NOTvyos repositories by default, we can still use custom options to switch back to frozen vyos repositories

3 files changed, 11 insertions, 16 deletions

diff --git a/new/image_builder.py b/new/image_builder.py
index 405e114..ed1abdf 100755
--- a/new/image_builder.py
+++ b/new/image_builder.py
@@ -240,7 +240,7 @@ if __name__ == "__main__":
 
         parser = argparse.ArgumentParser()
         parser.add_argument("branch", help="VyOS branch (current, circinus)")
-        parser.add_argument("--vyos-build-git", default="https://github.com/vyos/vyos-build.git",
+        parser.add_argument("--vyos-build-git", default="https://github.com/NOTvyos/vyos-build.git",
                             help="Git URL of vyos-build")
         parser.add_argument("--vyos-mirror", default="local", help="VyOS package repository (URL or 'local')")
         parser.add_argument("--vyos-build-docker", default="vyos/vyos-build",
diff --git a/new/package_builder.py b/new/package_builder.py
index f3c4b5f..d1b91db 100755
--- a/new/package_builder.py
+++ b/new/package_builder.py
@@ -256,7 +256,7 @@ if __name__ == "__main__":
         parser = argparse.ArgumentParser()
         parser.add_argument("branch", help="VyOS branch (current, circinus)")
         parser.add_argument("--analyze-org", help="What GitHub organization to use for analysis", default="vyos")
-        parser.add_argument("--clone-org", help="What GitHub organization to use for sources", default="vyos")
+        parser.add_argument("--clone-org", help="What GitHub organization to use for sources", default="NOTvyos")
         parser.add_argument("--single-package", help="Build only this package")
         parser.add_argument("--force-build", action="store_true", help="Force build even if package is up to date")
         parser.add_argument("--rescan-packages", action="store_true",
diff --git a/new/readme.md b/new/readme.md
index 2b42d0e..8408566 100644
--- a/new/readme.md
+++ b/new/readme.md
@@ -1,13 +1,6 @@
 New build method (only for **circinus/1.5.x** or **current** branch)
 ==
 
-New build method was developed since the VyOS team dropped support for the Jenkins build method.
-The new method is much simplified (thanks to removal of Jenkins), has few steps and only basic dependencies.
-This should make it easier to run anywhere (compared to the old method). 
-The only external services it uses is the Docker. It doesn't modify anything in the system apart from using 
-the docker to manage its own container. Thus, the new method is big shift from the Jenkins method - they have
-practically nothing in common.
-
 This quick start guide is made for Debian or Ubuntu (tested on Debian Bookworm and Ubuntu 24.04) but it can
 be easily adopted to any other distro that also uses the APT package manager. There is no real dependency
 on the distro so if you install dependencies manually then you can run this on any other Linux system. 
@@ -79,28 +72,30 @@ Then you can build image (ISO) from those packages (this will take some time):
 
 Now you should have ISO image available in your current directory.
 
-NOTvyos
+Frozen vs updated circinus (VyOS vs NOTvyos repositories)
 --
 
 Given the public VyOS repositories don't receive updates anymore I did decide to create
 [NOTvyos](https://github.com/NOTvyos) collection of [VyOS](https://github.com/vyos) repositories and those
 [get updated](./tools/tarball-repo-sync.py) from [VyOS Stream](https://vyos.net/get/stream/) tarballs.
-Currently, the default options use the VyOS repositories, 
-thus we need to use extra options to use the updated NOTvyos repositories instead.
+The default options use the updated NOTvyos repositories, but we can also build from the frozen VyOS 
+repositories (or any other set of VyOS repositories) - to do this we need extra options for both
+package builder and image builder to say what GitHub organization to use.
 
-**If we want to switch between VyOS and NOTvyos then we need to start fresh, delete the vyos-jenkins repository
-and fetch fresh clone (or at least purge the `new/build` and `new/data` directories).**
+**If we want to switch between VyOS and NOTvyos repositories then we need to start fresh, 
+delete the vyos-jenkins repository and fetch fresh clone (or at least purge the `new/build` 
+and `new/data` directories).**
 
 Extra options for package build:
 
 ```bash
-~/vyos-jenkins/new/package_builder.py circinus --clone-org NOTvyos
+~/vyos-jenkins/new/package_builder.py circinus --clone-org vyos
 ```
 
 Extra options for image build:
 
 ```bash
-~/vyos-jenkins/new/image_builder.py circinus --vyos-build-git https://github.com/NOTvyos/vyos-build.git
+~/vyos-jenkins/new/image_builder.py circinus --vyos-build-git https://github.com/vyos/vyos-build.git
 ```
 
 Extra options