Merge branch '1.0-dev' into 1.0

Author: jslobodzian

SPECS/core-packages/core-packages.spec

@@ -1,7 +1,7 @@
 Summary:        Metapackage with core sets of packages
 Name:           core-packages
 Version:        0.1
-Release:        26%{?dist}
+Release:        27%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -41,7 +41,7 @@ Requires:       which
 %{summary}
 
 %package        container
-Summary:        Metapackage to install the basic set of packages used all image types.
+Summary:        Metapackage to install the basic set of packages used by all image types.
 Requires:       bash
 Requires:       bzip2
 Requires:       ca-certificates-base
@@ -69,6 +69,7 @@ Requires:       nss-libs
 Requires:       openssl
 Requires:       pkg-config
 Requires:       readline
+Requires:       rpm
 Requires:       rpm-libs
 Requires:       sed
 Requires:       sqlite-libs
@@ -95,6 +96,9 @@ Requires:       zlib
 %files container
 
 %changelog
+* Tue Dec 20 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.1-27
+- Making sure 'rpm' is always part of the base image.
+
 * Wed Dec 15 2021 Chris Co <chrco@microsoft.com> - 0.1-26
 - Remove check-restart and dnf-automatic from core set of packages
 

SPECS/mariner-release/mariner-release.spec

@@ -1,7 +1,7 @@
 Summary:       CBL-Mariner release files
 Name:          mariner-release
 Version:       1.0
-Release:       51%{?dist}
+Release:       52%{?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
+*   Mon Dec 19 2022 Jon Slobodzian <joslobo@microsoft.com> - 1.0-52
+-   Updating version for December update 3.
 *   Mon Dec 12 2022 Jon Slobodzian <joslobo@microsoft.com> - 1.0-51
 -   Updating version for December update 2.
 *   Thu Dec 01 2022 Jon Slobodzian <joslobo@microsoft.com> - 1.0-50

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.12-1.cm1.aarch64.rpm
 make-4.2.1-5.cm1.aarch64.rpm
-mariner-release-1.0-51.cm1.noarch.rpm
+mariner-release-1.0-52.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.12-1.cm1.x86_64.rpm
 make-4.2.1-5.cm1.x86_64.rpm
-mariner-release-1.0-51.cm1.noarch.rpm
+mariner-release-1.0-52.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-51.cm1.noarch.rpm
+mariner-release-1.0-52.cm1.noarch.rpm
 mariner-repos-1.0-16.cm1.noarch.rpm
 mariner-repos-extras-1.0-16.cm1.noarch.rpm
 mariner-repos-extras-preview-1.0-16.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-51.cm1.noarch.rpm
+mariner-release-1.0-52.cm1.noarch.rpm
 mariner-repos-1.0-16.cm1.noarch.rpm
 mariner-repos-extras-1.0-16.cm1.noarch.rpm
 mariner-repos-extras-preview-1.0-16.cm1.noarch.rpm