From f9e9dc08a57867eb66cac93de102702ff52b2057 Mon Sep 17 00:00:00 2001
From: Rudra Saraswat <rs2009@ruds.io>
Date: Thu, 2 Apr 2026 15:33:39 +0100
Subject: [PATCH] feat: provide minimal ubuntu system

---
 core-arch.yaml | 10 ++++----
 ubuntu.yaml    | 62 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/core-arch.yaml b/core-arch.yaml
index 80c2d05..b8ba2b6 100644
--- a/core-arch.yaml
+++ b/core-arch.yaml
@@ -38,7 +38,7 @@ stages:
   - module: exec
     inputs:
       - |
-        git clone --revision 8e7e5cb576d751539e5e61a2801e098db2873ffd --depth 1 https://git.ruds.io/rs2009/akshara /akshara
+        git clone --revision 6e2670db89101219fc2f6bfc8be74c556147cdd1 --depth 1 https://git.ruds.io/rs2009/akshara /akshara
         cd /akshara
         cp -a usr/lib/akshara /usr/lib/akshara
         cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
@@ -49,11 +49,11 @@ post-stages:
   - module: exec
     inputs:
       - locale-gen
-      - rm -f /boot/* &>/dev/null
-        pushd /usr/lib/modules
+      - |
+        rm -f /boot/* &>/dev/null
+        cd /usr/lib/modules
         kernels=(*)
-        popd
-        cp /usr/lib/modules/"${kernels[0]}"/vmlinuz /boot/vmlinuz-"${kernels[0]}"
+        cp "${kernels[0]}"/vmlinuz /boot/vmlinuz-"${kernels[0]}"
       - dracut --force --regenerate-all
 
 override:
diff --git a/ubuntu.yaml b/ubuntu.yaml
index 4c53475..7d514e3 100644
--- a/ubuntu.yaml
+++ b/ubuntu.yaml
@@ -1,10 +1,68 @@
 track: "https://git.ruds.io/rs2009/blendOS-tracks/raw/branch/main/oci.yaml"
 
+modules:
+  - name: apt-install
+    run: |
+      apt-get update
+      DEBIAN_FRONTEND=noninteractive apt-get install -yq "$@"
+
+  - name: apt-remove
+    run: |
+      DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -yq "$@"
+
 stages:
   - module: exec
     inputs:
-      - apt-get update
-      - apt-get install -yq hello
+      - |
+        mkdir -p /etc/apt/apt.conf.d /var/cache/blendOS/ubuntu/apt
+        cat >/etc/apt/apt.conf.d/10blendOS.conf <<'EOF'
+        Dir::Cache::Archives /var/cache/blendOS/ubuntu/apt;
+        EOF
+
+  - module: apt-install
+    inputs:
+      - python3
+      - python3-click
+      - python3-requests
+      - python3-fasteners
+      - umoci
+      - skopeo
+      - jq
+      - git
+      - pacman
+      - linux-generic
+      - systemd
+      - systemd-container
+      - locales
+      - grub2-common
+      - ubuntu-standard
+      - dracut
+
+  - module: exec
+    inputs:
+      - |
+        git clone --revision 3c07cd05b998f0a5029ca4afa6e01ff21426b0a1 --depth 1 https://git.ruds.io/rs2009/akshara /akshara
+        cd /akshara
+        cp -a usr/lib/akshara /usr/lib/akshara
+        cp -a usr/lib/dracut/modules.d/10akshara /usr/lib/dracut/modules.d/10akshara
+        cp usr/bin/akshara /usr/bin/akshara
+      - rm -rf /akshara
+
+override:
+  - path: /var/lib/dpkg/
+    keep: new
+
+  - path: /var/lib/apt/
+    keep: new
+
+  - path: /etc/apt/sources.list
+    keep: new
+
+  - path: /etc/apt/sources.list.d/
+    keep: new
+
+  - path: /var/cache/blendOS/
+    keep: old
 
 env:
   IMAGE_NAME: docker://docker.io/library/ubuntu:rolling