diff --git a/about.html b/about.html new file mode 100644 index 0000000..e2cf2c5 --- /dev/null +++ b/about.html @@ -0,0 +1,18 @@ + + + + + Placeholder + + + + +

Placeholder

+ + + + + diff --git a/about.md b/about.md new file mode 100644 index 0000000..867e2c8 --- /dev/null +++ b/about.md @@ -0,0 +1 @@ +# Placeholder \ No newline at end of file diff --git a/assets/building-blendos/1.png b/assets/building-blendos/1.png new file mode 100644 index 0000000..2e82fd5 Binary files /dev/null and b/assets/building-blendos/1.png differ diff --git a/blog/blendos.html b/blog/blendos.html index e9e883c..a0ac692 100644 --- a/blog/blendos.html +++ b/blog/blendos.html @@ -188,7 +188,7 @@ diff --git a/blog/building-blendos.html b/blog/building-blendos.html index a5e8b0c..20ace7a 100644 --- a/blog/building-blendos.html +++ b/blog/building-blendos.html @@ -23,7 +23,7 @@ updated the packaging, and pushed the packaging to that branch.

Looking at the package + href="https://git.blendos.co/blendOS/image-builder/-/blob/main/packages.x86_64">package list from image-builder (blendOS / image-builder · GitLab), it seems the only blendOS-specific packages it uses are:

@@ -55,47 +55,58 @@ and rebuilt it. After a bit of troublshooting (nothing interesting, just incompetency, wrong perms, stuff like that), I got it working perfectly.

+

From the buid log:

+ 
[mkarchiso] INFO: Done!
+2.3G    /drone/src/image-builder/out/blendOS-2024.10.04-x86_64.iso
+0
+

Screenshot from Drone CI/CD showing the build successfully completed in 6 minutes 48 seconds
+ Build Status

Topology of my blendOS repo

- 
        |-----------------|
-        |                 |
-        | package builder |
-        |                 |
-        |-----------------|
-                 |
-                 |
-                 ↓
-      |-----------------------------|
-      |          ↓                  |
-      |    |----------|             |
-      |    | packages |             |
-      |    |----------|             |
-      |                             |
-      | Arch/blendOS                |
-      | repository                  |
-      |                             |
-      |           |-----------|     |
-      |           | blendOS   |     |
-      |           | iso files |←---←|←---←
-      |           |-----------|     |    |
-      |                             |    |
-      |-----------------------------|    |
-             |                           |
-             |                           |
-             |                           |
-             ↓                           |
-    |-------------------------|          |
-    |                         |          |
-    | Arch/blendOS            |          |
-    | clients                 |          |
-    |                         |          |
-    |   |--------------|      |          |
-    |   | blendOS iso  |-----→|→---------↑
-    |   |   builder    |      |
-    |   |--------------|      |
-    |                         |
-    |-------------------------|
+ 
        |-----------------|
+        |                 |
+        | package builder |
+        |                 |
+        |-----------------|
+                 |
+                 |
+                 ↓
+      |-----------------------------|
+      |          ↓                  |
+      |    |----------|             |
+      |    | packages |             |
+      |    |----------|             |
+      |                             |
+      | Arch/blendOS                |
+      | repository                  |
+      |                             |
+      |           |-----------|     |
+      |           | blendOS   |     |
+      |           | iso files |←---←|←---←
+      |           |-----------|     |    |
+      |                             |    |
+      |-----------------------------|    |
+             |                           |
+             |                           |
+             |                           |
+             ↓                           |
+    |-------------------------|          |
+    |                         |          |
+    | Arch/blendOS            |          |
+    | clients                 |          |
+    |                         |          |
+    |   |--------------|      |          |
+    |   | blendOS iso  |-----→|→---------↑
+    |   |   builder    |      |
+    |   |--------------|      |
+    |                         |
+    |-------------------------|

Citations

 Saraswat, Rudra, et al. “blendOS · GitLab.” GitLab,

diff --git a/blog/building-blendos.md b/blog/building-blendos.md index 9e02e89..fa1599b 100644 --- a/blog/building-blendos.md +++ b/blog/building-blendos.md @@ -4,7 +4,7 @@ This one was pretty simple. First off, I just made [an organization to hold all After that, it was just a matter of adding the actual packaging for the code. For the packages that were required for building the blendOS `iso` file, if I didn't have my own repository for them already, I just made a new branch, updated the packaging, and pushed the packaging to that branch. -Looking at the [package list](https://git.blendos.co/blendOS/image-builder/-/blob/main/packages.x86_64?ref_type=heads) from `image-builder` (*blendOS / image-builder · GitLab*), it seems the only blendOS-specific packages it uses are: +Looking at the [package list](https://git.blendos.co/blendOS/image-builder/-/blob/main/packages.x86_64) from `image-builder` (*blendOS / image-builder · GitLab*), it seems the only blendOS-specific packages it uses are: ```txt filesystem-blend @@ -26,6 +26,17 @@ Turns out I had added my repo to the container's `pacman` configuration, but not I just added the missing packages needed to build the `iso` file, plus all the others on blendOS's GitLab, and rebuilt it. After a bit of troublshooting (nothing interesting, just incompetency, wrong perms, stuff like that), I got it working perfectly. +From the buid log: + +```txt +[mkarchiso] INFO: Done! +2.3G /drone/src/image-builder/out/blendOS-2024.10.04-x86_64.iso +0 +``` + +![Screenshot from Drone CI/CD showing the build successfully completed in 6 minutes 48 seconds](/assets/building-blendos/1.png)\ +[![Build Status](https://drone.askiiart.net/api/badges/askiiart-blendos/build-blendos-iso/status.svg)](https://drone.askiiart.net/askiiart-blendos/build-blendos-iso) + ## Topology of my blendOS repo ```txt diff --git a/blog/vanilla-os.html b/blog/vanilla-os.html index 424a65f..4a7708e 100644 --- a/blog/vanilla-os.html +++ b/blog/vanilla-os.html @@ -114,7 +114,7 @@ diff --git a/feed.xml b/feed.xml index a3df57b..f906c91 100644 --- a/feed.xml +++ b/feed.xml @@ -5,22 +5,26 @@ eng.askiiart.net This is the feed for engl.askiiart.net, I guess https://askiiart.net - Thu, 03 Oct 2024 15:46:35 +0000 + Fri, 04 Oct 2024 00:34:32 +0000 - Glossary - https://engl.askiiart.net/glossary.html - - - OCI Images as a "Filesystem": Vanilla OS - https://engl.askiiart.net/blog/vanilla-os.html + Checking out blendOS + https://engl.askiiart.net/blog/blendos.html Building blendOS (and its packages) https://engl.askiiart.net/blog/building-blendos.html - Checking out blendOS - https://engl.askiiart.net/blog/blendos.html + OCI Images as a "Filesystem": Vanilla OS + https://engl.askiiart.net/blog/vanilla-os.html + + + Glossary + https://engl.askiiart.net/glossary.html + + + Placeholder + https://engl.askiiart.net/about.html diff --git a/glossary.html b/glossary.html index e9264d8..bf0f78d 100644 --- a/glossary.html +++ b/glossary.html @@ -96,7 +96,7 @@ diff --git a/index.html b/index.html index b8b0eab..c1aad0e 100644 --- a/index.html +++ b/index.html @@ -8,19 +8,21 @@

Computers and stuff

-

This is a site! Doing... stuff with computers. Interesting +

This is a site! Doing... stuff, with computers. Interesting and sometimes funny stuff, at least to me.

Pages

diff --git a/index.md b/index.md index 74865f1..7328b7e 100644 --- a/index.md +++ b/index.md @@ -1,8 +1,9 @@ # Computers and stuff -This is a site! Doing... stuff with computers. Interesting and sometimes funny stuff, at least to me. +This is a site! Doing... stuff, with computers. Interesting and sometimes funny stuff, at least to me. ## Pages - [Checking out blendOS](/blog/blendos.html) - [OCI Images as a "Filesystem": Vanilla OS](/blog/vanilla-os.html) +- [Building blendOS (and its packages)](/blog/building-blendos.html) diff --git a/run.sh b/run.sh index ef8615f..d1e0574 100755 --- a/run.sh +++ b/run.sh @@ -5,4 +5,4 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) cd $SCRIPT_DIR ./md2html.sh ./generate-rss.sh -./generate-sitemap.sh \ No newline at end of file +./generate-sitemap.sh diff --git a/sitemap.xml b/sitemap.xml index 2ba30f7..f782624 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,7 +1,8 @@ -https://engl.askiiart.net/index.html -https://engl.askiiart.net/glossary.html +https://engl.askiiart.net/blog/blendos.html https://engl.askiiart.net/blog/building-blendos.html https://engl.askiiart.net/blog/vanilla-os.html -https://engl.askiiart.net/blog/blendos.html +https://engl.askiiart.net/glossary.html +https://engl.askiiart.net/index.html +https://engl.askiiart.net/about.html diff --git a/template.html b/template.html index 3887436..cb37ee1 100644 --- a/template.html +++ b/template.html @@ -12,7 +12,7 @@