Arch Linux User Repository

If there are bugs related to the PKGBUILD or config, report here.

Otherwise, please report here:

https://github.com/koverstreet/bcachefs/issues

I think I might cautiously wait until Kent fixes up bcachefs proper.

I guess I don't quite trust the conflict handler to do a proper fixup that won't cause issues...

https://pastebin.com/zDhCzA9r

diff to the pkgbuild, it includes:

• automatic latest x.x.y detection ie if you set _srcver_tag=5.1 then it goes to 5.1.19 + it correctly sets pkgver

• automatic conflict handler (the below code did not work because git merge is silly with tags)

• removal of bluetooth patch - it is included iirc E: it is

• having the upstream git repo fetched in source=() from makepkg and added as a local filesystem remote

• renaming prepare to actual_prepare because makepkg ordering is silly

compiling right now will update you within the hour for any possible issues but there ought to be none

E: running it since a couple of hours ago, nothing wrong to report

Implemented the first suggestion.

Second suggestion is borked:

merge: upstream_stable/v5.1.18 - not something we can merge
fatal: '--ours/--theirs' cannot be used with switching branches

(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

Stuck at 5.1.15 for now.

5.1.16 produces an auto-merge conflict.

5.1 is a go it seams https://github.com/koverstreet/bcachefs/issues/46#issuecomment-508420107

Reverted back to 5.0.21 for now.

Will revert.

do not update, it kernel panics as per the latest issue in the project's github

If there are bugs related to the PKGBUILD or config, report here.

Otherwise, please report here:

https://github.com/koverstreet/bcachefs/issues