Skip to content

[CIQ 6.12] Rebase to v6.12.21 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 7, 2025
Merged

[CIQ 6.12] Rebase to v6.12.21 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e1c83e0
Add CIQ configs
PlaidCat Mar 25, 2025
69800e2
github actions: Make Builds on Merge Request Work
PlaidCat Jan 16, 2025
021ca4b
arm64: add kernel config option to lock down when in Secure Boot mode
Aug 30, 2016
f0fe03f
efi: Add an EFI_SECURE_BOOT flag to indicate secure boot mode
dhowells Feb 18, 2019
1a80af3
efi: Lock down the kernel if booted in secure boot mode
bwhacks Sep 10, 2019
4d31965
mtd: phram,slram: Disable when the kernel is locked down
bwhacks Aug 30, 2019
50960d3
Add efi_status_to_str() and rework efi_status_to_err().
vathpela Oct 2, 2017
b039e8f
[CIQ] Arm Lockdown Config Enablement
PlaidCat Apr 1, 2025
b3b43b6
[CIQ] Refresh Configs after making modifications
PlaidCat Apr 2, 2025
9218707
[CIQ] v6.12.17 config updates
PlaidCat Apr 3, 2025
33267b4
[CIQ] v6.12.19 - rebased configs
PlaidCat Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/build-check_aarch64-64k-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: aarch64-64k-debug CI
on:
pull_request:
branches:
- '**'
- '!mainline'

jobs:
kernel-build-job:
runs-on:
labels: kernel-build-arm64
container:
image: rockylinux:9
env:
ROCKY_ENV: rocky9
ports:
- 80
options: --cpus 8
steps:
- name: Install tools and Libraries
run: |
dnf groupinstall 'Development Tools' -y
dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
- name: Checkout code
uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.head.sha }}"
fetch-depth: 0
- name: Build the Kernel
run: |
git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
cp ciq/configs/kernel-aarch64-64k-debug.config .config
make olddefconfig
make -j$(nproc)
34 changes: 34 additions & 0 deletions .github/workflows/build-check_aarch64-64k.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: aarch64-64k CI
on:
pull_request:
branches:
- '**'
- '!mainline'

jobs:
kernel-build-job:
runs-on:
labels: kernel-build-arm64
container:
image: rockylinux:9
env:
ROCKY_ENV: rocky9
ports:
- 80
options: --cpus 8
steps:
- name: Install tools and Libraries
run: |
dnf groupinstall 'Development Tools' -y
dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
- name: Checkout code
uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.head.sha }}"
fetch-depth: 0
- name: Build the Kernel
run: |
git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
cp ciq/configs/kernel-aarch64-64k.config .config
make olddefconfig
make -j$(nproc)
34 changes: 34 additions & 0 deletions .github/workflows/build-check_aarch64-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: aarch64-debug CI
on:
pull_request:
branches:
- '**'
- '!mainline'

jobs:
kernel-build-job:
runs-on:
labels: kernel-build-arm64
container:
image: rockylinux:9
env:
ROCKY_ENV: rocky9
ports:
- 80
options: --cpus 8
steps:
- name: Install tools and Libraries
run: |
dnf groupinstall 'Development Tools' -y
dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
- name: Checkout code
uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.head.sha }}"
fetch-depth: 0
- name: Build the Kernel
run: |
git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
cp ciq/configs/kernel-aarch64-debug.config .config
make olddefconfig
make -j$(nproc)
34 changes: 34 additions & 0 deletions .github/workflows/build-check_aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: aarch64 CI
on:
pull_request:
branches:
- '**'
- '!mainline'

jobs:
kernel-build-job:
runs-on:
labels: kernel-build-arm64
container:
image: rockylinux:9
env:
ROCKY_ENV: rocky9
ports:
- 80
options: --cpus 8
steps:
- name: Install tools and Libraries
run: |
dnf groupinstall 'Development Tools' -y
dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
- name: Checkout code
uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.head.sha }}"
fetch-depth: 0
- name: Build the Kernel
run: |
git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
cp ciq/configs/kernel-aarch64.config .config
make olddefconfig
make -j$(nproc)
34 changes: 34 additions & 0 deletions .github/workflows/build-check_x86_64-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: x86_64-debug CI
on:
pull_request:
branches:
- '**'
- '!mainline'

jobs:
kernel-build-job:
runs-on:
labels: kernel-build
container:
image: rockylinux:9
env:
ROCKY_ENV: rocky9
ports:
- 80
options: --cpus 8
steps:
- name: Install tools and Libraries
run: |
dnf groupinstall 'Development Tools' -y
dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
- name: Checkout code
uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.head.sha }}"
fetch-depth: 0
- name: Build the Kernel
run: |
git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
cp ciq/configs/kernel-x86_64-debug.config .config
make olddefconfig
make -j$(nproc)
34 changes: 34 additions & 0 deletions .github/workflows/build-check_x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: x86_64 CI
on:
pull_request:
branches:
- '**'
- '!mainline'

jobs:
kernel-build-job:
runs-on:
labels: kernel-build
container:
image: rockylinux:9
env:
ROCKY_ENV: rocky9
ports:
- 80
options: --cpus 8
steps:
- name: Install tools and Libraries
run: |
dnf groupinstall 'Development Tools' -y
dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
- name: Checkout code
uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.head.sha }}"
fetch-depth: 0
- name: Build the Kernel
run: |
git config --global --add safe.directory /__w/kernel-src-tree/kernel-src-tree
cp ciq/configs/kernel-x86_64.config .config
make olddefconfig
make -j$(nproc)
16 changes: 2 additions & 14 deletions arch/x86/kernel/setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,8 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();

efi_set_secure_boot(boot_params.secure_boot);

reserve_ibft_region();
x86_init.resources.dmi_setup();

Expand Down Expand Up @@ -1070,20 +1072,6 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);

if (efi_enabled(EFI_BOOT)) {
switch (boot_params.secure_boot) {
case efi_secureboot_mode_disabled:
pr_info("Secure boot disabled\n");
break;
case efi_secureboot_mode_enabled:
pr_info("Secure boot enabled\n");
break;
default:
pr_info("Secure boot could not be determined\n");
break;
}
}

reserve_initrd();

acpi_table_upgrade();
Expand Down
Loading