Fix repo files to point to correct location (#1783)

* Fix repo files to point to correct location * Fix signatures, roll version, upgrade manifest * Fixed USE_PREVIEW_REPO flag for Mariner 2.0
microsoft · Dec 16, 2021 · b3629f5 · b3629f5
1 parent dd41374
commit b3629f5
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 40 deletions.
diff --git a/SPECS/mariner-release/mariner-release.spec b/SPECS/mariner-release/mariner-release.spec
@@ -1,7 +1,7 @@
 Summary:        CBL-Mariner release files
 Name:           mariner-release
 Version:        2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -26,7 +26,7 @@ cat > %{buildroot}%{_sysconfdir}/lsb-release <<- "EOF"
 DISTRIB_ID="Mariner"
 DISTRIB_RELEASE="%{mariner_release_version}"
 DISTRIB_CODENAME=Mariner
-DISTRIB_DESCRIPTION="CBL-Mariner %{mariner_release_version} Preview-A"
+DISTRIB_DESCRIPTION="CBL-Mariner %{mariner_release_version} Preview-B"
 EOF
 
 version_id=`echo %{mariner_release_version} | grep -o -E '[0-9]+.[0-9]+' | head -1`
@@ -45,11 +45,11 @@ EOF
 ln -sv ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
 
 cat > %{buildroot}%{_sysconfdir}/issue <<- EOF
-Welcome to CBL-Mariner %{mariner_release_version} Preview-A (%{_arch}) - Kernel \r (\l)
+Welcome to CBL-Mariner %{mariner_release_version} Preview-B (%{_arch}) - Kernel \r (\l)
 EOF
 
 cat > %{buildroot}%{_sysconfdir}/issue.net <<- EOF
-Welcome to CBL-Mariner %{mariner_release_version} Preview-A (%{_arch}) - Kernel %r (%t)
+Welcome to CBL-Mariner %{mariner_release_version} Preview-B (%{_arch}) - Kernel %r (%t)
 EOF
 
 %files
@@ -62,6 +62,9 @@ EOF
 %config(noreplace) %{_sysconfdir}/issue.net
 
 %changelog
+* Thu Dec 16 2021 Jon Slobodzian <[email protected]> - 2.0-3
+- CBL-Mariner 2.0 Public Preview Release version with fixed repo configuration files.
+
 * Mon Dec 13 2021 Jon Slobodzian <[email protected]> - 2.0-2
 - CBL-Mariner 2.0 Public Preview Release version.
 

diff --git a/SPECS/mariner-repos/mariner-debuginfo-preview.repo b/SPECS/mariner-repos/mariner-debuginfo-preview.repo
@@ -1,6 +1,6 @@
 [mariner-official-debuginfo-preview]
 name=CBL-Mariner Official Debuginfo Preview $releasever $basearch
-baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/debuginfo/$basearch
+baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/base/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

diff --git a/SPECS/mariner-repos/mariner-debuginfo.repo b/SPECS/mariner-repos/mariner-debuginfo.repo
@@ -1,6 +1,6 @@
 [mariner-official-debuginfo]
 name=CBL-Mariner Official Debuginfo $releasever $basearch
-baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/debuginfo/$basearch
+baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/base/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

diff --git a/SPECS/mariner-repos/mariner-official-preview.repo b/SPECS/mariner-repos/mariner-official-preview.repo
@@ -1,6 +1,6 @@
 [mariner-preview]
 name=CBL-Mariner Official Preview $releasever $basearch
-baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/update/$basearch
+baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/preview/base/$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

diff --git a/SPECS/mariner-repos/mariner-repos.signatures.json b/SPECS/mariner-repos/mariner-repos.signatures.json
@@ -2,15 +2,15 @@
  "Signatures": {
   "MICROSOFT-METADATA-GPG-KEY": "1824ecffeda90cfe4178a99bddde450f09fd40e8faf4f0124fba16ea79998c4c",
   "MICROSOFT-RPM-GPG-KEY": "1092f37ec429e58bf9c7f898df17c3c32eb2ce3c4c037afb8ffe2d2b42e16e89",
-  "mariner-debuginfo-preview.repo": "d7459bbc24f2c8d431d26b9eded48fdc88d5ca055082ac956dae601fc0068cea",
-  "mariner-debuginfo.repo": "dd411da6a92cec9f380375c8bf4ad480d19148090901af72f620aa9d21db1e3a",
+  "mariner-debuginfo-preview.repo": "29cb315de45902ba2455fe3ad61be04f21979db924dba8231c534346b4647739",
+  "mariner-debuginfo.repo": "30fa6120d3b0a11926f46151b0c0747dd05c63d82887383bd0dfece8e2cb41b8",
   "mariner-extended-preview.repo": "b7d5d89bb5ce1b1deade6c34aae8c9c9e62890eb235ac4a8557e5444a57b5ec9",
   "mariner-extended.repo": "fda0174a7e397ad730f73c27732b71ae1c5e8e44b7e15e5493545bf501a4e3c4",
   "mariner-extras-preview.repo": "81f54331c41562b551fc7979e24bba3a0fc3267101f0d8c2400afefe984df5c8",
   "mariner-extras.repo": "6f5c89b1f2c4df2126b0f0e5c367266ccad9b1dff410914cf5f2bce0767bc30a",
   "mariner-microsoft-preview.repo": "ba2b42f7f26ae904bd63cf02100f71ad75d0621d3628bc904d63b3a594474b0c",
   "mariner-microsoft.repo": "a20e69c50b51d297f807df2ac82c2813aa3d1fba0329885f38c739d37cac8c03",
   "mariner-official-base.repo": "8c9f409574e378a90196b2e626c6974565980abde294e27f4a64cddf0b41ecac",
-  "mariner-official-preview.repo": "a13a35cd29232dcb067e5a8824ca18a8307141426c28169524dd596264bdf50d"
+  "mariner-official-preview.repo": "db4d5a7df5a0e6876b60d06d06715b27ae87e3433ec51c98be16eefbe9375aaf"
  }
 }
diff --git 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:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -177,6 +177,9 @@ gpg --batch --yes --delete-keys 2BC94FFF7015A5F28F1537AD0CD9FED33135CE90
 %config(noreplace) %{_sysconfdir}/yum.repos.d/mariner-official-preview.repo
 
 %changelog
+* Thu Dec 16 2021 Jon Slobodzian <[email protected]> - 2.0-3
+- Corrected Repo URLS for 2.0.
+
 * Thu Dec 09 2021 Pawel Winogrodzki <[email protected]> - 2.0-2
 - Updating repo URLs for 2.0.
 - License verified.

diff --git a/toolkit/Makefile b/toolkit/Makefile
@@ -98,8 +98,8 @@ PACKAGE_URL_LIST   ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR
 SRPM_URL_LIST      ?= https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/prod/base/srpms
 
 ifeq ($(USE_PREVIEW_REPO),y)
-PACKAGE_URL_LIST   += https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/preview/update/$(build_arch)
-SRPM_URL_LIST      += https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/preview/update/srpms
+PACKAGE_URL_LIST   += https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/preview/base/$(build_arch)
+SRPM_URL_LIST      += https://packages.microsoft.com/cbl-mariner/$(RELEASE_MAJOR_ID)/preview/base/srpms
 endif
 
 REPO_LIST   ?=
@@ -125,7 +125,7 @@ endif
 RELEASE_VERSION    ?= $(RELEASE_MAJOR_ID)$(RELEASE_MINOR_ID)
 
 # Image tag - empty by default. Does not apply to the initrd.
-IMAGE_TAG          ?= Preview-A
+IMAGE_TAG          ?= Preview-B
 
 # panic,fatal,error,warn,info,debug,trace
 LOG_LEVEL          ?= info

diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@@ -62,7 +62,7 @@ findutils-lang-4.8.0-1.cm2.aarch64.rpm
 gettext-0.21-2.cm2.aarch64.rpm
 gzip-1.11-1.cm2.aarch64.rpm
 make-4.3-1.cm2.aarch64.rpm
-mariner-release-2.0-2.cm2.noarch.rpm
+mariner-release-2.0-3.cm2.noarch.rpm
 patch-2.7.6-7.cm2.aarch64.rpm
 util-linux-2.37.2-1.cm2.aarch64.rpm
 util-linux-devel-2.37.2-1.cm2.aarch64.rpm
@@ -217,7 +217,7 @@ npth-1.6-4.cm2.aarch64.rpm
 pinentry-1.2.0-1.cm2.aarch64.rpm
 gnupg2-2.3.3-1.cm2.aarch64.rpm
 gpgme-1.16.0-1.cm2.aarch64.rpm
-mariner-repos-preview-2.0-2.cm2.noarch.rpm
+mariner-repos-preview-2.0-3.cm2.noarch.rpm
 libffi-3.4.2-1.cm2.aarch64.rpm
 libffi-devel-3.4.2-1.cm2.aarch64.rpm
 libtasn1-4.14-3.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
@@ -62,7 +62,7 @@ findutils-lang-4.8.0-1.cm2.x86_64.rpm
 gettext-0.21-2.cm2.x86_64.rpm
 gzip-1.11-1.cm2.x86_64.rpm
 make-4.3-1.cm2.x86_64.rpm
-mariner-release-2.0-2.cm2.noarch.rpm
+mariner-release-2.0-3.cm2.noarch.rpm
 patch-2.7.6-7.cm2.x86_64.rpm
 util-linux-2.37.2-1.cm2.x86_64.rpm
 util-linux-devel-2.37.2-1.cm2.x86_64.rpm
@@ -217,7 +217,7 @@ npth-1.6-4.cm2.x86_64.rpm
 pinentry-1.2.0-1.cm2.x86_64.rpm
 gnupg2-2.3.3-1.cm2.x86_64.rpm
 gpgme-1.16.0-1.cm2.x86_64.rpm
-mariner-repos-preview-2.0-2.cm2.noarch.rpm
+mariner-repos-preview-2.0-3.cm2.noarch.rpm
 libffi-3.4.2-1.cm2.x86_64.rpm
 libffi-devel-3.4.2-1.cm2.x86_64.rpm
 libtasn1-4.14-3.cm2.x86_64.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -215,17 +215,17 @@ m4-debuginfo-1.4.19-1.cm2.aarch64.rpm
 make-4.3-1.cm2.aarch64.rpm
 make-debuginfo-4.3-1.cm2.aarch64.rpm
 mariner-check-macros-2.0-9.cm2.noarch.rpm
-mariner-release-2.0-2.cm2.noarch.rpm
-mariner-repos-2.0-2.cm2.noarch.rpm
-mariner-repos-debuginfo-2.0-2.cm2.noarch.rpm
-mariner-repos-debuginfo-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-extended-2.0-2.cm2.noarch.rpm
-mariner-repos-extended-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-extras-2.0-2.cm2.noarch.rpm
-mariner-repos-extras-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-microsoft-2.0-2.cm2.noarch.rpm
-mariner-repos-microsoft-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-preview-2.0-2.cm2.noarch.rpm
+mariner-release-2.0-3.cm2.noarch.rpm
+mariner-repos-2.0-3.cm2.noarch.rpm
+mariner-repos-debuginfo-2.0-3.cm2.noarch.rpm
+mariner-repos-debuginfo-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-extended-2.0-3.cm2.noarch.rpm
+mariner-repos-extended-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-extras-2.0-3.cm2.noarch.rpm
+mariner-repos-extras-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-microsoft-2.0-3.cm2.noarch.rpm
+mariner-repos-microsoft-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-preview-2.0-3.cm2.noarch.rpm
 mariner-rpm-macros-2.0-9.cm2.noarch.rpm
 meson-0.60.2-1.cm2.noarch.rpm
 mpfr-4.1.0-1.cm2.aarch64.rpm

diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@@ -215,17 +215,17 @@ m4-debuginfo-1.4.19-1.cm2.x86_64.rpm
 make-4.3-1.cm2.x86_64.rpm
 make-debuginfo-4.3-1.cm2.x86_64.rpm
 mariner-check-macros-2.0-9.cm2.noarch.rpm
-mariner-release-2.0-2.cm2.noarch.rpm
-mariner-repos-2.0-2.cm2.noarch.rpm
-mariner-repos-debuginfo-2.0-2.cm2.noarch.rpm
-mariner-repos-debuginfo-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-extended-2.0-2.cm2.noarch.rpm
-mariner-repos-extended-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-extras-2.0-2.cm2.noarch.rpm
-mariner-repos-extras-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-microsoft-2.0-2.cm2.noarch.rpm
-mariner-repos-microsoft-preview-2.0-2.cm2.noarch.rpm
-mariner-repos-preview-2.0-2.cm2.noarch.rpm
+mariner-release-2.0-3.cm2.noarch.rpm
+mariner-repos-2.0-3.cm2.noarch.rpm
+mariner-repos-debuginfo-2.0-3.cm2.noarch.rpm
+mariner-repos-debuginfo-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-extended-2.0-3.cm2.noarch.rpm
+mariner-repos-extended-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-extras-2.0-3.cm2.noarch.rpm
+mariner-repos-extras-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-microsoft-2.0-3.cm2.noarch.rpm
+mariner-repos-microsoft-preview-2.0-3.cm2.noarch.rpm
+mariner-repos-preview-2.0-3.cm2.noarch.rpm
 mariner-rpm-macros-2.0-9.cm2.noarch.rpm
 meson-0.60.2-1.cm2.noarch.rpm
 mpfr-4.1.0-1.cm2.x86_64.rpm