(echo "$_subarch"; yes) | make oldconfig
is better
also for simple conflicts, such as the one that is blocking 5.1.17, remove the git pull and add this
git fetch --tags upstream_stable
if ! git merge upstream_stable/v${_srcver_tag}
then if ! git diff --name-only --diff-filter=U | xargs git checkout --theirs
then git diff --name-only --diff-filter=U |
while read line
do sleep 0.1; if ! git checkout --theirs $line
then sleep 0.1; git rm $line
fi
done
fi
fi
Pinned Comments
QuartzDragon commented on 2019-06-11 15:15 (UTC) (edited on 2019-06-11 15:17 (UTC) by QuartzDragon)
If there are bugs related to the PKGBUILD or config, report here.
Otherwise, please report here:
https://github.com/koverstreet/bcachefs/issues