zygo: pick-kernel: fix pickList

diff --git a/zygo/do b/zygo/do
index a50246363d58af76c643aef58c2ac18ab6dc5c95..4c0f9baf551c6dc8e0aa41dbeb82c741366d752f 100755 (executable)
--- a/zygo/do
+++ b/zygo/do
@@ -1,8 +1,13 @@
 #!/bin/bash
-set -axP
+set -x
+
+set -aP
 ORIG_PATH="$PATH"
 PATH="$PWD/zygo:$ORIG_PATH"
 
+# Batch mode scheduling
+schedtool -v -B $$
+
 # Rename the kernel directory
 rename-kernel -zb64
 
@@ -10,11 +15,16 @@ rename-kernel -zb64
 cd .
 PATH="$PWD/zygo:$ORIG_PATH"
 
+# Reset kernel sources to git HEAD
+reset-kernel
 trash debian
 
+# Reset module sources from Debian
 new-kernel
 
-make oldconfig
+# Long ago it was "make oldconfig && make install"
+KCONFIG_NOTIMESTAMP=1 make oldconfig
 yes '' | fakeroot make-kernel "$@"
 
+# Move all products to the same directory for pickup
 mv -vi ../modules/*.deb ../

diff --git a/zygo/pick-kernel b/zygo/pick-kernel
index 6779711e04445ad96a41eddfbe429097d5b27cda..0fee5a92ba3a1c77d019676287a0dcc6a0d07a06 100755 (executable)
--- a/zygo/pick-kernel
+++ b/zygo/pick-kernel
@@ -1,24 +1,29 @@
 #!/bin/sh
-
 set -x
-git clean -dfx
+
+git clean -qdfx
 git stash
 git cherry-pick --quit
 
-hashes="$(git log --date-order ^HEAD --no-merges --format=%h --reverse "$@")"
+hashes="$(git log --date-order ^HEAD --no-merges --format=%h --reverse "$@" | tr '\n' ' ')"
+tips="$(  git log --date-order ^HEAD --no-merges --format=%h --no-walk "$@" | tr '\n' ' ')"
+
+pickList=''
 
 for x in $hashes; do
        if git cherry-pick -x "$x"; then
-               echo -n '++++ ' >&9
+               prefixString='++++'
        else
                git cherry-pick --abort
-               echo -n '---- ' >&9
+               prefixString='----'
        fi
-       git log --oneline --no-walk "$x" >&9
-done 9> PICK-LIST
-
-git merge -s ours "$x" -m"zygo: cherry-picked up to $x (extra args $*)
+       pickList="$pickList
+$prefixString $(git log --oneline --no-walk "$x")"
+done
 
-Commits included:
+if [ -n "$pickList" ]; then
+       git merge -s ours $hashes -m"zygo: cherry-picked up to $*
 
-$(cat PICK-LIST)"
+Commits included (++++) and excluded (----):
+$pickList"
+fi

diff --git a/zygo/pick-kernel-btrfs b/zygo/pick-kernel-btrfs
new file mode 100755 (executable)
index 0000000..4282435
--- /dev/null
+++ b/zygo/pick-kernel-btrfs
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -x
+set -a
+ORIG_PATH="$PATH"
+PATH="$PWD/zygo:$ORIG_PATH"
+
+# Mine unmerged btrfs commits from upstreams
+# ...but don't pick up the ancient ones from 2009
+pick-kernel \
+       linus/master \
+       --remotes=btrfs-next/\* \
+       --remotes=mason/\* \
+       --after='now - 90 days' \
+       -- \
+       fs/btrfs \
+
+KCONFIG_NOTIMESTAMP=1 make oldconfig prepare modules_prepare -j
+make SUBDIRS=fs/btrfs -j

diff --git a/zygo/reset-kernel b/zygo/reset-kernel
new file mode 100755 (executable)
index 0000000..ce49faa
--- /dev/null
+++ b/zygo/reset-kernel
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -x
+git clean -qdfx
+git reset --hard