From 631a180462b4b9766606ab795c81950cfe6fe4eb Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Thu, 30 Nov 2023 11:30:45 -0800 Subject: [PATCH] mariner-repos: add cloud native repo (#6864) Co-authored-by: Jon Slobodzian --- .../mariner-cloud-native-preview.repo | 29 ++++++++++++++++ SPECS/mariner-repos/mariner-cloud-native.repo | 29 ++++++++++++++++ .../mariner-repos.signatures.json | 2 ++ SPECS/mariner-repos/mariner-repos.spec | 33 ++++++++++++++++++- .../manifests/package/pkggen_core_aarch64.txt | 4 +-- .../manifests/package/pkggen_core_x86_64.txt | 4 +-- .../manifests/package/toolchain_aarch64.txt | 28 ++++++++-------- .../manifests/package/toolchain_x86_64.txt | 28 ++++++++-------- 8 files changed, 126 insertions(+), 31 deletions(-) create mode 100644 SPECS/mariner-repos/mariner-cloud-native-preview.repo create mode 100644 SPECS/mariner-repos/mariner-cloud-native.repo diff --git a/SPECS/mariner-repos/mariner-cloud-native-preview.repo b/SPECS/mariner-repos/mariner-cloud-native-preview.repo new file mode 100644 index 0000000000..bac5b6096f --- /dev/null +++ b/SPECS/mariner-repos/mariner-cloud-native-preview.repo @@ -0,0 +1,29 @@ +[mariner-official-cloud-native-preview] +name=CBL-Mariner Official Cloud Native Preview $releasever $basearch +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/cloud-native/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +skip_if_unavailable=True +sslverify=1 + +[mariner-official-cloud-native-preview-debuginfo] +name=CBL-Mariner Official Cloud Native Preview $releasever $basearch Debuginfo +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/cloud-native/debuginfo/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +skip_if_unavailable=True +sslverify=1 + +[mariner-official-cloud-native-preview-source] +name=CBL-Mariner Official Cloud Native Preview $releasever Source +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/cloud-native/srpms +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +skip_if_unavailable=True +sslverify=1 diff --git a/SPECS/mariner-repos/mariner-cloud-native.repo b/SPECS/mariner-repos/mariner-cloud-native.repo new file mode 100644 index 0000000000..67f840e790 --- /dev/null +++ b/SPECS/mariner-repos/mariner-cloud-native.repo @@ -0,0 +1,29 @@ +[mariner-official-cloud-native] +name=CBL-Mariner Official Cloud Native $releasever $basearch +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/cloud-native/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +skip_if_unavailable=True +sslverify=1 + +[mariner-official-cloud-native-debuginfo] +name=CBL-Mariner Official Cloud Native $releasever $basearch Debuginfo +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/cloud-native/debuginfo/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +skip_if_unavailable=True +sslverify=1 + +[mariner-official-cloud-native-source] +name=CBL-Mariner Official Cloud Native $releasever Source +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/cloud-native/srpms +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +skip_if_unavailable=True +sslverify=1 diff --git a/SPECS/mariner-repos/mariner-repos.signatures.json b/SPECS/mariner-repos/mariner-repos.signatures.json index 6ba07b82f3..7bf32ec768 100644 --- a/SPECS/mariner-repos/mariner-repos.signatures.json +++ b/SPECS/mariner-repos/mariner-repos.signatures.json @@ -2,6 +2,8 @@ "Signatures": { "MICROSOFT-METADATA-GPG-KEY": "1824ecffeda90cfe4178a99bddde450f09fd40e8faf4f0124fba16ea79998c4c", "MICROSOFT-RPM-GPG-KEY": "1092f37ec429e58bf9c7f898df17c3c32eb2ce3c4c037afb8ffe2d2b42e16e89", + "mariner-cloud-native.repo": "62adec4e53f3a3b9917861422fd6cc6dd83564369c9aaa67452dd4d9470961b6", + "mariner-cloud-native-preview.repo": "acdb2c35e00cc596df3c16cd100707d6596080cae3302293801d030cfb72a334", "mariner-debuginfo-preview.repo": "1fea397ab17fc801351174626639c4a5e38df7393053bc419f192d49530d9f92", "mariner-debuginfo.repo": "5502de8668a12802c46f45b51e47e54472e371b02984c641d757a3905322bc7d", "mariner-extended-debuginfo-preview.repo": "2897ae5134cddb357a17348308a02f3f3ef7032109687fa9dbbfa017abc87933", diff --git a/SPECS/mariner-repos/mariner-repos.spec b/SPECS/mariner-repos/mariner-repos.spec index a3167a36bc..c4fbabb944 100644 --- a/SPECS/mariner-repos/mariner-repos.spec +++ b/SPECS/mariner-repos/mariner-repos.spec @@ -1,7 +1,7 @@ Summary: CBL-Mariner repo files, gpg keys Name: mariner-repos Version: 2.0 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Mariner @@ -21,6 +21,8 @@ Source10: mariner-official-base.repo Source11: mariner-official-preview.repo Source12: mariner-extended-debuginfo.repo Source13: mariner-extended-debuginfo-preview.repo +Source14: mariner-cloud-native.repo +Source15: mariner-cloud-native-preview.repo Requires: %{name}-shared = %{version}-%{release} @@ -29,6 +31,22 @@ BuildArch: noarch %description CBL-Mariner repo files and gpg keys +%package cloud-native +Summary: CBL-Mariner cloud-native repo file. +Group: System Environment/Base +Requires: %{name}-shared = %{version}-%{release} + +%description cloud-native +%{summary} + +%package cloud-native-preview +Summary: CBL-Mariner cloud-native preview repo file. +Group: System Environment/Base +Requires: %{name}-shared = %{version}-%{release} + +%description cloud-native-preview +%{summary} + %package debug Summary: CBL-Mariner Debuginfo repo file. Group: System Environment/Base @@ -143,6 +161,8 @@ install -m 644 %{SOURCE10} $REPO_DIRECTORY install -m 644 %{SOURCE11} $REPO_DIRECTORY install -m 644 %{SOURCE12} $REPO_DIRECTORY install -m 644 %{SOURCE13} $REPO_DIRECTORY +install -m 644 %{SOURCE14} $REPO_DIRECTORY +install -m 644 %{SOURCE15} $REPO_DIRECTORY export RPM_GPG_DIRECTORY="%{buildroot}%{_sysconfdir}/pki/rpm-gpg" @@ -164,6 +184,14 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90 %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-official-base.repo +%files cloud-native +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-cloud-native.repo + +%files cloud-native-preview +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-cloud-native-preview.repo + %files debug %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-debuginfo.repo @@ -214,6 +242,9 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90 %{_sysconfdir}/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY %changelog +* Wed Nov 29 2023 Jon Slobodzian - 2.0-9 +- Add cloud native repos. + * Thu Jul 14 2022 Andrew Phelps - 2.0-8 - Add SRPM and Debuginfo repos to existing base, extended, and preview subpackages diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 991433f1d1..66db2ea280 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -224,8 +224,8 @@ pinentry-1.2.0-1.cm2.aarch64.rpm gnupg2-2.4.0-2.cm2.aarch64.rpm gnupg2-lang-2.4.0-2.cm2.aarch64.rpm gpgme-1.16.0-2.cm2.aarch64.rpm -mariner-repos-shared-2.0-8.cm2.noarch.rpm -mariner-repos-2.0-8.cm2.noarch.rpm +mariner-repos-shared-2.0-9.cm2.noarch.rpm +mariner-repos-2.0-9.cm2.noarch.rpm libffi-3.4.2-3.cm2.aarch64.rpm libffi-devel-3.4.2-3.cm2.aarch64.rpm libtasn1-4.19.0-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 9b5650ecd7..e524e9dc83 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -224,8 +224,8 @@ pinentry-1.2.0-1.cm2.x86_64.rpm gnupg2-2.4.0-2.cm2.x86_64.rpm gnupg2-lang-2.4.0-2.cm2.x86_64.rpm gpgme-1.16.0-2.cm2.x86_64.rpm -mariner-repos-shared-2.0-8.cm2.noarch.rpm -mariner-repos-2.0-8.cm2.noarch.rpm +mariner-repos-shared-2.0-9.cm2.noarch.rpm +mariner-repos-2.0-9.cm2.noarch.rpm libffi-3.4.2-3.cm2.x86_64.rpm libffi-devel-3.4.2-3.cm2.x86_64.rpm libtasn1-4.19.0-1.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 28f3ae6ca6..0d726b1c0b 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -230,19 +230,21 @@ m4-debuginfo-1.4.19-2.cm2.aarch64.rpm make-4.3-3.cm2.aarch64.rpm make-debuginfo-4.3-3.cm2.aarch64.rpm mariner-check-macros-2.0-24.cm2.noarch.rpm -mariner-repos-2.0-8.cm2.noarch.rpm -mariner-repos-debug-2.0-8.cm2.noarch.rpm -mariner-repos-debug-preview-2.0-8.cm2.noarch.rpm -mariner-repos-extended-2.0-8.cm2.noarch.rpm -mariner-repos-extended-debug-2.0-8.cm2.noarch.rpm -mariner-repos-extended-debug-preview-2.0-8.cm2.noarch.rpm -mariner-repos-extended-preview-2.0-8.cm2.noarch.rpm -mariner-repos-extras-2.0-8.cm2.noarch.rpm -mariner-repos-extras-preview-2.0-8.cm2.noarch.rpm -mariner-repos-microsoft-2.0-8.cm2.noarch.rpm -mariner-repos-microsoft-preview-2.0-8.cm2.noarch.rpm -mariner-repos-preview-2.0-8.cm2.noarch.rpm -mariner-repos-shared-2.0-8.cm2.noarch.rpm +mariner-repos-2.0-9.cm2.noarch.rpm +mariner-repos-cloud-native-2.0-9.cm2.noarch.rpm +mariner-repos-cloud-native-preview-2.0-9.cm2.noarch.rpm +mariner-repos-debug-2.0-9.cm2.noarch.rpm +mariner-repos-debug-preview-2.0-9.cm2.noarch.rpm +mariner-repos-extended-2.0-9.cm2.noarch.rpm +mariner-repos-extended-debug-2.0-9.cm2.noarch.rpm +mariner-repos-extended-debug-preview-2.0-9.cm2.noarch.rpm +mariner-repos-extended-preview-2.0-9.cm2.noarch.rpm +mariner-repos-extras-2.0-9.cm2.noarch.rpm +mariner-repos-extras-preview-2.0-9.cm2.noarch.rpm +mariner-repos-microsoft-2.0-9.cm2.noarch.rpm +mariner-repos-microsoft-preview-2.0-9.cm2.noarch.rpm +mariner-repos-preview-2.0-9.cm2.noarch.rpm +mariner-repos-shared-2.0-9.cm2.noarch.rpm mariner-rpm-macros-2.0-24.cm2.noarch.rpm meson-0.60.2-2.cm2.noarch.rpm mpfr-4.1.0-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 4e25be4e03..8ca901674b 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -230,19 +230,21 @@ m4-debuginfo-1.4.19-2.cm2.x86_64.rpm make-4.3-3.cm2.x86_64.rpm make-debuginfo-4.3-3.cm2.x86_64.rpm mariner-check-macros-2.0-24.cm2.noarch.rpm -mariner-repos-2.0-8.cm2.noarch.rpm -mariner-repos-debug-2.0-8.cm2.noarch.rpm -mariner-repos-debug-preview-2.0-8.cm2.noarch.rpm -mariner-repos-extended-2.0-8.cm2.noarch.rpm -mariner-repos-extended-debug-2.0-8.cm2.noarch.rpm -mariner-repos-extended-debug-preview-2.0-8.cm2.noarch.rpm -mariner-repos-extended-preview-2.0-8.cm2.noarch.rpm -mariner-repos-extras-2.0-8.cm2.noarch.rpm -mariner-repos-extras-preview-2.0-8.cm2.noarch.rpm -mariner-repos-microsoft-2.0-8.cm2.noarch.rpm -mariner-repos-microsoft-preview-2.0-8.cm2.noarch.rpm -mariner-repos-preview-2.0-8.cm2.noarch.rpm -mariner-repos-shared-2.0-8.cm2.noarch.rpm +mariner-repos-2.0-9.cm2.noarch.rpm +mariner-repos-cloud-native-2.0-9.cm2.noarch.rpm +mariner-repos-cloud-native-preview-2.0-9.cm2.noarch.rpm +mariner-repos-debug-2.0-9.cm2.noarch.rpm +mariner-repos-debug-preview-2.0-9.cm2.noarch.rpm +mariner-repos-extended-2.0-9.cm2.noarch.rpm +mariner-repos-extended-debug-2.0-9.cm2.noarch.rpm +mariner-repos-extended-debug-preview-2.0-9.cm2.noarch.rpm +mariner-repos-extended-preview-2.0-9.cm2.noarch.rpm +mariner-repos-extras-2.0-9.cm2.noarch.rpm +mariner-repos-extras-preview-2.0-9.cm2.noarch.rpm +mariner-repos-microsoft-2.0-9.cm2.noarch.rpm +mariner-repos-microsoft-preview-2.0-9.cm2.noarch.rpm +mariner-repos-preview-2.0-9.cm2.noarch.rpm +mariner-repos-shared-2.0-9.cm2.noarch.rpm mariner-rpm-macros-2.0-24.cm2.noarch.rpm meson-0.60.2-2.cm2.noarch.rpm mpfr-4.1.0-2.cm2.x86_64.rpm