mirror of
https://github.com/opnsense/src.git
synced 2026-04-04 08:55:18 -04:00
Notable upstream pull request merges:
#11710 Allow zfs to send replication streams with missing snapshots
#11751 Avoid taking global lock to destroy zfsdev state
#11786 Ratelimit deadman zevents as with delay zevents
#11803 ZFS traverse_visitbp optimization to limit prefetch
#11813 Allow pool names that look like Solaris disk names
#11822 Atomically check and set dropped zevent count
#11822 Don't scale zfs_zevent_len_max by CPU count
#11833 Refactor zfsdev state init/destroy to share common code
#11837 zfs get -p only outputs 3 columns if "clones" property is empty
#11843 libzutil: zfs_isnumber(): return false if input empty
#11849 Use dsl_scan_setup_check() to setup a scrub
#11861 Improvements to the 'compatibility' property
#11862 cmd/zfs receive: allow dry-run (-n) to check property args
#11864 receive: don't fail inheriting (-x) properties on wrong dataset type
#11877 Combine zio caches if possible
#11881 FreeBSD: use vnlru_free_vfsops if available
#11883 FreeBSD: add support for lockless symlink lookup
#11884 FreeBSD: add missing seqc write begin/end around zfs_acl_chown_setattr
#11896 Fix crash in zio_done error reporting
#11905 zfs-send(8): Restore sorting of flags
#11926 FreeBSD: damage control racing .. lookups in face of mkdir/rmdir
#11930 vdev_mirror: don't scrub/resilver devices that can't be read
#11938 Fix AVX512BW Fletcher code on AVX512-but-not-BW machines
#11955 zfs get: don't lookup mount options when using "-s local"
#11956 libzfs: add keylocation=https://, backed by fetch(3) or libcurl
#11959 vdev_id: variable not getting expanded under map_slot()
#11966 Scale worker threads and taskqs with number of CPUs
#11994 Clean up use of zfs_log_create in zfs_dir
#11997 FreeBSD: Don't force xattr mount option
#11997 FreeBSD: Implement xattr=sa
#11997 FreeBSD: Use SET_ERROR to trace xattr name errors
#11998 Simplify/fix dnode_move() for dn_zfetch
#12003 FreeBSD: Initialize/destroy zp->z_lock
#12010 Fix dRAID self-healing short columns
#12033 Revert "Fix raw sends on encrypted datasets when copying back snapshots"
#12040 Reinstate the old zpool read label logic as a fallback
#12046 Improve scrub maxinflight_bytes math
#12049 FreeBSD: avoid memory allocation in arc_prune_async
#12052 FreeBSD: incorporate changes to the VFS_QUOTACTL(9) KPI
#12061 Fix dRAID sequential resilver silent damage handling
#12072 Let zfs diff be more permissive
#12077 FreeBSD: Retry OCF ENOMEM errors.
#12088 Propagate vdev state due to invalid label corruption
#12091 libzfs: On FreeBSD, use MNT_NOWAIT with getfsstat
#12097 FreeBSD: Update dataset_kstats for zvols in dev mode
#12104 FreeBSD boot code reminder after zpool upgrade
#12114 Introduce write-mostly sums
Obtained from: OpenZFS
OpenZFS commit: 75b4cbf625
123 lines
3 KiB
Bash
Executable file
123 lines
3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
PROG=$0
|
|
|
|
pkgcfg=/etc/sysconfig/zfs
|
|
|
|
while getopts "n:v:c:f:" opt; do
|
|
case $opt in
|
|
n) pkgname=$OPTARG ;;
|
|
v) pkgver=$OPTARG ;;
|
|
c) pkgcfg=$OPTARG ;;
|
|
f) filename=$OPTARG ;;
|
|
*) err=1 ;;
|
|
esac
|
|
done
|
|
|
|
if [ -z "${pkgname}" ] || [ -z "${pkgver}" ] || [ -z "${filename}" ] ||
|
|
[ -n "${err}" ]; then
|
|
echo "Usage: $PROG -n <pkgname> -v <pkgver> -c <pkgcfg> -f <filename>"
|
|
exit 1
|
|
fi
|
|
|
|
exec cat >"${filename}" <<EOF
|
|
PACKAGE_NAME="${pkgname}"
|
|
PACKAGE_VERSION="${pkgver}"
|
|
PACKAGE_CONFIG="${pkgcfg}"
|
|
NO_WEAK_MODULES="yes"
|
|
PRE_BUILD="configure
|
|
--prefix=/usr
|
|
--with-config=kernel
|
|
--with-linux=\$(
|
|
case \`lsb_release -is\` in
|
|
(Debian|Devuan)
|
|
if [[ -e \${kernel_source_dir/%build/source} ]]
|
|
then
|
|
echo \${kernel_source_dir/%build/source}
|
|
else
|
|
# A kpkg exception for Proxmox 2.0
|
|
echo \${kernel_source_dir}
|
|
fi
|
|
;;
|
|
(*)
|
|
echo \${kernel_source_dir}
|
|
;;
|
|
esac
|
|
)
|
|
--with-linux-obj=\${kernel_source_dir}
|
|
\$(
|
|
[[ -n \"\${ICP_ROOT}\" ]] && \\
|
|
{
|
|
echo --with-qat=\"\${ICP_ROOT}\"
|
|
}
|
|
)
|
|
\$(
|
|
[[ -r \${PACKAGE_CONFIG} ]] \\
|
|
&& source \${PACKAGE_CONFIG} \\
|
|
&& shopt -q -s extglob \\
|
|
&& \\
|
|
{
|
|
if [[ \${ZFS_DKMS_ENABLE_DEBUG,,} == @(y|yes) ]]
|
|
then
|
|
echo --enable-debug
|
|
fi
|
|
if [[ \${ZFS_DKMS_ENABLE_DEBUGINFO,,} == @(y|yes) ]]
|
|
then
|
|
echo --enable-debuginfo
|
|
fi
|
|
}
|
|
)
|
|
"
|
|
POST_BUILD="scripts/dkms.postbuild
|
|
-n \${PACKAGE_NAME}
|
|
-v \${PACKAGE_VERSION}
|
|
-a \${arch}
|
|
-k \${kernelver}
|
|
-t \${dkms_tree}
|
|
"
|
|
AUTOINSTALL="yes"
|
|
REMAKE_INITRD="no"
|
|
MAKE[0]="make"
|
|
STRIP[0]="\$(
|
|
[[ -r \${PACKAGE_CONFIG} ]] \\
|
|
&& source \${PACKAGE_CONFIG} \\
|
|
&& shopt -q -s extglob \\
|
|
&& [[ \${ZFS_DKMS_DISABLE_STRIP,,} == @(y|yes) ]] \\
|
|
&& echo -n no
|
|
)"
|
|
STRIP[1]="\${STRIP[0]}"
|
|
STRIP[2]="\${STRIP[0]}"
|
|
STRIP[3]="\${STRIP[0]}"
|
|
STRIP[4]="\${STRIP[0]}"
|
|
STRIP[5]="\${STRIP[0]}"
|
|
STRIP[6]="\${STRIP[0]}"
|
|
STRIP[7]="\${STRIP[0]}"
|
|
STRIP[8]="\${STRIP[0]}"
|
|
BUILT_MODULE_NAME[0]="zavl"
|
|
BUILT_MODULE_LOCATION[0]="module/avl/"
|
|
DEST_MODULE_LOCATION[0]="/extra/avl/avl"
|
|
BUILT_MODULE_NAME[1]="znvpair"
|
|
BUILT_MODULE_LOCATION[1]="module/nvpair/"
|
|
DEST_MODULE_LOCATION[1]="/extra/nvpair/znvpair"
|
|
BUILT_MODULE_NAME[2]="zunicode"
|
|
BUILT_MODULE_LOCATION[2]="module/unicode/"
|
|
DEST_MODULE_LOCATION[2]="/extra/unicode/zunicode"
|
|
BUILT_MODULE_NAME[3]="zcommon"
|
|
BUILT_MODULE_LOCATION[3]="module/zcommon/"
|
|
DEST_MODULE_LOCATION[3]="/extra/zcommon/zcommon"
|
|
BUILT_MODULE_NAME[4]="zfs"
|
|
BUILT_MODULE_LOCATION[4]="module/zfs/"
|
|
DEST_MODULE_LOCATION[4]="/extra/zfs/zfs"
|
|
BUILT_MODULE_NAME[5]="icp"
|
|
BUILT_MODULE_LOCATION[5]="module/icp/"
|
|
DEST_MODULE_LOCATION[5]="/extra/icp/icp"
|
|
BUILT_MODULE_NAME[6]="zlua"
|
|
BUILT_MODULE_LOCATION[6]="module/lua/"
|
|
DEST_MODULE_LOCATION[6]="/extra/lua/zlua"
|
|
BUILT_MODULE_NAME[7]="spl"
|
|
BUILT_MODULE_LOCATION[7]="module/spl/"
|
|
DEST_MODULE_LOCATION[7]="/extra/spl/spl"
|
|
BUILT_MODULE_NAME[8]="zzstd"
|
|
BUILT_MODULE_LOCATION[8]="module/zstd/"
|
|
DEST_MODULE_LOCATION[8]="/extra/zstd/zzstd"
|
|
EOF
|