Skip to content

build: refactor kernel tree cleanup #25

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
greatgitsby merged 1 commit into from
Mar 14, 2026
Merged

build: refactor kernel tree cleanup #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions tools/build/build_kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ docker build -f tools/build/Dockerfile.builder -t vamos-builder "$DIR"
echo "Starting vamos-builder container"
CONTAINER_ID=$(docker run -d -u "$(id -u):$(id -g)" -v "$DIR":"$DIR" -w "$DIR" vamos-builder)

trap "echo 'Cleaning up container:'; docker container rm -f $CONTAINER_ID; rm -rf $TMP_DIR" EXIT
trap cleanup EXIT

apply_patches() {
cd "$KERNEL_DIR"

# Reset submodule to committed state for deterministic builds
echo "-- Resetting kernel submodule to clean state --"
git checkout .
git clean -fd
clean_kernel_tree

if [ -d "$PATCHES_DIR" ] && ls "$PATCHES_DIR"/*.patch 1>/dev/null 2>&1; then
echo "-- Applying patches --"
Expand Down Expand Up @@ -120,5 +119,19 @@ build_kernel() {
ls -lh "$OUT_DIR/boot.img"
}

clean_kernel_tree() {
git -C "$KERNEL_DIR" reset --hard HEAD >/dev/null 2>&1 || true
git -C "$KERNEL_DIR" clean -fd >/dev/null 2>&1 || true
}

cleanup() {
echo "Cleaning up container and kernel tree..."

clean_kernel_tree

docker container rm -f "${CONTAINER_ID:-}" >/dev/null 2>&1 || true
rm -rf "$TMP_DIR"
}

# Run build inside container
docker exec -u "$(id -u):$(id -g)" $CONTAINER_ID bash -c "set -e; export DEFCONFIG=$DEFCONFIG DIR=$DIR TOOLS=$TOOLS KERNEL_DIR=$KERNEL_DIR PATCHES_DIR=$PATCHES_DIR TMP_DIR=$TMP_DIR OUT_DIR=$OUT_DIR BOOT_IMG=$BOOT_IMG DTB=$DTB; $(declare -f apply_patches build_kernel); build_kernel"
docker exec -u "$(id -u):$(id -g)" $CONTAINER_ID bash -c "set -e; export DEFCONFIG=$DEFCONFIG DIR=$DIR TOOLS=$TOOLS KERNEL_DIR=$KERNEL_DIR PATCHES_DIR=$PATCHES_DIR TMP_DIR=$TMP_DIR OUT_DIR=$OUT_DIR BOOT_IMG=$BOOT_IMG DTB=$DTB; $(declare -f apply_patches build_kernel clean_kernel_tree); build_kernel"
Loading