Skip to content

Commit

Permalink
linux-4.18: Remove SPL/ZFS
Browse files Browse the repository at this point in the history
And again out of tree modules [show, that they are a burden][1].

	  CC [M]  /dev/shm/bee-root/linux/linux-4.18.5-218/source/spl_zfs_extra/spl-0.7.9/module/spl/spl-zlib.o
	/dev/shm/bee-root/linux/linux-4.18.5-218/source/spl_zfs_extra/spl-0.7.9/module/spl/spl-vnode.c: In function ‘vn_getattr’:
	/dev/shm/bee-root/linux/linux-4.18.5-218/source/spl_zfs_extra/spl-0.7.9/module/spl/spl-vnode.c:308:16: error: incompatible types when assigning to type ‘struct timespec’ from type ‘struct timespec64’
	  vap->va_atime = stat.atime;
	                ^
	/dev/shm/bee-root/linux/linux-4.18.5-218/source/spl_zfs_extra/spl-0.7.9/module/spl/spl-vnode.c:309:16: error: incompatible types when assigning to type ‘struct timespec’ from type ‘struct timespec64’
	  vap->va_mtime = stat.mtime;
	                ^
	/dev/shm/bee-root/linux/linux-4.18.5-218/source/spl_zfs_extra/spl-0.7.9/module/spl/spl-vnode.c:310:16: error: incompatible types when assigning to type ‘struct timespec’ from type ‘struct timespec64’
	  vap->va_ctime = stat.ctime;
                ^
	make[3]: *** [scripts/Makefile.build:317: /dev/shm/bee-root/linux/linux-4.18.5-218/source/spl_zfs_extra/spl-0.7.9/module/spl/spl-vnode.o] Error 1

[1]: https://github.com/zfsonlinux/zfs/issues/7785
  • Loading branch information
pmenzel committed Dec 19, 2019
1 parent d5b98f1 commit 7859107
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions linux-4.18.5-218.bee
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,6 @@ plaininstall_for_modules() {
)
}

build_spl_zfs_extra_modules_and_do_depmod() {
pushd .

local SPL_ZFS_VERSION=0.7.9
echo "spl/zfs"

mkdir -pv ${B}/spl_zfs_extra
cd ${B}/spl_zfs_extra

plaininstall_for_modules spl-${SPL_ZFS_VERSION} spl-${SPL_ZFS_VERSION}.tar.gz \
https://github.com/zfsonlinux/zfs/releases/download/zfs-${SPL_ZFS_VERSION}/spl-${SPL_ZFS_VERSION}.tar.gz

plaininstall_for_modules zfs-${SPL_ZFS_VERSION} zfs-${SPL_ZFS_VERSION}.tar.gz \
https://github.com/zfsonlinux/zfs/releases/download/zfs-${SPL_ZFS_VERSION}/zfs-${SPL_ZFS_VERSION}.tar.gz \
"--with-spl=${B}/spl_zfs_extra/spl-${SPL_ZFS_VERSION}"

cd ${D}/lib/modules/${FULLKERNELVERSION}
depmod -a -b ${D} ${FULLKERNELVERSION}

popd
}

mee_patch() {
echo "PATCH $@"
bee_patch $@
Expand Down Expand Up @@ -908,8 +886,6 @@ mee_install() {
make install INSTALL_PATH=${D}/boot
# make firmware_install INSTALL_MOD_PATH=${D}

build_spl_zfs_extra_modules_and_do_depmod

rm -v ${D}/lib/modules/${FULLKERNELVERSION}/{source,build}

ln -sv /usr/src/linux/${PKGALLPKG}/source ${D}/lib/modules/${FULLKERNELVERSION}/source
Expand Down

0 comments on commit 7859107

Please sign in to comment.