Skip to content

Commit fca927b

Browse files
cheeyangleecheeyanglee
committed
Merge branch '3.0-dev' into 3.0
Merge branch '3.0-dev' commit cf9fc0e Signed-off-by: Lee Chee Yang <[email protected]>
2 parents 175a96e + cf9fc0e commit fca927b

File tree

17 files changed

+228
-237
lines changed

17 files changed

+228
-237
lines changed

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2272,7 +2272,7 @@
22722272
"intel-xpu-smi",
22732273
"node-agent",
22742274
"nvidia-data-center-driver",
2275-
"os-ab-update",
2275+
"os-update",
22762276
"otelcol-contrib",
22772277
"persistent-mount",
22782278
"platform-observability-agent",

‎README.md‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,7 @@ Toolkit are available as Open-Source.
3232

3333
## Get Started
3434

35-
Check out these articles to quickly learn how to work with Edge Microvisor Toolkit.
36-
37-
**Edge Microvisor Toolkit Developer Node**
38-
39-
* [Downloading and installing the developer toolkit ISO image](./docs/developer-guide/emt-get-started.md#edge-microvisor-toolkit-developer)
40-
* [Building a custom Edge Microvisor Toolkit image](./docs/developer-guide/get-started/emt-building-howto.md)
41-
42-
**Edge Microvisor Toolkit Standalone Node**
43-
44-
* [Get the tools required to build USB creator and install Edge Microvisor Toolkit Standalone Node](https://github.com/open-edge-platform/edge-microvisor-toolkit-standalone-node)
45-
46-
**Common**
47-
48-
* [Hardware and software system requirements](./docs/developer-guide/emt-system-requirements.md)
49-
* [Installing EMT on bare metal edge node](./docs/developer-guide/get-started/emt-installation-howto.md#bare-metal-with-iso)
50-
* [Installing EMT on a Virtual Machine](./docs/developer-guide/get-started/emt-installation-howto.md#virtual-machine-with-hyper-v)
51-
* [Integrating the Edge Manageability Framework](./docs/developer-guide/emt-deployment-edge-orchestrator.md)
52-
* [Using the security features of the Edge Microvisor](./docs/developer-guide/emt-security.md)
53-
* [Troubleshooting common issues](./docs/developer-guide/emt-troubleshooting.md)
35+
All articles required to quickly learn how to work with Edge Microvisor Toolkit can be found [here](./docs/developer-guide/emt-get-started.md).
5436

5537
**Demos**
5638
* [Standalone Edge Microvisor Toolkit (EMT-S) integration with Edge Microvisor Bootkit](https://www.youtube.com/watch?v=rmgmWYi6OpE):

‎SPECS/os-ab-update/os-ab-update.signatures.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎SPECS/os-update/os-update.signatures.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"Signatures": {
3+
"os-update-2.8.tar.gz": "33b9435ed5cfcb0335e23a34593f2faba2cf1b1a7476ca08b11ba66e76f17068",
4+
"os-update.te": "1a3e63f4d5e1dc8497b77bd60d417370f2fb92b6847da7f34b275e957eaf8dc5"
5+
}
6+
}

SPECS/os-ab-update/os-ab-update.spec renamed to SPECS/os-update/os-update.spec

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
Summary: OS AB Update Tool for OS A and B swapping for image based update
2-
Name: os-ab-update
3-
Version: 2.6
1+
Summary: OS Update Tool for OS A and B swapping for image based update
2+
Name: os-update
3+
Version: 2.8
44
Release: 1%{?dist}
55
License: MIT
66
Vendor: Intel Corporation
77
Distribution: Edge Microvisor Toolkit
88
Group: System Environment/Base
9-
URL: https://github.com/open-edge-platform/edge-microvisor-toolkit
9+
URL: https://github.com/open-edge-platform/edge-microvisor-update-tool
1010
Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
11-
Source1: ab-update.te
12-
%global modulename ab-update
11+
Source1: os-update.te
12+
%global modulename os-update
1313
%global selinuxtype targeted
1414
%global debug_package %{nil}
1515
BuildRequires: selinux-policy-devel
1616
Requires: (%{name}-selinux if selinux-policy-targeted)
17+
Obsoletes: os-ab-update
1718

1819
%description
1920
Purpose of this module is to enable OS A and B swapping for Day 2 Operation. Details on the
2021
architecture can be found in the ADR.
2122

2223
%package selinux
23-
Summary: SELinux security policy for os-ab-update
24-
Requires(post): os-ab-update = %{version}-%{release}
24+
Summary: SELinux security policy for os-update
25+
Requires(post): os-update = %{version}-%{release}
2526
BuildArch: noarch
2627
%{?selinux_requires}
2728

2829
%description selinux
29-
SELinux security policy for os-ab-update.
30+
SELinux security policy for os-update.
3031

3132
%prep
3233
%setup -q
@@ -46,7 +47,7 @@ install -m 644 %{modulename}.pp %{buildroot}%{_datadir}/selinux/packages/%{modul
4647

4748
%files
4849
%{_bindir}/os-update-tool.sh
49-
%{_bindir}/ab-update-modules/*
50+
%{_bindir}/os-update-modules/*
5051

5152
%files selinux
5253
%{_datadir}/selinux/packages/%{modulename}.pp
@@ -58,6 +59,14 @@ install -m 644 %{modulename}.pp %{buildroot}%{_datadir}/selinux/packages/%{modul
5859
%selinux_modules_uninstall -s %{selinuxtype} %{modulename}
5960

6061
%changelog
62+
* Tue Jul 15 2025 Samuel Taripin <[email protected]> - 2.8-1
63+
- Bump version to 2.8
64+
- Remove bootctl remove logic
65+
66+
* Mon Jul 07 2025 Suh Haw Teoh <[email protected]> - 2.7-1
67+
- Bump version to 2.7
68+
- Improved wording
69+
6170
* Thu Apr 10 2025 Suh Haw Teoh <[email protected]> - 2.6-1
6271
- Bump version to 2.6
6372
- Add filesystem check before change UUID
@@ -80,9 +89,9 @@ install -m 644 %{modulename}.pp %{buildroot}%{_datadir}/selinux/packages/%{modul
8089

8190
* Mon Jan 20 2025 Suh Haw Teoh <[email protected]> - 2.2-1
8291
- Bump version to 2.2
83-
- Fix AB update -c flag
92+
- Fix OS update -c flag
8493
- improve pattern matching for lsblk related operation
85-
- Fix AB update not able to run in service.
94+
- Fix OS update not able to run in service.
8695
- Add log in for B partition.
8796

8897
* Mon Jan 20 2025 Jia Yong Tan <[email protected]> - 2.0-3
@@ -154,7 +163,7 @@ install -m 644 %{modulename}.pp %{buildroot}%{_datadir}/selinux/packages/%{modul
154163
- Bump version to 1.1
155164
- Update to use tarball for source
156165
- Update URL
157-
- Remove ab-update conf file
166+
- Remove os-update conf file
158167

159168
* Fri Oct 16 2024 Samuel Taripin <[email protected]> - 1.0-5
160169
- Working Release Version for Latest Edge Microvisor Toolkit .

SPECS/os-ab-update/ab-update.te renamed to SPECS/os-update/os-update.te

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module ab-update 1.0;
1+
module os-update 1.0;
22

33
require {
44
type var_lock_t;

‎cgmanifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15922,19 +15922,19 @@
1592215922
"component": {
1592315923
"type": "other",
1592415924
"other": {
15925-
"name": "os-ab-update",
15926-
"version": "2.6",
15927-
"downloadUrl": "https://github.com/open-edge-platform/edge-microvisor-toolkit/archive/refs/tags/2.6.tar.gz"
15925+
"name": "os-prober",
15926+
"version": "1.77",
15927+
"downloadUrl": "http://ftp.us.debian.org/debian/pool/main/o/os-prober/os-prober_1.77.tar.xz"
1592815928
}
1592915929
}
1593015930
},
1593115931
{
1593215932
"component": {
1593315933
"type": "other",
1593415934
"other": {
15935-
"name": "os-prober",
15936-
"version": "1.77",
15937-
"downloadUrl": "http://ftp.us.debian.org/debian/pool/main/o/os-prober/os-prober_1.77.tar.xz"
15935+
"name": "os-update",
15936+
"version": "2.8",
15937+
"downloadUrl": "https://github.com/open-edge-platform/edge-microvisor-update-tool/archive/refs/tags/2.8.tar.gz"
1593815938
}
1593915939
}
1594015940
},

‎docs/developer-guide/emt-architecture-overview.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@ overview of key software components:
2525

2626
## Edge Microvisor Toolkit Image Versions
2727

28+
The toolkit comes pre-configured to produce different images, the table below
29+
outlines the key differences between those.
30+
31+
| Feature | Edge Microvisor Toolkit Developer Node | Edge Microvisor Toolkit Standalone Node & Orchestrated |
32+
| -----------------| -------------------- | ------------------------------------------------- |
33+
| Capabilities | <ul><li>Easy to install, bootable ISO image with precompiled packages for developer evaluation.</li> <li> Includes installable rpms with TDNF for extending baseline functionality.</li> <li>Complete with toolkit to build image with an opt-in data integrity and security features.</li></ul> | <ul><li>Designed for Open Edge Platforms and can be used to onboard and provision edge nodes at scale.</li><li>Can be used independently on bare-metal and as guest OS.</li><li>Fast atomic updates & rollback support with small image footprint and short boot time.|
34+
| Image Type | Mutable ISO | Immutable RAW + VHD |
35+
| Update Mechanism | RPM package updates with TDNF | Image based A/B updates + Rollback |
36+
| Linux Kernel | Intel® Kernel 6.12 | Intel® Kernel 6.12 |
37+
| Real time | Available for opt-in | Image variants with standard and RT Kernel provided |
38+
| Desktop Virtualization | Available | Dedicated non-RT image variant provided |
39+
| Add-on packages | Available for opt-in: Docker + K3s | Built into image: Docker + K3s |
40+
| OS Bootloader | GRUB | systemd-boot |
41+
| Secure Boot | Available for opt-in | Enabled |
42+
| Full Disc Encryption | Available for opt-in | Enabled |
43+
| dm-verity | Available for opt-in | Enabled |
44+
| SELinux | Permissive | Permissive |
45+
2846
### Developer Node mutable ISO image
2947

3048
Mutable Developer node in an ISO format allows you to add packages and

‎docs/developer-guide/emt-get-started.md‎

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,31 @@ Edge Microvisor Toolkit is a lightweight, container-first Linux distribution,
44
optimized for Intel® architecture. It provides a secure and high-performing
55
environment for deploying edge workloads across multiple deployment models.
66

7+
[Hardware and Software Requirements](./emt-system-requirements.md)
8+
79
## Usage Scenarios
810

9-
This section outlines the key usage models intended for Edge Microvisor Toolkit.
10-
11-
- [Build a new Edge Microvisor Toolkit Image.](./get-started/emt-building-howto.md)
12-
- [Install Edge Microvisor Toolkit from existing image.](./get-started/emt-installation-howto.md)
13-
14-
Microvisor can be used for standalone edge node deployments, or with Edge Manageability Framework
15-
- a complete integrated system providing full lifecycle management for your edge devices,
16-
including remote deployment and management of Kubernetes applications.
17-
18-
### Edge Microvisor Toolkit Developer Node
19-
20-
To create a custom developer build of Edge Microvisor Toolkit, follow these steps:
21-
22-
- [Download the mutable host ISO image](https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/iso/EdgeMicrovisorToolkit-3.0.iso) from
23-
Intel® Edge Software Catalog.
24-
- Install the mutable host via ISO image. Choose one of several installation types that
25-
provide ready-to-use base environments:
26-
- **Standard Kernel** - that includes only essential pre-installed packages,
27-
- **RT Kernel** - that offers enhanced real-time performance with
28-
[Preempt RT Linux Kernel 6.12](./emt-architecture-overview.md#preempt-rt-kernel),
29-
- **Standard Kernel + Docker + K3s** - that is fitted with additional features:
30-
- Docker 25.07 - for deploying applications in lightweight and standalone containers,
31-
- K3s - Lightweight Kubernetes 1.32.4, installed as an RPM package, for a simplified
32-
deployment on resource-constrained edge devices,
33-
- **RT Kernel + Docker + K3s** - that supports real-time workloads and offers small
34-
footprint deployment.
35-
- Install additional RPM packages, using DNF to tailor the OS to your specific needs.
36-
- Update installed RPMs regularly to stay up-to-date in the OS in terms of package updates,
37-
kernel updates, security vulnerability fixes and bug fixes.
38-
- Use the OS toolkit and available packages to build a custom OS image, which enables you to:
39-
- Configure the system for specialized workloads or environments.
40-
- Experiment with simplified or enhanced configurations tailored for your specific workloads.
41-
- Explore - use built-in monitoring tools to track system performance, resource
42-
usage, and log data for deeper insights into operational behavior.
43-
44-
| Item | Details |
45-
| ------------------| ----------------------------------------------- |
46-
| Packages | approximately ~400 |
47-
| Core system tools | bash, coreutils, util-linux, tar, gzip |
48-
| Networking | curl, wget, iproute2, iptables, openssh |
49-
| Package Management | tdnf, rpm |
50-
| Development | gcc, make, python3, perl, cmake, git |
51-
| Security | openssl, gnupg, selinux, cryptsetup, tpm2-tools |
52-
| Filesystem | e2fsprogs, mount |
53-
| Included in kernel | iGPU, dGPU (Intel® Arc&trade;), SR-IOV, WiFi, Ethernet, Bluetooth, GPIO, UART, I2C, CAN, USB, PCIe, PWM, SATA, NVMe, MMC/SD, TPM, Manageability Engine, Power Management, Watchdog, RAS |
54-
55-
The supported package repository offers additional `rpm` for tailoring the image
56-
to specific needs of container runtime, virtualization, orchestration software,
57-
monitoring tools, standard cloud-edge (CNCF) software, and more.
58-
59-
### Edge Microvisor Toolkit Standalone Node
11+
This section outlines the key usage models intended for the initial release of
12+
Edge Microvisor Toolkit.
13+
14+
It can be used for standalone edge node deployments, or with Edge Manageability
15+
Framework - a complete integrated system providing full lifecycle management for
16+
your edge devices, including remote deployment and management of Kubernetes
17+
applications.
18+
19+
[Choose pre-configured Edge Microvisor Toolkit Image](./emt-architecture-overview.md#edge-microvisor-toolkit-image-versions)
20+
21+
[Build Your Own Edge Microvisor Toolkit](./get-started/emt-building-howto.md)
22+
23+
## Install Edge Microvisor Toolkit
24+
25+
[Bare Metal Installation](./get-started/deployment/emt-bare-metal.md)
26+
27+
[Virtual Machine Installation](./get-started/deployment/emt-vm-guest.md)
28+
29+
## Host Guest VMs under Edge Microvisor Toolkit
30+
31+
[Deploying Other OS as Guest Virtual Machines under EMT Host](./get-started/deployment/emt-vm-host.md)
6032

6133
[Go to the Edge Microvisor Toolkit Standalone Node repository](https://github.com/open-edge-platform/edge-microvisor-toolkit-standalone-node).
6234

0 commit comments

Comments
 (0)