Part of this maybe that I have been using mergemaster longer than I should have, but I finally decided while working on updating from 13.2-RELEASE-p4 to 14.0-RC3 in my development server and jails to make the switch. I use ZFS in combination with snapshots to clone existing install and then compile source and install to alternate location then change the bootfs on zpool and reboot. For these major updates I use a VM installed from ISO image with new version to build and then send snapshot back over to original system.
So my process attempting to use etcupdate went as follows.
etcupdate extract -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT
etcupdate diff -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT
Results look ok here, see differences that I expect.
make installkernel (had previously ran the builds, /etc/src-env.conf has DESTDIR set for installation)
etcupdate -p -s /usr/src -D /jails/devel/ROOT
Result: PANIC: merge failed with status 127
Logs end with:
>>> Building tree at /jails/devel/ROOT/var/db/etcupdate/etcupdate-YyFRXe8 with make -DNO_FILEMON
/usr/sbin/etcupdate: diff3: not found
whereis diff3
diff3: /usr/src/usr.bin/diff3
Does Anybody know what I am doing wrong?
So my process attempting to use etcupdate went as follows.
etcupdate extract -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT
etcupdate diff -s /usr/src_13.2-RELEASE-p4 -D /jails/devel/ROOT
Results look ok here, see differences that I expect.
make installkernel (had previously ran the builds, /etc/src-env.conf has DESTDIR set for installation)
etcupdate -p -s /usr/src -D /jails/devel/ROOT
Result: PANIC: merge failed with status 127
Logs end with:
>>> Building tree at /jails/devel/ROOT/var/db/etcupdate/etcupdate-YyFRXe8 with make -DNO_FILEMON
/usr/sbin/etcupdate: diff3: not found
whereis diff3
diff3: /usr/src/usr.bin/diff3
Does Anybody know what I am doing wrong?
Last edited: