added note about circinus stream

4 files changed, 38 insertions, 2 deletions

diff --git a/new/image_builder.py b/new/image_builder.py
index e07306e..405e114 100755
--- a/new/image_builder.py
+++ b/new/image_builder.py
@@ -16,7 +16,8 @@ import netifaces
 from lib.debranding import Debranding
 from lib.docker import Docker
 from lib.git import Git
-from lib.helpers import setup_logging, refuse_root, get_my_log_file, apt_dir, build_dir, TerminalTitle
+from lib.helpers import setup_logging, refuse_root, get_my_log_file, apt_dir, build_dir, TerminalTitle, \
+    ensure_directories
 from lib.scripting import Scripting
 
 
@@ -48,6 +49,8 @@ class ImageBuilder:
         self.scripting = Scripting()
         self.terminal_title = TerminalTitle("Image builder: ")
 
+        ensure_directories()
+
     def build(self):
         self.terminal_title.set("Preparation...")
         begin = monotonic()
diff --git a/new/lib/helpers.py b/new/lib/helpers.py
index d2b68d3..7a5e4e0 100644
--- a/new/lib/helpers.py
+++ b/new/lib/helpers.py
@@ -16,6 +16,13 @@ resources_dir: str = os.path.join(project_dir, "resources")
 scripts_dir: str = os.path.join(project_dir, "scripts")
 
 
+def ensure_directories():
+    if not os.path.exists(build_dir):
+        os.makedirs(build_dir)
+    if not os.path.exists(data_dir):
+        os.makedirs(data_dir)
+
+
 def quote_all(*args):
     quoted = []
     for arg in args:
diff --git a/new/package_builder.py b/new/package_builder.py
index 067f0d3..f3c4b5f 100755
--- a/new/package_builder.py
+++ b/new/package_builder.py
@@ -13,7 +13,7 @@ from lib.docker import Docker
 from lib.git import Git
 from lib.github import GitHub
 from lib.helpers import setup_logging, ProcessException, refuse_root, get_my_log_file, data_dir, build_dir, scripts_dir, \
-    quote_all, TerminalTitle
+    quote_all, TerminalTitle, ensure_directories
 from lib.objectstorage import ObjectStorage
 from lib.scripting import Scripting
 
@@ -53,6 +53,8 @@ class PackageBuilder:
         self.scripting = Scripting()
         self.terminal_title = TerminalTitle("Package builder: ")
 
+        ensure_directories()
+
     def build(self):
         self.terminal_title.set("Preparation...")
         begin = monotonic()
diff --git a/new/readme.md b/new/readme.md
index 789ee45..2b42d0e 100644
--- a/new/readme.md
+++ b/new/readme.md
@@ -79,6 +79,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
+--
+
+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.
+
+**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).**
+
+Extra options for package build:
+
+```bash
+~/vyos-jenkins/new/package_builder.py circinus --clone-org NOTvyos
+```
+
+Extra options for image build:
+
+```bash
+~/vyos-jenkins/new/image_builder.py circinus --vyos-build-git https://github.com/NOTvyos/vyos-build.git
+```
+
 Extra options
 --