Re: 14-CURRENT/aarch64 build problem
Paul Mather <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.arm |
|---|---|
| Message-ID | <[email protected]> |
On Jun 8, 2021, at 4:14 PM, George Mitchell <[email protected]> wrote: > On 6/8/21 3:42 PM, Juraj Lutter wrote: >>> On 8 Jun 2021, at 21:38, bob prohaska <[email protected]> wrote: >>> >>> FWIW, same problem seen here. In an added twist, git pull (hoping for >>> a fix) fails also: >>> >>> root@www:/usr/src # git pull >>> error: cannot lock ref 'refs/remotes/freebsd/vendor/openzfs/legacy': 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create 'refs/remotes/freebsd/vendor/openzfs/legacy' >>> From https://git.freebsd.org/src >>> ! [new branch] vendor/openzfs/legacy -> freebsd/vendor/openzfs/legacy (unable to update local ref) >>> error: cannot lock ref 'refs/remotes/freebsd/vendor/openzfs/master': 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create 'refs/remotes/freebsd/vendor/openzfs/master' >>> ! [new branch] vendor/openzfs/master -> freebsd/vendor/openzfs/master (unable to update local ref) >>> error: cannot lock ref 'refs/remotes/freebsd/vendor/openzfs/zfs-2.1-release': 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create 'refs/remotes/freebsd/vendor/openzfs/zfs-2.1-release' >>> ! [new branch] vendor/openzfs/zfs-2.1-release -> freebsd/vendor/openzfs/zfs-2.1-release (unable to update local ref) >>> >>> Is this a problem at my end, or the server's end? >> This already has been documented, as the old openzfs branch has been renamed/moved. >> $ git remote prune freebsd >> $ git pull >> See: https://lists.freebsd.org/archives/freebsd-git/2021-June/000015.html >> otis >> — >> Juraj Lutter >> [email protected] > How would this affect net/gitup users? (I'm guessing gitup would force > the local repo into conformance with the remote repo by default.) This is what I got when I tried updating one of my -CURRENT systems right now: ===== # gitup current # Scanning local repository... # Host: git.freebsd.org # Port: 443 # Repository Path: /src.git # Target Directory: /usr/src # Have: b5d37e5a20ab1b189499e2824dc269d998c31989 # Want: f20893853e8e6909d422f6646b706b4b6e299682 # Branch: main # Action: pull zsh: segmentation fault (core dumped) gitup current ===== Even deleting everything under /usr/src and doing "rm /var/db/gitup/current" and re-running "gitup current" to re-clone everything afresh results in this: ===== # gitup current # Scanning local repository... # Host: git.freebsd.org # Port: 443 # Repository Path: /src.git # Target Directory: /usr/src # Want: f20893853e8e6909d422f6646b706b4b6e299682 # Branch: main # Action: clone gitup: load_object: local file for object 3331601f6dc50ef2c9779c1656218701b48b276c -- /usr/src/sys/contrib/openzfs/scripts/zfs-images not found: No such file or directory ===== So I guess "gitup" needs to be taught how to resolve this kind of change. :-\ Cheers, Paul.