Merge branch '3.0-dev' into 3.0

Signed-off-by: Lee Chee Yang <[email protected]>

Author: cheeyanglee

.github/workflows/codeql.yml

@@ -0,0 +1,43 @@
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ 3.0, 3.0-dev ]
+  pull_request:
+    branches: [ 3.0, 3.0-dev ]
+  schedule:
+    - cron: '0 4 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: [ ubuntu-latest ]
+    permissions:
+      # required for all workflows
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: go
+          build-mode: autobuild
+        - language: python
+          build-mode: none
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.markdownlint.yml

@@ -0,0 +1,38 @@
+# Tweak the template from super-linter from here:
+# https://github.com/super-linter/super-linter/blob/main/TEMPLATES/.markdown-lint.yml
+
+###########################
+###########################
+## Markdown Linter rules ##
+###########################
+###########################
+
+# Linter rules doc:
+# - https://github.com/DavidAnson/markdownlint
+#
+# Note:
+# To comment out a single error:
+#   <!-- markdownlint-disable -->
+#   any violations you want
+#   <!-- markdownlint-restore -->
+#
+
+###############
+# Rules by id #
+###############
+MD004: false # Unordered list style
+MD007:
+  indent: 2 # Unordered list indentation
+MD013:
+  line_length: 400 # Line length 80 is far too short
+  tables: false
+MD026:
+  punctuation: ".,;:!。，；:" # List of not allowed
+MD029: false # Ordered list item prefix
+MD033: false # Allow inline HTML
+MD036: false # Emphasis used instead of a heading
+
+#################
+# Rules by tags #
+#################
+blank_lines: false # Error on blank lines

README.md

@@ -18,7 +18,7 @@ The currently published versions are:
 * Edge Microvisor Toolkit with real time extensions (immutable)
 * Edge Microvisor Toolkit Standalone (immutable) ([Download link](https://edgesoftwarecatalog.intel.com/details/?microserviceType=recipe&microserviceNameForUrl=edge-microvisor-toolkit-standalone-node))
 * Edge Microvisor Toolkit Developer (mutable) ([Download link](https://edgesoftwarecatalog.intel.com/details/?microserviceType=recipe&microserviceNameForUrl=edge--microvisor-toolkit-development-node))
-  
+
 The Edge Microvisor Toolkit has undergone extensive validation across all Intel
 platforms such as  Xeon®, Intel® Core Ultra™, Intel Core™ and Intel® Atom®. It
 provides robust support for integrated and Intel discrete GPU cards, as well as
@@ -34,13 +34,13 @@ Check out these articles to quickly learn how to work with Edge Microvisor Toolk
 
 * [System requirements](./docs/developer-guide/system-requirements.md)
   for the hardware and software requirements.
+* [Download](https://edgesoftwarecatalog.intel.com/details/?microserviceType=recipe&microserviceNameForUrl=edge--microvisor-toolkit-development-node) and [install the developer ISO image](./docs/developer-guide/get-started.md#edge-microvisor-toolkit-developer)
+  for a mutable container host providing only minimum functionality.
+* [Download](https://edgesoftwarecatalog.intel.com/details/?microserviceType=recipe&microserviceNameForUrl=edge-microvisor-toolkit-standalone-node) and [install the production RAW image]( ./docs/developer-guide/get-started.md#edge-microvisor-toolkit-standalone)
+  for an immutable container host with essential functionality.
 * [Install on bare metal edge node](./docs/developer-guide/get-started/installation-howto.md#baremetal-with-iso) or
   [Install on a Virtual Machine](./docs/developer-guide/get-started/installation-howto.md#virtual-machine-with-hyper-v)
   to learn how to install Edge Microvisor Toolkit.
-* [Install the developer ISO image](./docs/developer-guide/get-started.md#standalone-developer-edge-node)
-  for a mutable container host providing only minimum functionality.
-* [Install the production RAW image]( ./docs/developer-guide/get-started.md#standalone-edge-node)
-  for an immutable container host with essential functionality.
 * [Build or customize the Edge Microvisor](./docs/developer-guide/get-started/building-howto.md)
   for maximum control over the system you want to deploy.
 * [Edge Manageability Framework integration](./docs/developer-guide/deployment-edge-orchestrator.md)

SPECS/calamares/arrow.svg

@@ -15,17 +15,15 @@ strings:
 welcomeExpandingLogo:   false
 
 images:
-#    productLogo:         "emt-logo.png"
-#    productIcon:         "emt-logo.png"
+    productLogo:         "product.svg"
     productWelcome:      "emt-welcome.png"
 
 # The slideshow is displayed during execution steps (e.g. when the
 # installer is actually writing to disk and doing other slow things).
 slideshow:               "show.qml"
 
 style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"
-   sidebarTextHighlight: "#00A4EF"
-
+   SidebarBackground:    "#F7F7F8"
+   SidebarText:          "#2B2C30"
+   SidebarBackgroundCurrent: "#5400C0"
+   SidebarTextCurrent: "#FFFFFF"

SPECS/calamares/branding.desc

@@ -1,7 +1,7 @@
 {
  "Signatures": {
-  "emt-welcome.png": "b1b74705e6d677b5099126e061b264942d8457a3335af608ea2588486ab9df2b",
-  "branding.desc": "f25e4f3d0061283b4a9c023db44458cd48f26330023429e4f36e867d50149baa",
+  "emt-welcome.png": "2784750b96c9bdaf5e5ac5b8c10b42c5ae3d79c3b1f1fbb2e014ee9875f18913",
+  "branding.desc": "aaa4338b2122d1de4478f5b6a8344735bb32776f01921e484eb0fee5ca28951a",
   "calamares-3.3.1.tar.gz": "c5a6dd7d2fb7dc5d8a863f37f6f64782b88f79e341f7bf8504eb98dc31f714ef",
   "calamares-auto_de.ts": "4a24d817979a83c3f08c163b05f5a4f34a992c1f798a12f3a6b50cde75a852d8",
   "calamares-auto_fr.ts": "a65dd534637607533cd725aee3151f10f56b7f606b41fbd3ceeae13d61d8a98f",
@@ -12,6 +12,9 @@
   "calamares-welcome-3.0.2.tar.gz": "031ec9dfbf7f6c11c89fe06ac8d9c33c9a0ea0e62b6832bf17e1499d24826440",
   "settings.conf": "7bb9ae6634ce40013400163435fc62166a8d0fe0849c9dd0b729662971a06f51",
   "show.qml": "f1a75a7ee5f06dece6bbed103ef7e3a9886fb574f8a060e5a690bc28435d39fc",
-  "stylesheet.qss": "9707878d63c9591fd83096d1650ada773bf5e85797fd3fbfc19555ef39ffa30a"
+  "stylesheet.qss": "da47025a9b33a740ca907806d32ccc575e8eabbe418ce89dfe646146338be9c9",
+  "arrow.svg": "dae6c503f0cc74340019c9db4a99844a895b1fa6161f01c331aaace2f5f70c55",
+  "product.svg": "57641471917d622979ad40d96c42ca9181f527691fd9b79b2b61ef1c61bee5c7",
+  "wait.png": "f260894113702d5f0737de5efc97e6f046231a64599ff0e01ad15bbc01ee00cd"
  }
 }

SPECS/calamares/calamares.signatures.json

@@ -7,7 +7,7 @@ Summary:        Installer from a live CD/DVD/USB to disk
 # https://github.com/calamares/calamares/issues/1051
 Name:           calamares
 Version:        3.3.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPLv3+
 Vendor:         Intel Corporation
 Distribution:   Edge Microvisor Toolkit
@@ -41,6 +41,9 @@ Source42:       calamares-auto_de.ts
 Source43:       calamares-auto_it.ts
 Source52:       emt-welcome.png
 #Source53:       emt-eula
+Source54:        arrow.svg
+Source55:        product.svg
+Source56:        wait.png
 # adjust some default settings (default shipped .conf files)
 Patch0:         Azure-Linux-Calamares-Conf-Patch-3.3.1.patch
 #Patch3:         round-to-full-disk-size.patch
@@ -54,6 +57,7 @@ Patch4:         serialize-read-access.patch
 Patch6:          modules-set-OS-to-EdgeMicrovisorToolkit.patch
 Patch7:          reword-welcome-screen.patch
 Patch8:          change-completion-from-second-to-minute.patch
+Patch9:          ui_redesign.patch
 # Compilation tools
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
@@ -142,6 +146,7 @@ done
 
 # Apply custom license config
 #mv %{SOURCE20} src/modules/license/license.conf
+mv %{SOURCE56} data/images/wait.png
 
 %patch -P 0 -p1
 #%patch3 -p1
@@ -150,6 +155,7 @@ done
 %patch -P 6 -p1
 %patch -P 7 -p1
 %patch -P 8 -p1
+%patch -P 9 -p1
 
 %build
 %cmake_kf \
@@ -174,6 +180,8 @@ install -p -m 644 %{SOURCE22} %{buildroot}%{_datadir}/calamares/branding/EdgeMic
 install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/branding.desc
 install -p -m 644 %{SOURCE25} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/stylesheet.qss
 install -p -m 644 %{SOURCE52} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/emt-welcome.png
+install -p -m 644 %{SOURCE54} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/arrow.svg
+install -p -m 644 %{SOURCE55} %{buildroot}%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/product.svg
 
 mkdir -p %{buildroot}%{_sysconfdir}/calamares
 
@@ -194,6 +202,8 @@ install -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/calamares/settings.conf
 %{_bindir}/calamares
 %{_datadir}/applications/calamares.desktop
 %{_datadir}/calamares/branding/EdgeMicrovisorToolkit/emt-welcome.png
+%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/arrow.svg
+%{_datadir}/calamares/branding/EdgeMicrovisorToolkit/product.svg
 %{_datadir}/calamares/branding/EdgeMicrovisorToolkit/branding.desc
 %{_datadir}/calamares/branding/EdgeMicrovisorToolkit/lang/
 %{_datadir}/calamares/branding/EdgeMicrovisorToolkit/show.qml
@@ -223,19 +233,22 @@ install -p -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/calamares/settings.conf
 %{_libdir}/libcalamaresui.so
 
 %changelog
+* Wed April 25 2025 Samuel Taripin <[email protected]> - 3.3.1-11
+- UI redesign.
+
 * Wed Mar 26 2025 Samuel Taripin <[email protected]> - 3.3.1-10
 - change completion time format from seconds to minutes.
 
-* Thu Mar 13 2024 Lee Chee Yang <[email protected]> - 3.3.1-9
+* Thu Mar 13 2025 Lee Chee Yang <[email protected]> - 3.3.1-9
 - remove logo, update welcome picture and text.
 
-* Wed Mar 12 2024 Lee Chee Yang <[email protected]> - 3.3.1-8
+* Wed Mar 12 2025 Lee Chee Yang <[email protected]> - 3.3.1-8
 - update welcome image
 
-* Tue Mar 4 2024 Lee Chee Yang <[email protected]> - 3.3.1-7
+* Tue Mar 4 2025 Lee Chee Yang <[email protected]> - 3.3.1-7
 - remove EULA and custom license for ISO installer.
 
-* Thu Feb 13 2024 Lee Chee Yang <[email protected]> - 3.3.1-6
+* Thu Feb 13 2025 Lee Chee Yang <[email protected]> - 3.3.1-6
 - Update installer to match Edge Microvisor Toolkit.
 
 * Wed Mar 20 2024 Sam Meluch <[email protected]> - 3.3.1-5