linux/build-and-push.sh

@@ -23,9 +23,9 @@
 
 set -Ceux
 
-GIT_LINUX=/mnt/extssd/git/linux
+GIT_LINUX=~/Work/git/linux
 GIT_LINUX_PATCHES=~/Work/git/kernel-source
-LINUX_BUILD=/mnt/extssd/build/linux
+LINUX_BUILD=~/Work/kernel-build
 LINUX_CONFIG=default
 LINUX_VERSION=6.4.0-"$LINUX_CONFIG"-dirty
 
@@ -36,7 +36,7 @@ TARGET_PIPE=/run/user/"$(id -u)"/bisect
 TARGET_BUILD=/tmp/build
 
 SSH_KEY=~/.ssh/bisect.pub
-SSH="ssh -i $SSH_KEY -l $TARGET_USER $TARGET_HOST"
+SSH="ssh -i $SSH_KEY -q -l $TARGET_USER $TARGET_HOST"
 
 if ! $SSH -- true
 then
@@ -65,15 +65,13 @@ git restore .
 popd
 
 install -vm0644 "$GIT_LINUX_PATCHES"/config/x86_64/"$LINUX_CONFIG" "$LINUX_BUILD"/.config
-CCACHE_DIR=/mnt/extssd/ccache/cache CCACHE_TEMPDIR=/mnt/extssd/ccache/temp \
-  KBUILD_BUILD_TIMESTAMP='' \
-  make -C"$GIT_LINUX" -j"$(( $(nproc) + 5 ))" CC='ccache cc' O="$LINUX_BUILD"
+make -C"$GIT_LINUX" -j"$(nproc)" O="$LINUX_BUILD"
 
 $SSH -- rm -fr "$TARGET_BUILD"
 
 rsync --exclude='.tmp*' --info=progress2 -lr "$LINUX_BUILD"/ "$TARGET_USER"@"$TARGET_HOST":"$TARGET_BUILD"
 
-$SSH -- make -C/usr/src/linux -j16 O="$TARGET_BUILD" modules_install
+$SSH -- make -C/usr/src/linux O="$TARGET_BUILD" modules_install
 $SSH -- make -C/usr/src/linux O="$TARGET_BUILD" install
 
 VMLINUZ=/boot/vmlinuz-"$GIT_COMMIT"
@@ -84,7 +82,6 @@ $SSH -- dracut --kernel-image "$VMLINUZ" "$INITRD" "$LINUX_VERSION"
 $SSH -- grub2-mkconfig -o /boot/grub2/grub.cfg
 
 ROOT="$($SSH -- blkid -o value -s UUID -t LABEL=ROOT)"
-
-set +x
 echo "Root partition UUID: $ROOT"
+
 echo 'Now reboot, test, and update the bisection.'

linux/install.sh

@@ -18,7 +18,7 @@
 builddir=/tmp/build
 commit="${1?Specify commit hash}"
 
-make -C/usr/src/linux -j16 O="$builddir" modules_install
+make -C/usr/src/linux -j6 O="$builddir" modules_install
 make -C/usr/src/linux O="$builddir" install
 
 VMLINUZ=/boot/vmlinuz-"$commit"