From b8f48269dfd1ef32eb37121416dcb3f914bbdcda Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Fri, 22 Jul 2022 22:11:42 -0500 Subject: [PATCH] setup-helper: added libmnl inject, refined libnghttp2 inject --- iso/bin/setup-helper | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper index 58c7b41..b28789c 100755 --- a/iso/bin/setup-helper +++ b/iso/bin/setup-helper @@ -103,10 +103,10 @@ rename_packages pkg-config:pkgconf inject_packages libpcre2 cmake meson ninja # new deps of core/cmake -inject_packages jsoncpp libnghttp2 libuv lzlib rhash +inject_packages jsoncpp libuv lzlib rhash # new deps of core/iptables -inject_packages nftables libedit jansson libnftnl +inject_packages nftables libedit jansson libnftnl libmnl if [ `is_installed xfsprogs` ]; then @@ -125,3 +125,8 @@ if [ `is_installed xorg-server` ]; then inject_packages nettle xorg-libxcvt fi +if [ `is_installed nghttp2-libs` ]; then + rename_packages nghttp2-libs:libnghttp2 +else + inject_packages libnghttp2 +fi