Bump mariner 2.0 Release number for preview F Image (#2631)

* Update Mariner 2.0 Release

* Makefile

SPECS/mariner-release/mariner-release.spec

@@ -1,7 +1,7 @@
 Summary:        CBL-Mariner release files
 Name:           mariner-release
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?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-E"
+DISTRIB_DESCRIPTION="CBL-Mariner %{mariner_release_version} Preview-F"
 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-E (%{_arch}) - Kernel \r (\l)
+Welcome to CBL-Mariner %{mariner_release_version} Preview-F (%{_arch}) - Kernel \r (\l)
 EOF
 
 cat > %{buildroot}%{_sysconfdir}/issue.net <<- EOF
-Welcome to CBL-Mariner %{mariner_release_version} Preview-E (%{_arch}) - Kernel %r (%t)
+Welcome to CBL-Mariner %{mariner_release_version} Preview-F (%{_arch}) - Kernel %r (%t)
 EOF
 
 %files
@@ -62,6 +62,9 @@ EOF
 %config(noreplace) %{_sysconfdir}/issue.net
 
 %changelog
+* Wed Mar 30 2022 Jon Slobodzian <joslobo@microsoft.com> - 2.0-8
+- Updating version for Preview-F Release.
+
 * Fri Mar 4 2022 Jon Slobodzian <joslobo@microsoft.com> - 2.0-7
 - Updating version for Preview-E Release
 

toolkit/Makefile

@@ -138,7 +138,7 @@ endif
 RELEASE_VERSION    ?= $(RELEASE_MAJOR_ID)$(RELEASE_MINOR_ID)
 
 # Image tag - empty by default. Does not apply to the initrd.
-IMAGE_TAG          ?= Preview-E
+IMAGE_TAG          ?= Preview-F
 
 # panic,fatal,error,warn,info,debug,trace
 LOG_LEVEL          ?= info

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -63,7 +63,7 @@ findutils-lang-4.8.0-3.cm2.aarch64.rpm
 gettext-0.21-2.cm2.aarch64.rpm
 gzip-1.11-1.cm2.aarch64.rpm
 make-4.3-2.cm2.aarch64.rpm
-mariner-release-2.0-7.cm2.noarch.rpm
+mariner-release-2.0-8.cm2.noarch.rpm
 patch-2.7.6-7.cm2.aarch64.rpm
 util-linux-2.37.2-4.cm2.aarch64.rpm
 util-linux-devel-2.37.2-4.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -63,7 +63,7 @@ findutils-lang-4.8.0-3.cm2.x86_64.rpm
 gettext-0.21-2.cm2.x86_64.rpm
 gzip-1.11-1.cm2.x86_64.rpm
 make-4.3-2.cm2.x86_64.rpm
-mariner-release-2.0-7.cm2.noarch.rpm
+mariner-release-2.0-8.cm2.noarch.rpm
 patch-2.7.6-7.cm2.x86_64.rpm
 util-linux-2.37.2-4.cm2.x86_64.rpm
 util-linux-devel-2.37.2-4.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -220,7 +220,7 @@ m4-debuginfo-1.4.19-1.cm2.aarch64.rpm
 make-4.3-2.cm2.aarch64.rpm
 make-debuginfo-4.3-2.cm2.aarch64.rpm
 mariner-check-macros-2.0-13.cm2.noarch.rpm
-mariner-release-2.0-7.cm2.noarch.rpm
+mariner-release-2.0-8.cm2.noarch.rpm
 mariner-repos-2.0-5.cm2.noarch.rpm
 mariner-repos-debug-2.0-5.cm2.noarch.rpm
 mariner-repos-debug-preview-2.0-5.cm2.noarch.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -220,7 +220,7 @@ m4-debuginfo-1.4.19-1.cm2.x86_64.rpm
 make-4.3-2.cm2.x86_64.rpm
 make-debuginfo-4.3-2.cm2.x86_64.rpm
 mariner-check-macros-2.0-13.cm2.noarch.rpm
-mariner-release-2.0-7.cm2.noarch.rpm
+mariner-release-2.0-8.cm2.noarch.rpm
 mariner-repos-2.0-5.cm2.noarch.rpm
 mariner-repos-debug-2.0-5.cm2.noarch.rpm
 mariner-repos-debug-preview-2.0-5.cm2.noarch.rpm