Merge pull request #413 from microsoft/nicogbg/November-Monthly-Release

Nicogbg/november monthly release
microsoft · Nov 24, 2020 · bcfd58c · bcfd58c
2 parents 4967c2d + 3525f42
commit bcfd58c
Show file tree

Hide file tree

Showing 301 changed files with 19,025 additions and 5,324 deletions.
diff --git a/.github/workflows/lint-specs.yml b/.github/workflows/lint-specs.yml
@@ -77,19 +77,23 @@ jobs:
       # Set continue-on-error to true if we're blocking too many PRs here
       # We don't want this tool to have a low signal-to-noise ratio
       - name: Lint changed spec files
-        continue-on-error: true
         run: |
-          mkdir -p linted_specs
-          spec-cleaner -o linted_specs ${{ env.updated-specs }}
-          [ -n "$(ls -A linted_specs)" ] \
-          && echo "Specs are not correctly formatted." \
-          && echo "The linted_specs artifact contains linted versions of the specs you're checking in." \
-          && echo "Please properly format your specs according to that output before merging." \
-          && exit 1
+          touch linted_specs.diff
+          spec-cleaner -d --diff-prog="git --no-pager diff" ${{ env.updated-specs }} | tee linted_specs.diff
+          if [ -s linted_specs.diff ]
+          then
+            echo -e "\n====================== LINTING FAILED ======================"
+            echo "Specs are not correctly formatted."
+            echo "A diff of the changes required is printed above."
+            echo "Linting output is available in the linted_specs artifact."
+            echo "Please properly format your specs according to the output before merging."
+            exit 1
+          fi
+          exit 0
 
       - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
         with:
           name: linted_specs
-          path: linted_specs
+          path: linted_specs.diff
           if-no-files-found: ignore
-          if: always()
diff --git a/.github/workflows/quickstart.yml → .github/workflows/quickstart_1.0.yml b/.github/workflows/quickstart.yml → .github/workflows/quickstart_1.0.yml
@@ -3,15 +3,15 @@
 #
 # Workflow to automatedly verify the quickstart instructions
 
-name: Verify Quickstart
+name: Verify Quickstart 1.0
 
 on:
   workflow_dispatch:
   schedule:
     - cron: "0 15 * * *"
 
 jobs:
-  iso_quickstart:
+  get_input-srpms:
     runs-on: ubuntu-18.04
 
     steps:
@@ -32,13 +32,34 @@ jobs:
         sudo apt-get update
         sudo apt -y install make tar wget curl rpm qemu-utils genisoimage pigz
 
-    - name: Configure the Environment
+    - name: Download SRPMS
       run: |
         pushd toolkit
         sudo make go-tools REBUILD_TOOLS=y
         sudo make input-srpms DOWNLOAD_SRPMS=y
         popd
 
+  iso_quickstart:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout
+      uses: actions/[email protected]
+      with:
+        ref: '1.0-stable'
+
+    - name: Set up Go 1.13
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.13
+      id: go
+
+    - name: Install Remaining Prerequisites
+      run: |
+        # Golang and docker are already installed on the agent
+        sudo apt-get update
+        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage pigz
+
     - name: ISO Quick Start
       run: |
         pushd toolkit
@@ -66,13 +87,6 @@ jobs:
         sudo apt-get update
         sudo apt -y install make tar wget curl rpm qemu-utils genisoimage pigz
 
-    - name: Configure Environment
-      run: |
-        pushd toolkit
-        sudo make go-tools REBUILD_TOOLS=y
-        sudo make input-srpms DOWNLOAD_SRPMS=y
-        popd
-
     - name: VHDX Quick Start
       run: |
         pushd toolkit

diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
 # CBL-Mariner
 
+| Release Branch | Status                                                                                                                                                                                                 |
+| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| 1.0            | [![1.0 Status](https://github.com/microsoft/CBL-Mariner/workflows/Verify%20Quickstart%201.0/badge.svg)](https://github.com/microsoft/CBL-Mariner/actions?query=workflow%3A%22Verify+Quickstart+1.0%22) |
+
 CBL-Mariner is an internal Linux distribution for Microsoft’s cloud infrastructure and edge products and services. CBL-Mariner is designed to provide a consistent platform for these devices and services and will enhance Microsoft’s ability to stay current on Linux updates. This initiative is part of Microsoft’s increasing investment in a wide range of Linux technologies, such as [SONiC](https://azure.microsoft.com/en-us/blog/sonic-the-networking-switch-software-that-powers-the-microsoft-global-cloud/), [Azure Sphere OS](https://docs.microsoft.com/en-us/azure-sphere/product-overview/what-is-azure-sphere) and [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/en-us/windows/wsl/about). CBL-Mariner is being shared publicly as part of Microsoft’s commitment to Open Source and to contribute back to the Linux community. CBL-Mariner does not change our approach or commitment to any existing third-party Linux distribution offerings. 
 
 CBL-Mariner has been engineered with the notion that a small common core set of packages can address the universal needs of first party cloud and edge services while allowing individual teams to layer additional packages on top of the common core to produce images for their workloads. This is made possible by a simple build system that enables:

diff --git a/SPECS-SIGNED/grub2-efi-binary-signed-aarch64/grub2-efi-binary-signed-aarch64.spec b/SPECS-SIGNED/grub2-efi-binary-signed-aarch64/grub2-efi-binary-signed-aarch64.spec
@@ -2,12 +2,11 @@
 Summary:        Signed GRand Unified Bootloader for aarch64 systems
 Name:           grub2-efi-binary-signed-aarch64
 Version:        2.02
-Release:        24%{?dist}
-URL:            https://www.gnu.org/software/grub
+Release:        25%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-
+URL:            https://www.gnu.org/software/grub
 # This package's "version" and "release" must reflect the unsigned version that
 # was signed.
 # An important consequence is that when making a change to this package, the
@@ -22,10 +21,8 @@ Distribution:   Mariner
 #   4. Build this spec
 Source0:        grub2-efi-unsigned-%{version}-%{release}.aarch64.rpm
 Source1:        grubaa64.efi
-
-ExclusiveArch:  aarch64
-
 Conflicts:      grub2-efi-binary
+ExclusiveArch:  aarch64
 
 %description
 This package contains the GRUB EFI image signed for secure boot. The package is
@@ -43,5 +40,8 @@ cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/grubaa64.efi
 /boot/efi/EFI/BOOT/grubaa64.efi
 
 %changelog
+* Tue Nov 03 2020 Pawel Winogrodzki <[email protected]> - 2.02-25
+- Updating release to be aligned with the unsigned bits.
+
 * Thu Aug 13 2020 Chris Co <[email protected]> 2.02-24
-- Original version for CBL-Mariner.
+- Original version for CBL-Mariner.
diff --git a/SPECS-SIGNED/grub2-efi-binary-signed-x64/grub2-efi-binary-signed-x64.spec b/SPECS-SIGNED/grub2-efi-binary-signed-x64/grub2-efi-binary-signed-x64.spec
@@ -2,12 +2,11 @@
 Summary:        Signed GRand Unified Bootloader for x86_64 systems
 Name:           grub2-efi-binary-signed-x64
 Version:        2.02
-Release:        24%{?dist}
-URL:            https://www.gnu.org/software/grub
+Release:        25%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-
+URL:            https://www.gnu.org/software/grub
 # This package's "version" and "release" must reflect the unsigned version that
 # was signed.
 # An important consequence is that when making a change to this package, the
@@ -22,10 +21,8 @@ Distribution:   Mariner
 #   4. Build this spec
 Source0:        grub2-efi-unsigned-%{version}-%{release}.x86_64.rpm
 Source1:        grubx64.efi
-
-ExclusiveArch:  x86_64
-
 Conflicts:      grub2-efi-binary
+ExclusiveArch:  x86_64
 
 %description
 This package contains the GRUB EFI image signed for secure boot. The package is
@@ -43,5 +40,8 @@ cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/grubx64.efi
 /boot/efi/EFI/BOOT/grubx64.efi
 
 %changelog
+* Tue Nov 03 2020 Pawel Winogrodzki <[email protected]> - 2.02-25
+- Updating release to be aligned with the unsigned bits.
+
 * Thu Aug 13 2020 Chris Co <[email protected]> 2.02-24
-- Original version for CBL-Mariner.
+- Original version for CBL-Mariner.
diff --git a/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec b/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
@@ -1,14 +1,14 @@
 %global debug_package %{nil}
+%define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for aarch64 systems
 Name:           kernel-signed-aarch64
-Version:        5.4.51
-Release:        11%{?dist}
+Version:        5.4.72
+Release:        3%{?dist}
 License:        GPLv2
-URL:            https://github.com/microsoft/WSL2-Linux-Kernel
-Group:          System Environment/Kernel
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-
+Group:          System Environment/Kernel
+URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 # This package's "version" and "release" must reflect the unsigned version that
 # was signed.
 # An important consequence is that when making a change to this package, the
@@ -23,18 +23,13 @@ Distribution:   Mariner
 #   4. Build this spec
 Source0:        kernel-%{version}-%{release}.aarch64.rpm
 Source1:        vmlinuz-%{version}-%{release}
-
-ExclusiveArch:  aarch64
-
 BuildRequires:  cpio
 Requires:       filesystem
 Requires:       kmod
 Requires(post): coreutils
 Requires(postun): coreutils
-
 Conflicts:      kernel
-
-%define uname_r %{version}-%{release}
+ExclusiveArch:  aarch64
 
 %description
 This package contains the Linux kernel package with kernel signed with the production key
@@ -85,29 +80,51 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
 
 %changelog
-*   Fri Oct 16 2020 Suresh Babu Chalamalasetty <[email protected]> 5.4.51-11
--   Update release number
-*   Fri Oct 02 2020 Chris Co <[email protected]> 5.4.51-10
--   Update release number to match kernel spec
-*   Fri Oct 02 2020 Chris Co <[email protected]> 5.4.51-9
--   Update release number
-*   Wed Sep 30 2020 Emre Girgin <[email protected]> 5.4.51-8
--   Update postun script to deal with removal in case of another installed kernel.
-*   Fri Sep 25 2020 Suresh Babu Chalamalasetty <[email protected]> 5.4.51-7
--   Update release number
-*   Wed Sep 23 2020 Daniel McIlvaney <[email protected]> 5.4.51-6
--   Update release number
-*   Thu Sep 03 2020 Daniel McIlvaney <[email protected]> 5.4.51-5
--   Update release number
-*   Thu Sep 03 2020 Chris Co <[email protected]> 5.4.51-4
--   Update release number
-*   Thu Sep 03 2020 Chris Co <[email protected]> 5.4.51-3
--   Add missing requires
-*   Tue Sep 01 2020 Chris Co <[email protected]> 5.4.51-2
--   Update release number
-*   Wed Aug 19 2020 Chris Co <[email protected]> 5.4.51-1
--   Update source to 5.4.51
-*   Wed Aug 19 2020 Chris Co <[email protected]> 5.4.42-12
--   Update release number
-*   Tue Aug 18 2020 Chris Co <[email protected]> 5.4.42-11
--   Original version for CBL-Mariner.
+* Mon Nov 16 2020 Suresh Babu Chalamalasetty <[email protected]> - 5.4.72-3
+- Update release number
+
+* Tue Nov 10 2020 Suresh Babu Chalamalasetty <[email protected]> - 5.4.72-2
+- Update release number
+
+* Mon Oct 26 2020 Chris Co <[email protected]> - 5.4.72-1
+- Update source to 5.4.72
+- Lint spec
+
+* Fri Oct 16 2020 Suresh Babu Chalamalasetty <[email protected]> - 5.4.51-11
+- Update release number
+
+* Fri Oct 02 2020 Chris Co <[email protected]> - 5.4.51-10
+- Update release number to match kernel spec
+
+* Fri Oct 02 2020 Chris Co <[email protected]> - 5.4.51-9
+- Update release number
+
+* Wed Sep 30 2020 Emre Girgin <[email protected]> - 5.4.51-8
+- Update postun script to deal with removal in case of another installed kernel.
+
+* Fri Sep 25 2020 Suresh Babu Chalamalasetty <[email protected]> - 5.4.51-7
+- Update release number
+
+* Wed Sep 23 2020 Daniel McIlvaney <[email protected]> - 5.4.51-6
+- Update release number
+
+* Thu Sep 03 2020 Daniel McIlvaney <[email protected]> - 5.4.51-5
+- Update release number
+
+* Thu Sep 03 2020 Chris Co <[email protected]> - 5.4.51-4
+- Update release number
+
+* Thu Sep 03 2020 Chris Co <[email protected]> - 5.4.51-3
+- Add missing requires
+
+* Tue Sep 01 2020 Chris Co <[email protected]> - 5.4.51-2
+- Update release number
+
+* Wed Aug 19 2020 Chris Co <[email protected]> - 5.4.51-1
+- Update source to 5.4.51
+
+* Wed Aug 19 2020 Chris Co <[email protected]> - 5.4.42-12
+- Update release number
+
+* Tue Aug 18 2020 Chris Co <[email protected]> - 5.4.42-11
+- Original version for CBL-Mariner.