nginx-server test need forbidden nf_conntrack when os setup Signed-off-by: Wei Jihui <weijihuiall@163.com> --- pkg/nginx-server/PKGBUILD | 10 ++++++++-- pkg/nginx-server/blacklist.conf | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkg/nginx-server/blacklist.conf diff --git a/pkg/nginx-server/PKGBUILD b/pkg/nginx-server/PKGBUILD index 141722e1..ac458776 100644 --- a/pkg/nginx-server/PKGBUILD +++ b/pkg/nginx-server/PKGBUILD @@ -5,8 +5,8 @@ arch=('i386' 'x86_64') url="https://nginx.org" license=('BSD') nginx_name=("nginx-${pkgver}.${pkgrel}") -source=("https://nginx.org/download/${nginx_name}.tar.gz") -md5sums=('SKIP') +source=("https://nginx.org/download/${nginx_name}.tar.gz" "blacklist.conf") +md5sums=('SKIP' 'SKIP') build() { @@ -19,6 +19,12 @@ build() package() { + mkdir -p "$pkgdir/rootfs/addon/etc/modprobe.d/" + cp blacklist.conf "$pkgdir/rootfs/addon/etc/modprobe.d/" + + mkdir -p "$pkgdir/lkp/benchmarks/${pkgname}/" + cp -r "$LKP_SRC/pkg/${pkgname}/nginx_conf" "$pkgdir/lkp/benchmarks/${pkgname}/" + cd "${srcdir}/${nginx_name}" make install DESTDIR="${pkgdir}" } diff --git a/pkg/nginx-server/blacklist.conf b/pkg/nginx-server/blacklist.conf new file mode 100644 index 00000000..e8798cc7 --- /dev/null +++ b/pkg/nginx-server/blacklist.conf @@ -0,0 +1,10 @@ +install nf_conntrack /bin/false +blacklist nf_conntrack +blacklist nf_conntrack_ipv6 +blacklist xt_conntrack +blacklist nf_conntrack_ftp +blacklist xt_state +blacklist iptable_nat +blacklist ipt_REDIRECT +blacklist nf_nat +blacklist nf_conntrack_ipv4 -- 2.23.0