Merge branch '1.0-dev' into 1.0

Author: jslobodzian

SPECS/mariner-release/mariner-release.spec

@@ -1,7 +1,7 @@
 Summary:       CBL-Mariner release files
 Name:          mariner-release
 Version:       1.0
-Release:       39%{?dist}
+Release:       40%{?dist}
 License:       MIT
 Group:         System Environment/Base
 URL:           https://aka.ms/cbl-mariner
@@ -67,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/issue.net
 
 %changelog
+*   Fri May 20 2022 Jon Slobodzian <[email protected]> - 1.0-40
+-   Updating version for May update.
 *   Sat Apr 09 2022 Jon Slobodzian <[email protected]> - 1.0-39
 -   Updating version for April update.
 *   Wed Mar 30 2022 Jon Slobodzian <[email protected]> - 1.0-38

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -58,7 +58,7 @@ findutils-lang-4.6.0-8.cm1.aarch64.rpm
 gettext-0.19.8.1-5.cm1.aarch64.rpm
 gzip-1.9-5.cm1.aarch64.rpm
 make-4.2.1-5.cm1.aarch64.rpm
-mariner-release-1.0-39.cm1.noarch.rpm
+mariner-release-1.0-40.cm1.noarch.rpm
 patch-2.7.6-7.cm1.aarch64.rpm
 util-linux-2.32.1-7.cm1.aarch64.rpm
 util-linux-devel-2.32.1-7.cm1.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -58,7 +58,7 @@ findutils-lang-4.6.0-8.cm1.x86_64.rpm
 gettext-0.19.8.1-5.cm1.x86_64.rpm
 gzip-1.9-5.cm1.x86_64.rpm
 make-4.2.1-5.cm1.x86_64.rpm
-mariner-release-1.0-39.cm1.noarch.rpm
+mariner-release-1.0-40.cm1.noarch.rpm
 patch-2.7.6-7.cm1.x86_64.rpm
 util-linux-2.32.1-7.cm1.x86_64.rpm
 util-linux-devel-2.32.1-7.cm1.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -259,7 +259,7 @@ m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
 make-4.2.1-5.cm1.aarch64.rpm
 make-debuginfo-4.2.1-5.cm1.aarch64.rpm
 mariner-check-macros-1.0-8.cm1.noarch.rpm
-mariner-release-1.0-39.cm1.noarch.rpm
+mariner-release-1.0-40.cm1.noarch.rpm
 mariner-repos-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-preview-1.0-14.cm1.noarch.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -259,7 +259,7 @@ m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
 make-4.2.1-5.cm1.x86_64.rpm
 make-debuginfo-4.2.1-5.cm1.x86_64.rpm
 mariner-check-macros-1.0-8.cm1.noarch.rpm
-mariner-release-1.0-39.cm1.noarch.rpm
+mariner-release-1.0-40.cm1.noarch.rpm
 mariner-repos-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-1.0-14.cm1.noarch.rpm
 mariner-repos-extras-preview-1.0-14.cm1.noarch.rpm