Merge branch 'main' into release-8.0.1

elementary · Oct 21, 2024 · fcdd3df · fcdd3df
2 parents 0b752df + 20fed8a
commit fcdd3df
Show file tree

Hide file tree

Showing 231 changed files with 2,794 additions and 2,292 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,13 +23,14 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y desktop-file-utils gettext libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxml2-dev libjson-glib-dev libpwquality-dev libxml2-utils meson valac
+        apt install -y desktop-file-utils gettext libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxkbregistry-dev libjson-glib-dev libpwquality-dev meson valac
     - name: Build and Test
       env:
         DESTDIR: out
       run: |
         meson setup build
         ninja -C build install
+        ninja -C build test
 
   lint:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -22,8 +22,7 @@ You'll need the following dependencies:
  - libadwaita-1-dev >=1.4.0
  - libjson-glib-dev
  - libpwquality-dev
- - libxml2-dev
- - libxml2-utils
+ - libxkbregistry-dev
  - [distinst](https://github.com/pop-os/distinst/)
  - valac
 

diff --git a/common/DBusStructures.vala b/common/DBusStructures.vala
@@ -79,14 +79,58 @@ public enum InstallerDaemon.FileSystem {
     }
 }
 
+public struct InstallerDaemon.PartitionUsage {
+    /**
+     * None = 0; Some(usage) = 1;
+     */
+    public uint8 tag;
+    /**
+     * The size, in sectors, that a partition is used.
+     */
+    public uint64 value;
+}
+
+public enum InstallerDaemon.PartitionTable {
+    NONE,
+    GPT,
+    MSDOS;
+}
+
+public enum InstallerDaemon.Step {
+    BACKUP,
+    INIT,
+    PARTITION,
+    EXTRACT,
+    CONFIGURE,
+    BOOTLOADER;
+}
+
+public struct InstallerDaemon.Status {
+    Step step;
+    int percent;
+}
+
+public enum InstallerDaemon.LogLevel {
+    TRACE,
+    DEBUG,
+    INFO,
+    WARN,
+    ERROR;
+}
+
+public struct InstallerDaemon.Error {
+    Step step;
+    int err;
+}
+
 public struct InstallerDaemon.Partition {
     string device_path;
 
     FileSystem filesystem;
 
     uint64 start_sector;
     uint64 end_sector;
-    Distinst.PartitionUsage sectors_used;
+    PartitionUsage sectors_used;
     string? current_lvm_volume_group;
 }
 
@@ -95,7 +139,8 @@ public struct InstallerDaemon.InstallConfig {
     string keyboard_layout;
     string keyboard_variant;
     string lang;
-    uint8 flags;
+    bool modify_boot_order;
+    bool install_drivers;
 }
 
 [Flags]