summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleimaohui <leimaohui@fujitsu.com>2023-05-19 17:47:29 +0200
committerSteve Sakoman <steve@sakoman.com>2023-05-30 04:11:15 -1000
commit80bf4d4f9ad5013851687e7d81bbeda93351d089 (patch)
tree32a1b8c3dfbbe1cba4518a041bdcedfa230943ef
parent65a57df04c9e7e0e8b4c294ddd31c97bece55fc1 (diff)
downloadpoky-80bf4d4f9ad5013851687e7d81bbeda93351d089.tar.gz
nghttp2: Deleted the entries for -client and -server, and removed a dependency on them from the main package.
By default there is nothing in nghttp2-client and nghttp2-server ,nghttp2-client and nghttp2-server aren't created. So there are dependences error if install main package. Problem: conflicting requests - nothing provides nghttp2-client >= 1.52.0 needed by nghttp2-1.52.0-r0.core2_64 - nothing provides nghttp2-server >= 1.52.0 needed by nghttp2-1.52.0-r0.core2_64 Upstream-Status: Backport [OE-core d2cbe060955c598bd81923ecd554fbe82c17af99] (From OE-Core rev: 619a643f71eceab73bbbe4dacd1eb42b6d6b01d1) Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-support/nghttp2/nghttp2_1.47.0.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
index becacd4502..90d3286ac6 100644
--- a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
+++ b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
@@ -23,17 +23,15 @@ EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF -DENABLE_HPACK_TOOLS=OFF
23# 23#
24EXTRA_OECMAKE += "-DENABLE_PYTHON_BINDINGS=OFF" 24EXTRA_OECMAKE += "-DENABLE_PYTHON_BINDINGS=OFF"
25 25
26PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server" 26PACKAGES =+ "lib${BPN} ${PN}-proxy "
27 27
28RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" 28RDEPENDS:${PN} = "${PN}-proxy (>= ${PV})"
29RDEPENDS:${PN}:class-native = "" 29RDEPENDS:${PN}:class-native = ""
30RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" 30RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell"
31 31
32ALLOW_EMPTY:${PN} = "1" 32ALLOW_EMPTY:${PN} = "1"
33FILES:${PN} = "" 33FILES:${PN} = ""
34FILES:lib${BPN} = "${libdir}/*${SOLIBS}" 34FILES:lib${BPN} = "${libdir}/*${SOLIBS}"
35FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
36FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" 35FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
37FILES:${PN}-server = "${bindir}/nghttpd"
38 36
39BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"