Merge pull request #946 from dmbaturin/T6230-ipt-netflow-libs-fix

packages: T6230: include iptables modules in vyos-ipt-netflow
This commit is contained in:
Viacheslav Hletenko 2025-04-18 12:28:34 +03:00 committed by GitHub
commit 351e59638e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -25,7 +25,7 @@ DRIVER_VERSION=$(git describe | sed s/^v//)
# Build up Debian related variables required for packaging # Build up Debian related variables required for packaging
DEBIAN_ARCH=$(dpkg --print-architecture) DEBIAN_ARCH=$(dpkg --print-architecture)
DEBIAN_DIR="tmp/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/extra" DEBIAN_DIR="tmp/"
DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control" DEBIAN_CONTROL="${DEBIAN_DIR}/DEBIAN/control"
DEBIAN_POSTINST="${CWD}/vyos-ipt-netflow.postinst" DEBIAN_POSTINST="${CWD}/vyos-ipt-netflow.postinst"
@ -47,6 +47,8 @@ fi
# build Debian package # build Debian package
echo "I: Building Debian package vyos-ipt-netflow" echo "I: Building Debian package vyos-ipt-netflow"
cp ipt_NETFLOW.ko ${DEBIAN_DIR} cp ipt_NETFLOW.ko ${DEBIAN_DIR}
cp libipt_NETFLOW.so ${DEBIAN_DIR}
cp libip6t_NETFLOW.so ${DEBIAN_DIR}
# Sign generated Kernel modules # Sign generated Kernel modules
${CWD}/sign-modules.sh ${DEBIAN_DIR} ${CWD}/sign-modules.sh ${DEBIAN_DIR}
@ -61,5 +63,7 @@ fpm --input-type dir --output-type deb --name vyos-ipt-netflow \
--maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \ --maintainer "VyOS Package Maintainers <maintainers@vyos.net>" \
--description "ipt_NETFLOW module" \ --description "ipt_NETFLOW module" \
--depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \ --depends linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX} \
--license "GPL2" -C ${IPT_NETFLOW_SRC}/tmp --after-install ${DEBIAN_POSTINST} --license "GPL2" -C ${IPT_NETFLOW_SRC}/tmp --after-install ${DEBIAN_POSTINST} \
ipt_NETFLOW.ko=/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/extra/ipt_NETFLOW.ko \
libipt_NETFLOW.so=/lib/$(uname -m)-linux-gnu/xtables/libipt_NETFLOW.so \
libip6t_NETFLOW.so=/lib/$(uname -m)-linux-gnu/xtables/libip6t_NETFLOW.so