Merge pull request #2273 from microsoft/nicogbg/merge-1.0-dev-into-1.0

merge 1.0-dev into 1.0

Author: nicogbg

SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec

@@ -10,7 +10,7 @@
 Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
 Name:           grub2-efi-binary-signed-%{buildarch}
 Version:        2.06~rc1
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -54,6 +54,9 @@ cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/%{grubefiname}
 /boot/efi/EFI/BOOT/%{grubefiname}
 
 %changelog
+* Thu Feb 17 2022 Andrew Phelps <[email protected]> - 2.06~rc1-7
+- Bump release number to match grub release number
+
 * Tue Feb 08 2022 Chris Co <[email protected]> - 2.06~rc1-6
 - Bump release number to match grub release number
 

SPECS-SIGNED/kernel-signed/kernel-signed.spec

@@ -10,7 +10,7 @@
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
 Version:        5.10.93.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -147,6 +147,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %endif
 
 %changelog
+* Fri Feb 11 2022 Vince Perri <[email protected]> - 5.10.93.1-4
+- Bump release number to match kernel release
+
 * Wed Feb 09 2022 Rachel Menge <[email protected]> - 5.10.93.1-3
 - Bump release number to match kernel release
 

SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md

@@ -43,6 +43,7 @@
         "extra-cmake-modules",
         "fipscheck",
         "fuse-zip",
+        "gcovr",
         "gnu-efi",
         "graphviz",
         "hardening-check",

SPECS/LICENSES-AND-NOTICES/data/licenses.json

@@ -4,7 +4,7 @@
 Summary:        Kernel Audit Tool
 Name:           audit
 Version:        3.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Source0:        https://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha8.tar.gz
 Patch0:         refuse-manual-stop.patch
 License:        GPLv2+
@@ -170,6 +170,9 @@ make %{?_smp_mflags} check
 %{python3_sitelib}/*
 
 %changelog
+*   Fri Feb 18 2022 Thomas Crain <[email protected]> - 3.0-12
+-   Bump release to force rebuild with golang 1.16.14
+
 *   Fri Jan 21 2022 Nick Samson <[email protected]> - 3.0-11
 -   Removed libwrap support to remove dependency on finger
 *   Wed Jan 19 2022 Henry Li <[email protected]> - 3.0-10

SPECS/audit/audit.spec

@@ -1,7 +1,7 @@
 Summary:        FUSE adapter - Azure Storage Blobs
 Name:           blobfuse
 Version:        1.3.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 %{_bindir}/blobfuse
 
 %changelog
+* Fri Feb 18 2022 Thomas Crain <[email protected]> - 1.3.6-7
+- Bump release to force rebuild with golang 1.16.14
+
 * Wed Jan 19 2022 Henry Li <[email protected]> - 1.3.6-6
 - Increment release for force republishing using golang 1.16.12
 

SPECS/blobfuse/blobfuse.spec

@@ -14,7 +14,7 @@
 Summary:        User space components of the Ceph file system
 Name:           ceph
 Version:        16.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        LGPLv2 and LGPLv3 and CC-BY-SA and GPLv2 and Boost and BSD and MIT and Public Domain and GPLv3 and ASL-2.0
 URL:            https://ceph.io/
 Vendor:         Microsoft Corporation
@@ -779,7 +779,7 @@ This package provides Ceph’s default alerts for Prometheus.
 
 # Despite disabling diskprediction, some unpackaged files stick around
 # Delete directories to prevent these files from being built/installed later
-cd /usr/src/mariner/BUILD/%{name}-%{version}
+cd %{_topdir}/BUILD/%{name}-%{version}
 rm -rf ./src/pybind/mgr/diskprediction_local
 rm -rf ./src/pybind/mgr/diskprediction_cloud
 
@@ -1803,6 +1803,9 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+*   Thu Feb 17 2022 Andrew Phelps <[email protected]> 16.2.0-4
+-   Use _topdir instead of hard-coded value /usr/src/mariner
+
 *   Thu Jul 22 2021 Andrew Phelps <[email protected]> 16.2.0-3
 -   Set __os_install_post to reduce package size
 -   Remove duplicate line to disable debug_package

SPECS/ceph/ceph.spec

@@ -3,7 +3,7 @@
 Summary:        Container Network Interface (CNI) plugins
 Name:           cni
 Version:        0.9.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0
 URL:            https://github.com/containernetworking/plugins
 #Source0:       https://github.com/containernetworking/plugins/archive/refs/tags/v0.9.1.tar.gz
@@ -42,6 +42,9 @@ install -vpm 0755 -t %{buildroot}%{_default_cni_plugins_dir} bin/*
 %{_default_cni_plugins_dir}/*
 
 %changelog
+* Fri Feb 18 2022 Thomas Crain <[email protected]> - 0.9.1-4
+- Bump release to force rebuild with golang 1.16.14
+
 * Wed Jan 19 2022 Henry Li <[email protected]> - 0.9.1-3
 - Increment release for force republishing using golang 1.16.12
 

SPECS/cni/cni.spec

@@ -3,7 +3,7 @@
 Summary:        Fast and flexible DNS server
 Name:           coredns
 Version:        1.7.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        Apache License 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
 %{_bindir}/%{name}
 
 %changelog
+* Fri Feb 18 2022 Thomas Crain <[email protected]> - 1.7.0-7
+- Bump release to force rebuild with golang 1.16.14
+
 * Wed Jan 19 2022 Henry Li <[email protected]> - 1.7.0-6
 - Increment release for force republishing using golang 1.16.12
 

SPECS/coredns/coredns-1.7.0.spec

@@ -3,7 +3,7 @@
 Summary:        Fast and flexible DNS server
 Name:           coredns
 Version:        1.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        Apache License 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -61,6 +61,9 @@ rm -rf %{buildroot}/*
 %{_bindir}/%{name}
 
 %changelog
+* Fri Feb 18 2022 Thomas Crain <[email protected]> - 1.8.0-4
+- Bump release to force rebuild with golang 1.16.14
+
 * Wed Jan 19 2022 Henry Li <[email protected]> - 1.8.0-3
 - Increment release for force republishing using golang 1.16.12