Skip to content

[2.0] Update kernel, kernel-hci, kernel-azure BuildRequires to include cpio#6811

Merged
rlmenge merged 1 commit intomainfrom
rlmenge/main/kernel/cpio
Nov 21, 2023
Merged

[2.0] Update kernel, kernel-hci, kernel-azure BuildRequires to include cpio#6811
rlmenge merged 1 commit intomainfrom
rlmenge/main/kernel/cpio

Conversation

@rlmenge
Copy link
Copy Markdown
Contributor

@rlmenge rlmenge commented Nov 20, 2023

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

When testing kernel builds in the latest Mariner 2.0 container, it was noted that the list of kernel's BuildRequires is missing cpio. The container (unlike our core images used in VMs) does not include "cpio" by default as defined in core-package.spec. This led to kheaders errors. Therefore, add as a buildRequires.

Change Log
  • Update kernel, kernel-hci, kernel-azure BuildRequires to include cpio
Does this affect the toolchain?

YES

Associated issues
Test Methodology
sudo docker run -it --rm --pull=always mcr.microsoft.com/cbl-mariner/base/core:2.0

# install all listed BRs
tdnf install -y audit-devel bash bc build-essential diffutils dwarves elfutils-libelf-devel flex gettext glib-devel kbd kmod-devel libcap-devel libdnet-devel libmspack-devel openssl openssl-devel pam-devel procps-ng-devel python3-devel sed pciutils-devel wget tar

wget --no-check-certificate https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/refs/tags/rolling-lts/mariner-2/5.15.136.1.tar.gz

tar -xvf 5.15.136.1.tar.gz

cd CBL-Mariner-Linux-Kernel-rolling-lts-mariner-2-5.15.136.1

cp config .config

make LC_ALL= ARCH=x86_64 oldconfig
make VERBOSE=1 -j$(nproc) 2>&1 | tee kernel-build.log

@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Nov 20, 2023
@rlmenge rlmenge changed the title [2.0] Update kernel BuildRequires to include cpio [2.0] Update kernel, kernel-hci, kernel-azure BuildRequires to include cpio Nov 20, 2023
@rlmenge rlmenge marked this pull request as ready for review November 20, 2023 20:06
@rlmenge rlmenge requested review from a team as code owners November 20, 2023 20:06
@rlmenge rlmenge merged commit 1f4f655 into main Nov 21, 2023
@rlmenge rlmenge deleted the rlmenge/main/kernel/cpio branch November 21, 2023 05:10
gmileka pushed a commit that referenced this pull request Dec 7, 2023
…#6811)

When testing kernel builds in the latest Mariner 2.0 container, it was noted that the list of kernel's BuildRequires is missing cpio. The container (unlike our core images used in VMs) does not include "cpio" by default as defined in core-package.spec. This led to kheaders errors. Therefore, add as a buildRequires.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants