diff options
author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-04-18 12:28:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-04-18 12:28:34 +0300 |
commit | 351e59638e202b008daad368e0da9e289d5814d2 (patch) | |
tree | 0b77871dd635f89d007a2574b5dd4c2daa269137 /scripts | |
parent | 3cb36c6ab2906b123c446b0f05912848bee9dc31 (diff) | |
parent | d38ad1dc216783172e90d822cc44918d96931aa3 (diff) | |
download | vyos-build-351e59638e202b008daad368e0da9e289d5814d2.tar.gz vyos-build-351e59638e202b008daad368e0da9e289d5814d2.zip |
Merge pull request #946 from dmbaturin/T6230-ipt-netflow-libs-fix
packages: T6230: include iptables modules in vyos-ipt-netflow
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/package-build/linux-kernel/build-ipt-netflow.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/package-build/linux-kernel/build-ipt-netflow.sh b/scripts/package-build/linux-kernel/build-ipt-netflow.sh index 9c657676..9245a416 100755 --- a/scripts/package-build/linux-kernel/build-ipt-netflow.sh +++ b/scripts/package-build/linux-kernel/build-ipt-netflow.sh @@ -25,7 +25,7 @@ DRIVER_VERSION=$(git describe | sed s/^v//) # Build up Debian related variables required for packaging 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_POSTINST="${CWD}/vyos-ipt-netflow.postinst" @@ -47,6 +47,8 @@ fi # build Debian package echo "I: Building Debian package vyos-ipt-netflow" cp ipt_NETFLOW.ko ${DEBIAN_DIR} +cp libipt_NETFLOW.so ${DEBIAN_DIR} +cp libip6t_NETFLOW.so ${DEBIAN_DIR} # Sign generated Kernel modules ${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>" \ --description "ipt_NETFLOW module" \ --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 |