Skip to content

Commit f623aea

Browse files
cheeyangleecheeyanglee
committed
bump rpms to 26.06 series release
update edge-repos, edge-release, ca-certificate split edge-repos to base and next. keep edge-release with VERSION_ID 3.0 as there are azl component that refer to this for build. edge-release: fix dist_version update development.repo Signed-off-by: Lee Chee Yang <[email protected]> --------- Signed-off-by: Lee Chee Yang <[email protected]>
1 parent 90e56f0 commit f623aea

File tree

13 files changed

+939
-910
lines changed

13 files changed

+939
-910
lines changed

‎SPECS/ca-certificates/ca-certificates.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Name: ca-certificates
4747
# When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
4848
Epoch: 1
4949
Version: %{emt}.0.0
50-
Release: 14%{?dist}
50+
Release: 1%{?dist}
5151
License: MPLv2.0
5252
Vendor: Intel Corporation
5353
Distribution: Edge Microvisor Toolkit
@@ -340,6 +340,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
340340
%{_bindir}/bundle2pem.sh
341341

342342
%changelog
343+
* Mon Mar 30 2026 Lee Chee Yang <[email protected]> - 1:26.0.0-1
344+
- bump for 26.06 release.
345+
343346
* Fri Oct 3 2025 Lee Chee Yang <[email protected]> - 1:3.0.0-14
344347
- merge from Azure Linux 3.0.20251206-3.0
345348
- Adding 2 new base CAs: 'Microsoft TLS RSA Root G2' and 'Microsoft TLS ECC Root G2'.

‎SPECS/edge-release/edge-release.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%define emt_ver 3
2-
%define dist_version 26.06~preview
2+
%define dist_version 26.06
33
%define build_number_no_dist_no_time %(echo %{distro_release_version} | cut -d. -f 3)
44

55
Summary: Edge Microvisor Toolkit release files
@@ -121,7 +121,10 @@ install -Dm0644 %{SOURCE4} -t %{buildroot}%{_sysctldir}/
121121
%{_sysctldir}/*.conf
122122

123123
%changelog
124-
* Thu Jan 29 2025 Lee Chee Yang <[email protected]> - 26.06~preview-1
124+
* Mon Mar 30 2026 Lee Chee Yang <[email protected]> - 26.06-1
125+
- bump version for 26.06 release.
126+
127+
* Thu Jan 29 2026 Lee Chee Yang <[email protected]> - 26.06~preview-1
125128
- bump version for 26.06 preview release.
126129

127130
* Mon Nov 24 2025 Lee Chee Yang <[email protected]> - 25.06-1

‎SPECS/edge-repos/edge-base.repo‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
1-
[edge-next]
2-
name=Edge Next $releasever $basearch
3-
baseurl=https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/next/base/
4-
gpgkey=file:///etc/pki/rpm-gpg/INTEL-RPM-GPG-KEY
5-
gpgcheck=1
6-
repo_gpgcheck=0
7-
enabled=1
8-
skip_if_unavailable=True
9-
sslverify=0
10-
priority=11
11-
121
[edge-base]
132
name=Edge Base $releasever $basearch
14-
baseurl=https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/3.0/base/
3+
baseurl=https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/26.06/base/
154
gpgkey=file:///etc/pki/rpm-gpg/INTEL-RPM-GPG-KEY
165
gpgcheck=1
176
repo_gpgcheck=0
187
enabled=1
198
skip_if_unavailable=True
209
sslverify=0
21-
priority=12

‎SPECS/edge-repos/edge-next.repo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[edge-next]
2+
name=Edge Next $releasever $basearch
3+
baseurl=https://files-rs.edgeorchestration.intel.com/files-edge-orch/microvisor/rpms/next/base/
4+
gpgkey=file:///etc/pki/rpm-gpg/INTEL-RPM-GPG-KEY
5+
gpgcheck=1
6+
repo_gpgcheck=0
7+
enabled=1
8+
skip_if_unavailable=True
9+
sslverify=0

‎SPECS/edge-repos/edge-repos.signatures.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Signatures": {
3-
"edge-base.repo": "b3fc866a9750c0608f74af83c9d40d0ac30c1cb566de9a655520d8bb9b1e5475",
3+
"edge-base.repo": "3ac9b9154647cc0abe47ac9110814d9ae40900cfc75b3a934c6a8def197c0f23",
4+
"edge-next.repo": "b021cbce9f1d3f08f4656ac51fafa0d5530206e0fead58559905d0038f9c8513",
45
"INTEL-RPM-GPG-KEY": "90cf27d0aff4e69a11cc3da2e492a383e05e681cafff23525e796c6494d58336"
56
}
67
}

‎SPECS/edge-repos/edge-repos.spec‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
Summary: Edge Microvisor Toolkit repo files, gpg keys
22
Name: edge-repos
3-
Version: 3.0
4-
Release: 8%{?dist}
3+
Version: 26.06
4+
Release: 1%{?dist}
55
License: MIT
66
Vendor: Intel Corporation
77
Distribution: Edge Microvisor Toolkit
88
Group: System Environment/Base
99
URL: https://github.com/open-edge-platform/edge-microvisor-toolkit
1010
Source0: INTEL-RPM-GPG-KEY
11-
Source2: edge-base.repo
12-
11+
Source1: edge-base.repo
12+
Source2: edge-next.repo
1313
Requires: %{name}-shared = %{version}-%{release}
1414

1515
BuildArch: noarch
1616

1717
%description
1818
Edge Microvisor Toolkit repo files and gpg keys
1919

20+
%package next
21+
Summary: Development and Experimental repo file.
22+
Group: System Environment/Base
23+
Requires: %{name}-next = %{version}-%{release}
24+
25+
%description next
26+
%{summary}
27+
2028
%package shared
2129
Summary: Directories and files needed by all %{name} configurations.
2230
Group: System Environment/Base
@@ -31,6 +39,7 @@ Requires(preun): gpgme
3139
%install
3240
export REPO_DIRECTORY="%{buildroot}%{_sysconfdir}/yum.repos.d"
3341
install -d -m 755 $REPO_DIRECTORY
42+
install -m 644 %{SOURCE1} $REPO_DIRECTORY
3443
install -m 644 %{SOURCE2} $REPO_DIRECTORY
3544

3645
export RPM_GPG_DIRECTORY="%{buildroot}%{_sysconfdir}/pki/rpm-gpg"
@@ -49,11 +58,18 @@ gpg --batch --yes --delete-keys 84910237BDFAAD16C4F9D44411FF864ABDCE8692
4958
%defattr(-,root,root,-)
5059
%config(noreplace) %{_sysconfdir}/yum.repos.d/edge-base.repo
5160

61+
%files next
62+
%defattr(-,root,root,-)
63+
%config(noreplace) %{_sysconfdir}/yum.repos.d/edge-next.repo
64+
5265
%files shared
5366
%dir %{_sysconfdir}/yum.repos.d
5467
%{_sysconfdir}/pki/rpm-gpg/INTEL-RPM-GPG-KEY
5568

5669
%changelog
70+
* Mon Mar 30 2026 Lee Chee Yang <[email protected]> - 26.06-1
71+
- split repos to 26.06 and next.
72+
5773
* Fri Dec 5 2025 Lishan Liu <[email protected]> - 3.0-8
5874
- Change repo priority
5975

‎SPECS/edge-rpm-macros/edge-rpm-macros.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Summary: Edge Microvisor Toolkit specific rpm macro files
88
Name: edge-rpm-macros
99
Version: %{emt}.0
10-
Release: 2%{?dist}
10+
Release: 1%{?dist}
1111
License: GPL+ AND MIT
1212
Vendor: Intel Corporation
1313
Distribution: Edge Microvisor Toolkit
@@ -145,6 +145,9 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm python.lua
145145
%{_rpmconfigdir}/macros.d/macros.check
146146

147147
%changelog
148+
* Mon Mar 30 2026 Lee Chee Yang <[email protected]> - 26.0-1
149+
- version bump for 26.06 series.
150+
148151
* Tue Dec 24 2024 Naveen Saini <[email protected]> - 1.0-2
149152
- Updated initial changelog entry.
150153

‎SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
Summary: Prebuilt version of ca-certificates-base package.
22
Name: prebuilt-ca-certificates-base
33
# When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
4-
Epoch: 1
54
Version: %{emt}.0.0
6-
Release: 14%{?dist}
5+
Release: 1%{?dist}
76
License: MIT
87
Vendor: Intel Corporation
98
Distribution: Edge Microvisor Toolkit
109
Group: System Environment/Security
1110
URL: https://docs.microsoft.com/en-us/security/trusted-root/program-requirements
1211
BuildArch: noarch
1312

14-
BuildRequires: ca-certificates-base = %{epoch}:%{version}-%{release}
13+
BuildRequires: ca-certificates-base = %{version}-%{release}
1514

1615
Conflicts: ca-certificates-shared
1716
Conflicts: prebuilt-ca-certificates
@@ -46,7 +45,10 @@ find %{buildroot} -name README -delete
4645
%{_sysconfdir}/pki/java/cacerts
4746

4847
%changelog
49-
* Mon Jan 5 2025 Lee Chee Yang <[email protected]> - 1:3.0.0-14
48+
* Mon Mar 30 2026 Lee Chee Yang <[email protected]> - 26.0.0-1
49+
- bump for 26.06 release.
50+
51+
* Mon Jan 5 2026 Lee Chee Yang <[email protected]> - 1:3.0.0-14
5052
- merge from Azure Linux 3.0.20251206-3.0
5153
- Making 'Release' match with 'ca-certificates'
5254

‎SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Name: prebuilt-ca-certificates
33
# When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
44
Epoch: 1
55
Version: %{emt}.0.0
6-
Release: 14%{?dist}
6+
Release: 1%{?dist}
77
License: MIT
88
Vendor: Intel Corporation
99
Distribution: Edge Microvisor Toolkit
@@ -49,7 +49,10 @@ find %{buildroot} -name README -delete
4949
%{_sysconfdir}/pki/java/cacerts
5050

5151
%changelog
52-
* Mon Jan 5 2025 Lee Chee Yang <[email protected]> - 1:3.0.0-14
52+
* Mon Mar 30 2025 Lee Chee Yang <[email protected]> - 1:26.0.0-1
53+
- bump for 26.06 release
54+
55+
* Mon Jan 5 2026 Lee Chee Yang <[email protected]> - 1:3.0.0-14
5356
- merge from Azure Linux 3.0.20251206-3.0
5457
- Making 'Release' match with 'ca-certificates'
5558

‎toolkit/resources/manifests/package/development.repo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ priority=8
99

1010
[development-repo]
1111
name=development Repo
12-
baseurl=http://rpm-emt.intel.com/pulp/content/emt-3.0-test-base
12+
baseurl=http://rpm-emt.intel.com/pulp/content/emt-26.06-test-base
1313
enabled=1
1414
gpgcheck=0
1515
skip_if_unavailable=1

0 commit comments

Comments
 (0)