Skip to content

Commit 631a180

Browse files
anphel31jslobodzian
anphel31
and
jslobodzian
authored
mariner-repos: add cloud native repo (#6864)
Co-authored-by: Jon Slobodzian <joslobo@microsoft.com>
1 parent 15d0dfe commit 631a180

8 files changed

Lines changed: 126 additions & 31 deletions

File tree

‎SPECS/mariner-repos/mariner-cloud-native-preview.repo‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[mariner-official-cloud-native-preview]
2+
name=CBL-Mariner Official Cloud Native Preview $releasever $basearch
3+
baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/cloud-native/$basearch
4+
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
5+
gpgcheck=1
6+
repo_gpgcheck=1
7+
enabled=1
8+
skip_if_unavailable=True
9+
sslverify=1
10+
11+
[mariner-official-cloud-native-preview-debuginfo]
12+
name=CBL-Mariner Official Cloud Native Preview $releasever $basearch Debuginfo
13+
baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/cloud-native/debuginfo/$basearch
14+
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
15+
gpgcheck=1
16+
repo_gpgcheck=1
17+
enabled=0
18+
skip_if_unavailable=True
19+
sslverify=1
20+
21+
[mariner-official-cloud-native-preview-source]
22+
name=CBL-Mariner Official Cloud Native Preview $releasever Source
23+
baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/cloud-native/srpms
24+
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
25+
gpgcheck=1
26+
repo_gpgcheck=1
27+
enabled=0
28+
skip_if_unavailable=True
29+
sslverify=1

‎SPECS/mariner-repos/mariner-cloud-native.repo‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[mariner-official-cloud-native]
2+
name=CBL-Mariner Official Cloud Native $releasever $basearch
3+
baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/cloud-native/$basearch
4+
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
5+
gpgcheck=1
6+
repo_gpgcheck=1
7+
enabled=1
8+
skip_if_unavailable=True
9+
sslverify=1
10+
11+
[mariner-official-cloud-native-debuginfo]
12+
name=CBL-Mariner Official Cloud Native $releasever $basearch Debuginfo
13+
baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/cloud-native/debuginfo/$basearch
14+
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
15+
gpgcheck=1
16+
repo_gpgcheck=1
17+
enabled=0
18+
skip_if_unavailable=True
19+
sslverify=1
20+
21+
[mariner-official-cloud-native-source]
22+
name=CBL-Mariner Official Cloud Native $releasever Source
23+
baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/cloud-native/srpms
24+
gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
25+
gpgcheck=1
26+
repo_gpgcheck=1
27+
enabled=0
28+
skip_if_unavailable=True
29+
sslverify=1

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"Signatures": {
33
"MICROSOFT-METADATA-GPG-KEY": "1824ecffeda90cfe4178a99bddde450f09fd40e8faf4f0124fba16ea79998c4c",
44
"MICROSOFT-RPM-GPG-KEY": "1092f37ec429e58bf9c7f898df17c3c32eb2ce3c4c037afb8ffe2d2b42e16e89",
5+
"mariner-cloud-native.repo": "62adec4e53f3a3b9917861422fd6cc6dd83564369c9aaa67452dd4d9470961b6",
6+
"mariner-cloud-native-preview.repo": "acdb2c35e00cc596df3c16cd100707d6596080cae3302293801d030cfb72a334",
57
"mariner-debuginfo-preview.repo": "1fea397ab17fc801351174626639c4a5e38df7393053bc419f192d49530d9f92",
68
"mariner-debuginfo.repo": "5502de8668a12802c46f45b51e47e54472e371b02984c641d757a3905322bc7d",
79
"mariner-extended-debuginfo-preview.repo": "2897ae5134cddb357a17348308a02f3f3ef7032109687fa9dbbfa017abc87933",

‎SPECS/mariner-repos/mariner-repos.spec‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: CBL-Mariner repo files, gpg keys
22
Name: mariner-repos
33
Version: 2.0
4-
Release: 8%{?dist}
4+
Release: 9%{?dist}
55
License: MIT
66
Vendor: Microsoft Corporation
77
Distribution: Mariner
@@ -21,6 +21,8 @@ Source10: mariner-official-base.repo
2121
Source11: mariner-official-preview.repo
2222
Source12: mariner-extended-debuginfo.repo
2323
Source13: mariner-extended-debuginfo-preview.repo
24+
Source14: mariner-cloud-native.repo
25+
Source15: mariner-cloud-native-preview.repo
2426

2527
Requires: %{name}-shared = %{version}-%{release}
2628

@@ -29,6 +31,22 @@ BuildArch: noarch
2931
%description
3032
CBL-Mariner repo files and gpg keys
3133

34+
%package cloud-native
35+
Summary: CBL-Mariner cloud-native repo file.
36+
Group: System Environment/Base
37+
Requires: %{name}-shared = %{version}-%{release}
38+
39+
%description cloud-native
40+
%{summary}
41+
42+
%package cloud-native-preview
43+
Summary: CBL-Mariner cloud-native preview repo file.
44+
Group: System Environment/Base
45+
Requires: %{name}-shared = %{version}-%{release}
46+
47+
%description cloud-native-preview
48+
%{summary}
49+
3250
%package debug
3351
Summary: CBL-Mariner Debuginfo repo file.
3452
Group: System Environment/Base
@@ -143,6 +161,8 @@ install -m 644 %{SOURCE10} $REPO_DIRECTORY
143161
install -m 644 %{SOURCE11} $REPO_DIRECTORY
144162
install -m 644 %{SOURCE12} $REPO_DIRECTORY
145163
install -m 644 %{SOURCE13} $REPO_DIRECTORY
164+
install -m 644 %{SOURCE14} $REPO_DIRECTORY
165+
install -m 644 %{SOURCE15} $REPO_DIRECTORY
146166

147167
export RPM_GPG_DIRECTORY="%{buildroot}%{_sysconfdir}/pki/rpm-gpg"
148168

@@ -164,6 +184,14 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90
164184
%defattr(-,root,root,-)
165185
%config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-official-base.repo
166186

187+
%files cloud-native
188+
%defattr(-,root,root,-)
189+
%config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-cloud-native.repo
190+
191+
%files cloud-native-preview
192+
%defattr(-,root,root,-)
193+
%config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-cloud-native-preview.repo
194+
167195
%files debug
168196
%defattr(-,root,root,-)
169197
%config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-debuginfo.repo
@@ -214,6 +242,9 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90
214242
%{_sysconfdir}/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY
215243

216244
%changelog
245+
* Wed Nov 29 2023 Jon Slobodzian <joslobo@microsoft.com> - 2.0-9
246+
- Add cloud native repos.
247+
217248
* Thu Jul 14 2022 Andrew Phelps <anphel@microsoft.com> - 2.0-8
218249
- Add SRPM and Debuginfo repos to existing base, extended, and preview subpackages
219250

‎toolkit/resources/manifests/package/pkggen_core_aarch64.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ pinentry-1.2.0-1.cm2.aarch64.rpm
224224
gnupg2-2.4.0-2.cm2.aarch64.rpm
225225
gnupg2-lang-2.4.0-2.cm2.aarch64.rpm
226226
gpgme-1.16.0-2.cm2.aarch64.rpm
227-
mariner-repos-shared-2.0-8.cm2.noarch.rpm
228-
mariner-repos-2.0-8.cm2.noarch.rpm
227+
mariner-repos-shared-2.0-9.cm2.noarch.rpm
228+
mariner-repos-2.0-9.cm2.noarch.rpm
229229
libffi-3.4.2-3.cm2.aarch64.rpm
230230
libffi-devel-3.4.2-3.cm2.aarch64.rpm
231231
libtasn1-4.19.0-1.cm2.aarch64.rpm

‎toolkit/resources/manifests/package/pkggen_core_x86_64.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ pinentry-1.2.0-1.cm2.x86_64.rpm
224224
gnupg2-2.4.0-2.cm2.x86_64.rpm
225225
gnupg2-lang-2.4.0-2.cm2.x86_64.rpm
226226
gpgme-1.16.0-2.cm2.x86_64.rpm
227-
mariner-repos-shared-2.0-8.cm2.noarch.rpm
228-
mariner-repos-2.0-8.cm2.noarch.rpm
227+
mariner-repos-shared-2.0-9.cm2.noarch.rpm
228+
mariner-repos-2.0-9.cm2.noarch.rpm
229229
libffi-3.4.2-3.cm2.x86_64.rpm
230230
libffi-devel-3.4.2-3.cm2.x86_64.rpm
231231
libtasn1-4.19.0-1.cm2.x86_64.rpm

‎toolkit/resources/manifests/package/toolchain_aarch64.txt‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -230,19 +230,21 @@ m4-debuginfo-1.4.19-2.cm2.aarch64.rpm
230230
make-4.3-3.cm2.aarch64.rpm
231231
make-debuginfo-4.3-3.cm2.aarch64.rpm
232232
mariner-check-macros-2.0-24.cm2.noarch.rpm
233-
mariner-repos-2.0-8.cm2.noarch.rpm
234-
mariner-repos-debug-2.0-8.cm2.noarch.rpm
235-
mariner-repos-debug-preview-2.0-8.cm2.noarch.rpm
236-
mariner-repos-extended-2.0-8.cm2.noarch.rpm
237-
mariner-repos-extended-debug-2.0-8.cm2.noarch.rpm
238-
mariner-repos-extended-debug-preview-2.0-8.cm2.noarch.rpm
239-
mariner-repos-extended-preview-2.0-8.cm2.noarch.rpm
240-
mariner-repos-extras-2.0-8.cm2.noarch.rpm
241-
mariner-repos-extras-preview-2.0-8.cm2.noarch.rpm
242-
mariner-repos-microsoft-2.0-8.cm2.noarch.rpm
243-
mariner-repos-microsoft-preview-2.0-8.cm2.noarch.rpm
244-
mariner-repos-preview-2.0-8.cm2.noarch.rpm
245-
mariner-repos-shared-2.0-8.cm2.noarch.rpm
233+
mariner-repos-2.0-9.cm2.noarch.rpm
234+
mariner-repos-cloud-native-2.0-9.cm2.noarch.rpm
235+
mariner-repos-cloud-native-preview-2.0-9.cm2.noarch.rpm
236+
mariner-repos-debug-2.0-9.cm2.noarch.rpm
237+
mariner-repos-debug-preview-2.0-9.cm2.noarch.rpm
238+
mariner-repos-extended-2.0-9.cm2.noarch.rpm
239+
mariner-repos-extended-debug-2.0-9.cm2.noarch.rpm
240+
mariner-repos-extended-debug-preview-2.0-9.cm2.noarch.rpm
241+
mariner-repos-extended-preview-2.0-9.cm2.noarch.rpm
242+
mariner-repos-extras-2.0-9.cm2.noarch.rpm
243+
mariner-repos-extras-preview-2.0-9.cm2.noarch.rpm
244+
mariner-repos-microsoft-2.0-9.cm2.noarch.rpm
245+
mariner-repos-microsoft-preview-2.0-9.cm2.noarch.rpm
246+
mariner-repos-preview-2.0-9.cm2.noarch.rpm
247+
mariner-repos-shared-2.0-9.cm2.noarch.rpm
246248
mariner-rpm-macros-2.0-24.cm2.noarch.rpm
247249
meson-0.60.2-2.cm2.noarch.rpm
248250
mpfr-4.1.0-2.cm2.aarch64.rpm

‎toolkit/resources/manifests/package/toolchain_x86_64.txt‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -230,19 +230,21 @@ m4-debuginfo-1.4.19-2.cm2.x86_64.rpm
230230
make-4.3-3.cm2.x86_64.rpm
231231
make-debuginfo-4.3-3.cm2.x86_64.rpm
232232
mariner-check-macros-2.0-24.cm2.noarch.rpm
233-
mariner-repos-2.0-8.cm2.noarch.rpm
234-
mariner-repos-debug-2.0-8.cm2.noarch.rpm
235-
mariner-repos-debug-preview-2.0-8.cm2.noarch.rpm
236-
mariner-repos-extended-2.0-8.cm2.noarch.rpm
237-
mariner-repos-extended-debug-2.0-8.cm2.noarch.rpm
238-
mariner-repos-extended-debug-preview-2.0-8.cm2.noarch.rpm
239-
mariner-repos-extended-preview-2.0-8.cm2.noarch.rpm
240-
mariner-repos-extras-2.0-8.cm2.noarch.rpm
241-
mariner-repos-extras-preview-2.0-8.cm2.noarch.rpm
242-
mariner-repos-microsoft-2.0-8.cm2.noarch.rpm
243-
mariner-repos-microsoft-preview-2.0-8.cm2.noarch.rpm
244-
mariner-repos-preview-2.0-8.cm2.noarch.rpm
245-
mariner-repos-shared-2.0-8.cm2.noarch.rpm
233+
mariner-repos-2.0-9.cm2.noarch.rpm
234+
mariner-repos-cloud-native-2.0-9.cm2.noarch.rpm
235+
mariner-repos-cloud-native-preview-2.0-9.cm2.noarch.rpm
236+
mariner-repos-debug-2.0-9.cm2.noarch.rpm
237+
mariner-repos-debug-preview-2.0-9.cm2.noarch.rpm
238+
mariner-repos-extended-2.0-9.cm2.noarch.rpm
239+
mariner-repos-extended-debug-2.0-9.cm2.noarch.rpm
240+
mariner-repos-extended-debug-preview-2.0-9.cm2.noarch.rpm
241+
mariner-repos-extended-preview-2.0-9.cm2.noarch.rpm
242+
mariner-repos-extras-2.0-9.cm2.noarch.rpm
243+
mariner-repos-extras-preview-2.0-9.cm2.noarch.rpm
244+
mariner-repos-microsoft-2.0-9.cm2.noarch.rpm
245+
mariner-repos-microsoft-preview-2.0-9.cm2.noarch.rpm
246+
mariner-repos-preview-2.0-9.cm2.noarch.rpm
247+
mariner-repos-shared-2.0-9.cm2.noarch.rpm
246248
mariner-rpm-macros-2.0-24.cm2.noarch.rpm
247249
meson-0.60.2-2.cm2.noarch.rpm
248250
mpfr-4.1.0-2.cm2.x86_64.rpm

0 commit comments

Comments
 (0)