diff --git a/SPECS/mariner-repos/mariner-preview.repo b/SPECS/mariner-repos/mariner-preview.repo new file mode 100755 index 00000000000..67d6673c138 --- /dev/null +++ b/SPECS/mariner-repos/mariner-preview.repo @@ -0,0 +1,9 @@ +[mariner-preview] +name=CBL-Mariner Official Preview $releasever $basearch +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/update/$basearch/rpms +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 diff --git a/SPECS/mariner-repos/mariner-repos.signatures.json b/SPECS/mariner-repos/mariner-repos.signatures.json index 08456c98983..456d8662e06 100644 --- a/SPECS/mariner-repos/mariner-repos.signatures.json +++ b/SPECS/mariner-repos/mariner-repos.signatures.json @@ -3,6 +3,7 @@ "MICROSOFT-RPM-GPG-KEY": "1092f37ec429e58bf9c7f898df17c3c32eb2ce3c4c037afb8ffe2d2b42e16e89", "MICROSOFT-METADATA-GPG-KEY": "1824ecffeda90cfe4178a99bddde450f09fd40e8faf4f0124fba16ea79998c4c", "mariner-official-base.repo": "af485f85c5c856536c6ec2f73f0afd1d9c424396fce1c9ae6f40745a5f41503d", - "mariner-official-update.repo": "d80ed87ba6cf1e535131a9a68499b832dc87fc9add29cbae0f6cc76ebc36fbf3" + "mariner-official-update.repo": "d80ed87ba6cf1e535131a9a68499b832dc87fc9add29cbae0f6cc76ebc36fbf3", + "mariner-preview.repo": "7b5731bce3d0c81647144822a886a01912e325db10f7519e105b5224a25f1568" } } diff --git a/SPECS/mariner-repos/mariner-repos.spec b/SPECS/mariner-repos/mariner-repos.spec index 6f11555ed35..d76bed2dfef 100644 --- a/SPECS/mariner-repos/mariner-repos.spec +++ b/SPECS/mariner-repos/mariner-repos.spec @@ -1,17 +1,18 @@ Summary: CBL-Mariner repo files, gpg keys Name: mariner-repos Version: 1.0 -Release: 9%{?dist} +Release: 10%{?dist} License: Apache License Group: System Environment/Base URL: https://aka.ms/mariner +Vendor: Microsoft Corporation +Distribution: Mariner Source0: MICROSOFT-RPM-GPG-KEY Source1: MICROSOFT-METADATA-GPG-KEY Source2: mariner-official-base.repo Source3: mariner-official-update.repo -Vendor: Microsoft Corporation -Distribution: mariner -Provides: mariner-repos +Source4: mariner-preview.repo + Requires(post): gpgme Requires(post): rpm Requires(preun): gpgme @@ -21,11 +22,20 @@ BuildArch: noarch %description CBL-Mariner repo files and gpg keys +%package preview +Summary: CBL-Mariner preview repo file. +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} + +%description preview +%{summary} + %install rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yum.repos.d install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/yum.repos.d +install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/yum.repos.d install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/etc/pki/rpm-gpg @@ -52,7 +62,14 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90 %config(noreplace) /etc/yum.repos.d/mariner-official-base.repo %config(noreplace) /etc/yum.repos.d/mariner-official-update.repo +%files preview +%defattr(-,root,root,-) +%config(noreplace) /etc/yum.repos.d/mariner-preview.repo + %changelog +* Mon Sep 28 2020 Pawel Winogrodzki 1.0-10 +- Adding configuration to access the preview repository. +- Removing redundant 'Provides'. * Tue Aug 11 2020 Saravanan Somasundaram - 1.0-9 - Enable GPG Check and Import * Mon Aug 10 2020 Saravanan Somasundaram - 1.0-8 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index d5c3f5aa934..7b28c15ec9b 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -155,7 +155,7 @@ npth-1.6-3.cm1.aarch64.rpm pinentry-1.1.0-3.cm1.aarch64.rpm gnupg2-2.2.20-3.cm1.aarch64.rpm gpgme-1.13.1-5.cm1.aarch64.rpm -mariner-repos-1.0-9.cm1.noarch.rpm +mariner-repos-1.0-10.cm1.noarch.rpm libffi-3.2.1-11.cm1.aarch64.rpm libtasn1-4.14-2.cm1.aarch64.rpm p11-kit-0.23.16.1-2.cm1.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 371162444a5..b4e173108b1 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -155,7 +155,7 @@ npth-1.6-3.cm1.x86_64.rpm pinentry-1.1.0-3.cm1.x86_64.rpm gnupg2-2.2.20-3.cm1.x86_64.rpm gpgme-1.13.1-5.cm1.x86_64.rpm -mariner-repos-1.0-9.cm1.noarch.rpm +mariner-repos-1.0-10.cm1.noarch.rpm libffi-3.2.1-11.cm1.x86_64.rpm libtasn1-4.14-2.cm1.x86_64.rpm p11-kit-0.23.16.1-2.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 2799b0b2ffd..3c307b7f71d 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -238,7 +238,8 @@ make-4.2.1-4.cm1.aarch64.rpm make-debuginfo-4.2.1-4.cm1.aarch64.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-release-1.0-9.cm1.noarch.rpm -mariner-repos-1.0-9.cm1.noarch.rpm +mariner-repos-1.0-10.cm1.noarch.rpm +mariner-repos-preview-1.0-10.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm meson-0.49.2-1.cm1.noarch.rpm mpfr-4.0.1-3.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index b60f46796cd..17f17a58220 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -238,7 +238,8 @@ make-4.2.1-4.cm1.x86_64.rpm make-debuginfo-4.2.1-4.cm1.x86_64.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-release-1.0-9.cm1.noarch.rpm -mariner-repos-1.0-9.cm1.noarch.rpm +mariner-repos-1.0-10.cm1.noarch.rpm +mariner-repos-preview-1.0-10.cm1.noarch.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm meson-0.49.2-1.cm1.noarch.rpm mpfr-4.0.1-3.cm1.x86_64.rpm diff --git a/toolkit/resources/manifests/package/update_manifests.sh b/toolkit/resources/manifests/package/update_manifests.sh index c80f327ff3d..6b5a3ee3d2e 100755 --- a/toolkit/resources/manifests/package/update_manifests.sh +++ b/toolkit/resources/manifests/package/update_manifests.sh @@ -77,6 +77,7 @@ remove_packages_for_pkggen_core () { sed -i '/libxslt/d' $TmpPkgGen sed -i '/Linux-PAM/d' $TmpPkgGen sed -i '/lua-devel/d' $TmpPkgGen + sed -i '/mariner-repos-preview/d' $TmpPkgGen sed -i '/npth-[[:alpha:]]/d' $TmpPkgGen sed -i '/pcre-[0-9]/d' $TmpPkgGen sed -i '/pcre-devel/d' $TmpPkgGen