summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@fujitsu.com>2021-12-07 08:05:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-08 20:22:11 +0000
commitddc5baf4d97570ec80054e7770ec71c2c05cfdc1 (patch)
tree0512f407044607a58d75c1bc68e4fcfd046d97cb
parent02f7376bb9c86262e8363262385cd506cb5ced33 (diff)
downloadpoky-ddc5baf4d97570ec80054e7770ec71c2c05cfdc1.tar.gz
opkg: upgrade 0.4.5 -> 0.5.0
Remove unsupported openssl and option --disable-pathfinder [RP: Drop openssl QA related warning] (From OE-Core rev: 9e2a5d6557ca7d2c3aea39cfe18003e35310db34) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.5.0.bb (renamed from meta/recipes-devtools/opkg/opkg_0.4.5.bb)18
1 files changed, 1 insertions, 17 deletions
diff --git a/meta/recipes-devtools/opkg/opkg_0.4.5.bb b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
index 1fe6ed5ecb..f7d8abb806 100644
--- a/meta/recipes-devtools/opkg/opkg_0.4.5.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
@@ -18,8 +18,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
18 file://run-ptest \ 18 file://run-ptest \
19" 19"
20 20
21SRC_URI[md5sum] = "5dc41ad37d88803b5e0f456a9c5a0811" 21SRC_URI[sha256sum] = "559c3e1b893abaa1dd473ce3a9a5f7dd3f60ceb6cd14caaef76ddf0f7721ad1c"
22SRC_URI[sha256sum] = "a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e"
23 22
24# This needs to be before ptest inherit, otherwise all ptest files end packaged 23# This needs to be before ptest inherit, otherwise all ptest files end packaged
25# in libopkg package if OPKGLIBDIR == libdir, because default 24# in libopkg package if OPKGLIBDIR == libdir, because default
@@ -39,11 +38,9 @@ PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
39 " 38 "
40PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 39PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
41PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl" 40PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
42PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
43PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256" 41PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
44PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" 42PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
45 43
46EXTRA_OECONF += " --disable-pathfinder"
47EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}" 44EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
48 45
49do_install:append () { 46do_install:append () {
@@ -60,19 +57,6 @@ do_install_ptest () {
60 sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile 57 sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile
61} 58}
62 59
63WARN_QA:append = " openssl-deprecation"
64QAPKGTEST[openssl-deprecation] = "package_qa_check_openssl_deprecation"
65def package_qa_check_openssl_deprecation (package, d, messages):
66 sane = True
67
68 pkgconfig = (d.getVar("PACKAGECONFIG") or "").split()
69 if pkgconfig and 'openssl' in pkgconfig:
70 oe.qa.add_message(messages, 'openssl-deprecation', '"openssl" in opkg.bb PACKAGECONFIG. Feed signature checking with OpenSSL will be deprecated in the next opkg release. Consider using GPG checking instead.')
71 sane = False
72
73 return sane
74
75
76RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" 60RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive"
77RDEPENDS:${PN}:class-native = "" 61RDEPENDS:${PN}:class-native = ""
78RDEPENDS:${PN}:class-nativesdk = "" 62RDEPENDS:${PN}:class-nativesdk = ""