Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
fail-fast: false
matrix:
target:
- tiny-5.15
- tiny-6.6
# Build twice for comparison
build:
Expand Down Expand Up @@ -70,7 +69,6 @@ jobs:
fail-fast: false
matrix:
target:
- tiny-5.15
- tiny-6.6
steps:
- name: Install dependencies
Expand Down
26 changes: 2 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@ fix: ## Fix scripts
@poetry run ruff check . --fix
@poetry run ruff format .

.PHONY: tiny-5.15
tiny-5.15: OUT:=$(SCRIPT_OUTPUT_PREFIX)-tiny-5.15.$(SCRIPT_OUTPUT_EXT)
tiny-5.15: ## Builds latest 5.15 kernel, unpatched
LINUX_MAJOR_VERSION="5.15" LOCALVERSION="tiny" \
BUILD_DISTRO="buster" \
LINUX_LOCAL_CONFIG_PATH="$(PWD)/configs/tinyconfig-5.15" \
script \
--command ./scripts/build-kernel-wrapper \
--return \
$(OUT)

.PHONY: tiny-6.6
tiny-6.6: OUT:=$(SCRIPT_OUTPUT_PREFIX)-tiny-6.6.$(SCRIPT_OUTPUT_EXT)
tiny-6.6: ## Builds latest 6.6 kernel, unpatched
Expand All @@ -46,26 +35,15 @@ grsec: ## Builds grsecurity-patched kernel (requires credentials)

.PHONY: reprotest
reprotest: ## Builds simple kernel multiple times to confirm reproducibility
LINUX_MAJOR_VERSION="5.15" ./scripts/reproducibility-test
LINUX_MAJOR_VERSION="6.6" ./scripts/reproducibility-test

.PHONY: reprotest-sd
reprotest-sd: ## DEBUG Builds SD kernel config without grsec in CI
GRSECURITY=0 LOCALVERSION="securedrop" \
LINUX_LOCAL_CONFIG_PATH="$(PWD)/configs/config-securedrop-5.15" \
LINUX_LOCAL_CONFIG_PATH="$(PWD)/configs/config-securedrop-6.6" \
LINUX_LOCAL_PATCHES_PATH="$(PWD)/patches" \
./scripts/reproducibility-test

securedrop-core-5.15: OUT:=$(SCRIPT_OUTPUT_PREFIX)-securedrop-core-5.15.$(SCRIPT_OUTPUT_EXT)
securedrop-core-5.15: ## Builds kernels for SecureDrop servers, 5.15.x
GRSECURITY=1 GRSECURITY_PATCH_TYPE=stable6 LOCALVERSION="securedrop" \
BUILD_DISTRO="buster" \
LINUX_LOCAL_CONFIG_PATH="$(PWD)/configs/config-securedrop-5.15" \
LINUX_LOCAL_PATCHES_PATH="$(PWD)/patches" \
script \
--command ./scripts/build-kernel-wrapper \
--return \
$(OUT)

securedrop-core-6.6: OUT:=$(SCRIPT_OUTPUT_PREFIX)-securedrop-core-6.6.$(SCRIPT_OUTPUT_EXT)
securedrop-core-6.6: ## Builds kernels for SecureDrop servers, 6.6.x
GRSECURITY=1 GRSECURITY_PATCH_TYPE=stable9 LOCALVERSION="securedrop" \
Expand Down
2 changes: 0 additions & 2 deletions build-kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ def main(): # noqa: PLR0915
"local_version": local_version,
}

# TODO: d/arch is only needed for 5.15 kernels
render_template("debian/arch", template_variables)
render_template("debian/control", template_variables)
render_template("debian/changelog", template_variables)
render_template("debian/rules.vars", template_variables)
Expand Down
Loading