Skip to content

Commit 12ac4f0

Browse files
authored
Merge branch 'open-edge-platform:3.0-dev' into 3.0-dev
2 parents e227e89 + 526f7e3 commit 12ac4f0

18 files changed

Lines changed: 113 additions & 54 deletions

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ Check out these articles to quickly learn how to work with Edge Microvisor Toolk
5454

5555
**Demos**
5656
* [Standalone Edge Microvisor Toolkit (EMT-S) integration with Edge Microvisor Bootkit](https://www.youtube.com/watch?v=rmgmWYi6OpE):
57-
This demo includes: USB Device Preparation, Provisioning Process, System Readiness, and Final Boot with the cluster starting successfully.
57+
This demo includes the USB Device Preparation, Provisioning Process, System Readiness, and Final Boot with the cluster starting successfully.
58+
* [Edge Microvisor Toolkit Standalone Node 3.0](https://www.youtube.com/watch?v=j_4EX_wggSI):
59+
This demo provides a brief walkthrough of Edge Microvisor Toolkit Standalone Node for the 3.0 release, covering various use cases.
5860

5961
## Getting Help
6062

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"lts-v6.12.35-emt-250703T075830Z.tar.gz": "52f1531ff60958889a56f911b63232e75fa374b0561852fa79ab6decc09989b9"
3+
"lts-v6.12.35-emt-250710T220928Z.tar.gz": "2f4c44152d9aeef4e54b1ba17fd6c58a03db8c7124eedd9f9140d4d1b7e4dfd7"
44
}
55
}

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.12.35
17-
Release: 1%{?dist}
17+
Release: 2%{?dist}
1818
License: GPLv2
1919
Vendor: Intel Corporation
2020
Distribution: Edge Microvisor Toolkit
2121
Group: System Environment/Kernel
2222
URL: https://github.com/intel/linux-intel-lts
23-
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250703T075830Z.tar.gz
23+
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250710T220928Z.tar.gz
2424
# Historical name shipped by other distros
2525
Provides: glibc-kernheaders = %{version}-%{release}
2626
BuildArch: noarch
@@ -41,7 +41,7 @@ cross-glibc package.
4141
%endif
4242

4343
%prep
44-
%setup -q -n lts-v6.12.35-emt-250703T075830Z
44+
%setup -q -n lts-v6.12.35-emt-250710T220928Z
4545

4646
%build
4747
make mrproper
@@ -76,6 +76,9 @@ done
7676
%endif
7777

7878
%changelog
79+
* Thu Jul 10 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-2
80+
- Update kernel to 6.12.35
81+
7982
* Fri Jul 04 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-1
8083
- Update kernel to 6.12.35
8184

SPECS/kernel-rt/kernel-rt.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
66
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
77
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
8-
"lts-v6.12.35-emt-250703T075830Z.tar.gz": "52f1531ff60958889a56f911b63232e75fa374b0561852fa79ab6decc09989b9"
8+
"lts-v6.12.35-emt-250710T220928Z.tar.gz": "2f4c44152d9aeef4e54b1ba17fd6c58a03db8c7124eedd9f9140d4d1b7e4dfd7"
99
}
1010
}

SPECS/kernel-rt/kernel-rt.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Summary: Preempt RT Linux Kernel
22
Name: kernel-rt
33
Version: 6.12.35
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: GPLv2
66
Vendor: Intel Corporation
77
Distribution: Edge Microvisor Toolkit
88
Group: System Environment/Kernel
99
URL: https://github.com/intel/linux-intel-lts
10-
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250703T075830Z.tar.gz
10+
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250710T220928Z.tar.gz
1111
Source1: config
1212
Source3: sha512hmac-openssl.sh
1313
Source4: emt-ca-20211013.pem
@@ -193,7 +193,7 @@ This package contains the bpftool, which allows inspection and simple
193193
manipulation of eBPF programs and maps.
194194

195195
%prep
196-
%autosetup -p1 -n lts-v6.12.35-emt-250703T075830Z
196+
%autosetup -p1 -n lts-v6.12.35-emt-250710T220928Z
197197
# %patch 0 -p1
198198
make mrproper
199199

@@ -465,6 +465,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
465465
%{_sysconfdir}/bash_completion.d/bpftool
466466

467467
%changelog
468+
* Thu Jul 10 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-2
469+
- Update kernel to 6.12.35
470+
468471
* Fri Jul 04 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-1
469472
- Update kernel to 6.12.35
470473

SPECS/kernel/kernel-uki.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Summary: Unified Kernel Image
1414
Name: kernel-uki
1515
Version: 6.12.35
16-
Release: 1%{?dist}
16+
Release: 2%{?dist}
1717
License: GPLv2
1818
Vendor: Intel Corporation
1919
Distribution: Edge Microvisor Toolkit
@@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7070
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7171

7272
%changelog
73+
* Thu Jul 10 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-2
74+
- Update kernel to 6.12.35
75+
7376
* Fri Jul 04 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-1
7477
- Update kernel to 6.12.35
7578

SPECS/kernel/kernel.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
66
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
77
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
8-
"lts-v6.12.35-emt-250703T075830Z.tar.gz": "52f1531ff60958889a56f911b63232e75fa374b0561852fa79ab6decc09989b9"
8+
"lts-v6.12.35-emt-250710T220928Z.tar.gz": "2f4c44152d9aeef4e54b1ba17fd6c58a03db8c7124eedd9f9140d4d1b7e4dfd7"
99
}
1010
}

SPECS/kernel/kernel.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Summary: Linux Kernel
22
Name: kernel
33
Version: 6.12.35
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: GPLv2
66
Vendor: Intel Corporation
77
Distribution: Edge Microvisor Toolkit
88
Group: System Environment/Kernel
99
URL: https://github.com/intel/linux-intel-lts
10-
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250703T075830Z.tar.gz
10+
Source0: https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250710T220928Z.tar.gz
1111
Source1: config
1212
Source3: sha512hmac-openssl.sh
1313
Source4: emt-ca-20211013.pem
@@ -194,7 +194,7 @@ This package contains the bpftool, which allows inspection and simple
194194
manipulation of eBPF programs and maps.
195195

196196
%prep
197-
%autosetup -p1 -n lts-v6.12.35-emt-250703T075830Z
197+
%autosetup -p1 -n lts-v6.12.35-emt-250710T220928Z
198198
# %patch 0 -p1
199199
make mrproper
200200

@@ -440,6 +440,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
440440
%{_sysconfdir}/bash_completion.d/bpftool
441441

442442
%changelog
443+
* Thu Jul 10 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-2
444+
- Update kernel to 6.12.35
445+
443446
* Fri Jul 04 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 6.12.35-1
444447
- Update kernel to 6.12.35
445448

SPECS/nvidia-data-center-driver/nvidia-data-center-driver.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: nvidia gpu driver kernel module for data center devices
1111
Name: nvidia-data-center-driver
1212
Version: 570.133.20
13-
Release: 2%{?dist}
13+
Release: 3%{?dist}
1414
License: Public Domain
1515
Source0: https://us.download.nvidia.com/tesla/%{version}/NVIDIA-Linux-x86_64-%{version}.run
1616
Vendor: Intel Corporation
@@ -51,6 +51,9 @@ make INSTALL_MOD_PATH=%{buildroot} modules_install
5151
/sbin/depmod -a
5252

5353
%changelog
54+
* Thu Jul 10 2025 Ren Jiaojiao <jiaojiaox.ren@intel.com> - 570.133.20-3
55+
- Bump release to rebuild
56+
5457
* Fri Jul 04 2025 Anuj Mittal <anuj.mittal@intel.com> - 570.133.20-2
5558
- Bump release to rebuild
5659

cgmanifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8492,7 +8492,7 @@
84928492
"other": {
84938493
"name": "kernel",
84948494
"version": "6.12.35",
8495-
"downloadUrl": "https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250703T075830Z.tar.gz"
8495+
"downloadUrl": "https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250710T220928Z.tar.gz"
84968496
}
84978497
}
84988498
},
@@ -8512,7 +8512,7 @@
85128512
"other": {
85138513
"name": "kernel-headers",
85148514
"version": "6.12.35",
8515-
"downloadUrl": "https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250703T075830Z.tar.gz"
8515+
"downloadUrl": "https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250710T220928Z.tar.gz"
85168516
}
85178517
}
85188518
},
@@ -8542,7 +8542,7 @@
85428542
"other": {
85438543
"name": "kernel-rt",
85448544
"version": "6.12.35",
8545-
"downloadUrl": "https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250703T075830Z.tar.gz"
8545+
"downloadUrl": "https://github.com/intel/linux-intel-lts/archive/refs/tags/lts-v6.12.35-emt-250710T220928Z.tar.gz"
85468546
}
85478547
}
85488548
},

0 commit comments

Comments
 (0)