Track Proxmox upstream

This change merges the latest changes from the Proxmox pve-kernel
repository into the master branch.
This commit is contained in:
Fabian Mastenbroek 2021-03-15 17:36:20 +01:00
commit 04c4556be2
No known key found for this signature in database
GPG key ID: 405FC6F81F0A7B85
12 changed files with 25678 additions and 23886 deletions

3
debian/control.in vendored
View file

@ -9,6 +9,7 @@ Build-Depends: asciidoc-base,
cpio,
debhelper (>= 10~),
dh-python,
dwarves,
file,
flex,
gcc (>= 8.3.0-6),
@ -25,7 +26,7 @@ Build-Depends: asciidoc-base,
lintian,
lz4,
perl-modules,
python2-minimal,
python3-minimal,
rsync,
sed,
sphinx-common,

4
debian/rules vendored
View file

@ -76,6 +76,7 @@ PVE_CONFIG_OPTS= \
-d CONFIG_UNWINDER_ORC \
-d CONFIG_UNWINDER_GUESS \
-e CONFIG_UNWINDER_FRAME_POINTER \
--set-str CONFIG_SYSTEM_TRUSTED_KEYS ""\
-d CONFIG_SECURITY_LOCKDOWN_LSM \
-d CONFIG_SECURITY_LOCKDOWN_LSM_EARLY \
--set-str CONFIG_LSM yama,integrity,apparmor \
@ -131,7 +132,7 @@ binary: install
${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
# install zfs drivers
install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
# remove firmware
rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
# strip debug info
@ -250,6 +251,7 @@ ${MODULES}/zfs.ko: .compile_mark
cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/
cp ${MODULES}/${ZFSDIR}/module/lua/zlua.ko ${MODULES}/
cp ${MODULES}/${ZFSDIR}/module/spl/spl.ko ${MODULES}/
cp ${MODULES}/${ZFSDIR}/module/zstd/zzstd.ko ${MODULES}/
fwlist-${KVNAME}: .compile_mark .modules_compile_mark
debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp