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
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y \
build-essential bc bison flex libelf-dev libssl-dev libncurses-dev \
libdw-dev pahole rsync debhelper kmod fakeroot dpkg-dev cpio xz-utils zstd \
libdw-dev pahole rsync debhelper kmod dkms fakeroot dpkg-dev cpio xz-utils zstd \
autoconf automake libtool gawk alien rpm rpm2cpio dh-python po-debconf \
uuid-dev libudev-dev libblkid-dev libtirpc-dev libcurl4-openssl-dev \
libaio-dev libattr1-dev libffi-dev zlib1g-dev libpam0g-dev \
Expand Down Expand Up @@ -170,6 +170,9 @@ jobs:
- name: Build OpenZFS
run: make zfs DEB_ARCH=${{ matrix.deb_arch }} BUILD_THREADS="$(nproc)"

- name: Validate packaged ZFS DKMS against the built kernel
run: sudo make ENV_FILE=examples/smooth.env check-zfs-dkms DEB_ARCH=${{ matrix.deb_arch }} BUILD_THREADS="$(nproc)"

# Independent of the checks inside build-kernel.sh: this re-derives the
# answer from the finished .deb, so a bug in the recipe's own verification
# cannot wave a bad artifact through.
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NOBARA_PATCHSET ?= nobara-picks
POST_NOBARA_PATCHSET ?= post-nobara-$(KERNEL_VERSION)
OUT_DIR ?= $(CURDIR)/out

.PHONY: help kernel kernel-all kernel-config-update kernel-config-update-all check-rocm-config zfs clean show
.PHONY: help kernel kernel-all kernel-config-update kernel-config-update-all check-rocm-config check-zfs-dkms zfs clean show

help:
@echo "smoothkernel — Smooth* shared kernel build harness"
Expand All @@ -35,6 +35,7 @@ help:
@echo " kernel-config-update-all Refresh configs/ for ARCHES='$(ARCHES)'"
@echo " check-rocm-config Assert amd64 SmoothKernel keeps ROCm/KFD symbols enabled"
@echo " zfs Build OpenZFS .debs (zfs-dkms + libs + utils)"
@echo " check-zfs-dkms Rebuild packaged ZFS against the built kernel (native)"
@echo " clean Remove build trees + out/"
@echo " show Print the resolved build environment"
@echo ""
Expand Down Expand Up @@ -90,6 +91,9 @@ kernel-config-update-all:
check-rocm-config:
@$(CURDIR)/scripts/check-rocm-config.sh

check-zfs-dkms:
@$(CURDIR)/recipes/check-zfs-dkms.sh

zfs:
@$(CURDIR)/recipes/build-zfs.sh

Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ make kernel DEB_ARCH=amd64
make kernel DEB_ARCH=arm64
make zfs DEB_ARCH=amd64
make zfs DEB_ARCH=arm64
# On each native builder after kernel + ZFS packaging:
make check-zfs-dkms DEB_ARCH=amd64
make check-zfs-dkms DEB_ARCH=arm64
```

Artifacts are copied to `out/<arch>/` when using the sample `build.env`.
Expand Down
Loading
Loading