Make ZFS build with openzfs sources, update dtrace build to coexist
Details
Details
- Reviewers
freqlabs allanjude gnn - Group Reviewers
manpages - Commits
- rS364746: Merge OpenZFS support in to HEAD.
Diff Detail
Diff Detail
- Repository
- rS FreeBSD src repository - subversion
- Lint
Lint Skipped - Unit
Tests Skipped - Build Status
Buildable 32632
Event Timeline
| cddl/lib/libzfs/Makefile | ||
|---|---|---|
| 11 | I think we should consider installing libzfs/libzfs.h here as well in the new world order. | |
| sys/kern/genoffset.c | ||
|---|---|---|
| 35 | Normally this would go after <sys/assym.h>? | |
| cddl/lib/libzfs/Makefile | ||
|---|---|---|
| 11 |
libzfs is a private library that is subject to constant churn. Anything we want from it should be moved in to libzfs_core. | |
| sys/kern/genoffset.c | ||
| 35 |
I removed the added header. Something is wrong with phab in that it still shows the change in the diff. | |
| cddl/lib/libzfs/Makefile | ||
|---|---|---|
| 11 | Done. | |
| sys/kern/genoffset.c | ||
| 35 |
mmacy@anarchy [~/devel/freebsd|16:40|181] git branch | grep vendor
mmacy@anarchy [~/devel/freebsd|16:40|182] git diff master sys/kern/genoffset.c | |
Comment Actions
This is as far as I was able to get:
> cddl/lib/libctf (obj,all,install)
[Creating objdir /usr/obj/tank/src/head/powerpc.powerpc64/tmp/obj-tools/cddl/lib/libctf...]
cc -O2 -pipe -fno-common -DCTF_OLD_VERSIONS -DIN_BASE -I/tank/src/head/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl -I/tank/src/head/sys/contrib/openzfs/include -I/tank/src/head/sys/contrib/openzfs/lib/libspl/include/ -I/tank/src/head/sys/contrib/openzfs/lib/libspl/include/os/freebsd -include /tank/src/head/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -DHAVE_ISSETUGID -I/tank/src/head/sys/cddl/compat/opensolaris -I/tank/src/head/cddl/compat/opensolaris/include -I/tank/src/head/cddl/lib/libctf/../../../cddl/contrib/opensolaris/head -I/tank/src/head/cddl/lib/libctf/../../../cddl/contrib/opensolaris/common/ctf -I/tank/src/head/cddl/lib/libctf/../../../cddl/contrib/opensolaris/lib/libctf/common -I/tank/src/head/cddl/lib/libctf/../../../sys/cddl/contrib/opensolaris/uts/common -DNEED_SOLARIS_BOOLEAN -g -MD -MF.depend.ctf_create.o -MTctf_create.o -std=gnu99 -Wno-format-zero-length -Qunused-arguments -I/usr/obj/tank/src/head/powerpc.powerpc64/tmp/legacy/usr/include -c /tank/src/head/cddl/contrib/opensolaris/common/ctf/ctf_create.c -o ctf_create.o
<built-in>:1:10: fatal error: '/tank/src/head/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h' file not found
Comment Actions
Did you clone the projects/openzfs_vendor branch of ZoF in to sys/contrib/openzfs? And did you checkout my branch or did you try applying the diff? If the latter, you'll need to make sure that you delete the empty files.
Comment Actions
Applying the diff and deleting the empty files was what got me to this point.
I suppose the only way forward is for me to learn git.
Comment Actions
While generally speaking a passing familiarity with git is useful, others do appear to have been successful simply following the build directions in the CFT mails.
https://lists.freebsd.org/pipermail/freebsd-current/2020-August/076688.html