Merge pull request #1759 from microsoft/joslobo/prepare-mariner-release-preview

Create preview release version, change default repos
2021-12-13 20:22:47 -08:00 · 2021-12-13 20:22:47 -08:00 · 1ef159b1ad
parent eb52de4ac7 0f15982c34
commit 1ef159b1ad
9 changed files with 24 additions and 18 deletions
--- a/SPECS/core-packages/core-packages.spec
+++ b/SPECS/core-packages/core-packages.spec
@ -1,7 +1,7 @@
 Summary:        Metapackage with core sets of packages
 Name:           core-packages
-Version:        0.1
-Release:        23%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -55,10 +55,12 @@ Requires:       gzip
 Requires:       libtool
 Requires:       lz4
 Requires:       mariner-release
-Requires:       mariner-repos
+Requires:       mariner-repos-preview
+Requires:       mariner-repos-extended-preview
+Requires:       mariner-repos-extras-preview
 %ifarch x86_64
 # Temporarily exclude aarch64 from including the microsoft repo until content is available in the repo
-Requires:       mariner-repos-microsoft
+Requires:       mariner-repos-microsoft-preview
 %endif
 Requires:       mariner-rpm-macros
 Requires:       ncurses-libs
@ -94,6 +96,9 @@ Requires:       zlib
 %files container

 %changelog
+* Mon Dec 13 2021 Jon Slobodzian <joslobo@microsoft.com> - 2.0-1
+- Update core-package to include new repositories for default Mariner 2.0 Preview Images
+
 * Sat Jul 24 2021 Jon Slobodzian <joslobo@microsoft.com> - 0.1-23
 - Include new Microsoft repo for x86_64 architectures (temporarily exclude from aarch64)

--- 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:        1%{?dist}
+Release:        2%{?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}"
+DISTRIB_DESCRIPTION="CBL-Mariner %{mariner_release_version} Preview-A"
 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} (%{_arch}) - Kernel \r (\l)
+Welcome to CBL-Mariner %{mariner_release_version} Preview-A (%{_arch}) - Kernel \r (\l)
 EOF

 cat > %{buildroot}%{_sysconfdir}/issue.net <<- EOF
-Welcome to CBL-Mariner %{mariner_release_version} (%{_arch}) - Kernel %r (%t)
+Welcome to CBL-Mariner %{mariner_release_version} Preview-A (%{_arch}) - Kernel %r (%t)
 EOF

 %files
@ -62,6 +62,9 @@ EOF
 %config(noreplace) %{_sysconfdir}/issue.net

 %changelog
+* Mon Dec 13 2021 Jon Slobodzian <joslobo@microsoft.com> - 2.0-2
+- CBL-Mariner 2.0 Public Preview Release version.
+
 * Thu Jul 29 2021 Jon Slobodzian <joslobo@microsoft.com> - 2.0-1
 - Updating version and distrotag for future looking 2.0 branch.  Formatting fixes.
 - Remove %%clean section, buildroot cleaning step (both automatically done by RPM)
--- a/SPECS/mariner-repos/mariner-official-base.repo
+++ b/SPECS/mariner-repos/mariner-official-base.repo
@ -4,6 +4,6 @@ baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/base/$basear
 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
+enabled=0
 skip_if_unavailable=True
 sslverify=1
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@ -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          ?=
+IMAGE_TAG          ?= Preview-A

 # panic,fatal,error,warn,info,debug,trace
 LOG_LEVEL          ?= info
--- 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-1.cm2.noarch.rpm
+mariner-release-2.0-2.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,6 @@ 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-2.0-2.cm2.noarch.rpm
 mariner-repos-preview-2.0-2.cm2.noarch.rpm
 libffi-3.4.2-1.cm2.aarch64.rpm
 libffi-devel-3.4.2-1.cm2.aarch64.rpm
--- 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-1.cm2.noarch.rpm
+mariner-release-2.0-2.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,6 @@ 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-2.0-2.cm2.noarch.rpm
 mariner-repos-preview-2.0-2.cm2.noarch.rpm
 libffi-3.4.2-1.cm2.x86_64.rpm
 libffi-devel-3.4.2-1.cm2.x86_64.rpm
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@ -215,7 +215,7 @@ 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-1.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
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@ -215,7 +215,7 @@ 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-1.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
--- a/toolkit/resources/manifests/package/update_manifests.sh
+++ b/toolkit/resources/manifests/package/update_manifests.sh
@ -79,7 +79,7 @@ remove_packages_for_pkggen_core () {
    sed -i '/libxslt/d' $TmpPkgGen
    sed -i '/Linux-PAM/d' $TmpPkgGen
    sed -i '/lua-devel/d' $TmpPkgGen
-    sed -ri '/mariner-repos-(extras|ui|microsoft)/d' $TmpPkgGen
+    sed -ri '/mariner-repos-(debuginfo|extended|extras|microsoft)/d' $TmpPkgGen
    sed -i '/npth-[[:alpha:]]/d' $TmpPkgGen
    sed -i '/pcre-devel/d' $TmpPkgGen
    sed -i '/perl-5/d' $TmpPkgGen
@ -283,7 +283,7 @@ generate_pkggen_core () {
        grep "^pinentry-" $TmpPkgGen
        grep "^gnupg2-" $TmpPkgGen
        grep "^gpgme-" $TmpPkgGen
-        grep "^mariner-repos-" $TmpPkgGen
+        grep "^mariner-repos-preview" $TmpPkgGen
        grep "^libffi-" $TmpPkgGen
        grep "^libtasn1-" $TmpPkgGen
        grep "^p11-kit-" $TmpPkgGen