opkg: upgrade 0.4.5 -> 0.5.0

Message ID 1638835541-3789-1-git-send-email-zhengrq.fnst@fujitsu.com
State Accepted, archived
Commit 9e2a5d6557ca7d2c3aea39cfe18003e35310db34
Headers show
Series opkg: upgrade 0.4.5 -> 0.5.0 | expand

Commit Message

zhengrq.fnst@fujitsu.com Dec. 7, 2021, 12:05 a.m. UTC
Remove unsupported openssl and option --disable-pathfinder

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
---
 meta/recipes-devtools/opkg/{opkg_0.4.5.bb => opkg_0.5.0.bb} | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 rename meta/recipes-devtools/opkg/{opkg_0.4.5.bb => opkg_0.5.0.bb} (92%)

Comments

Alex Stewart Dec. 6, 2021, 7:13 p.m. UTC | #1
You beat me to posting my own recipe upgrade commit. :)

Toward the bottom of the opkg_*.bb recipe file is a 
`package_qa_check_openssl_deprecation` function which I added in the 
0.4.5 release to warn BB users when they are building opkg with the 
openssl options. Could you amend your patchset to remove that function 
in its entirety, since it is no longer needed.

On 12/6/21 18:05, zhengruoqin wrote:
> Remove unsupported openssl and option --disable-pathfinder
>
> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com>
> ---
>   meta/recipes-devtools/opkg/{opkg_0.4.5.bb => opkg_0.5.0.bb} | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>   rename meta/recipes-devtools/opkg/{opkg_0.4.5.bb => opkg_0.5.0.bb} (92%)
>
> diff --git a/meta/recipes-devtools/opkg/opkg_0.4.5.bb b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
> similarity index 92%
> rename from meta/recipes-devtools/opkg/opkg_0.4.5.bb
> rename to meta/recipes-devtools/opkg/opkg_0.5.0.bb
> index 1fe6ed5ecb..bc2ee9728b 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 = "https://urldefense.com/v3/__http://downloads.yoctoproject.org/releases/$*7BBPN*7D/$*7BBPN*7D-$*7BPV*7D.tar.gz__;JSUlJSUl!!FbZ0ZwI3Qg!7tN48q7yAANgWzzpMBAysrcbhsbWEdwp0sXfb2Hl7bFTyNxbtdOuRQFN01Y06ns$
>              file://run-ptest \
>   "
>   
> -SRC_URI[md5sum] = "5dc41ad37d88803b5e0f456a9c5a0811"
> -SRC_URI[sha256sum] = "a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e"
> +SRC_URI[sha256sum] = "559c3e1b893abaa1dd473ce3a9a5f7dd3f60ceb6cd14caaef76ddf0f7721ad1c"
>   
>   # This needs to be before ptest inherit, otherwise all ptest files end packaged
>   # in libopkg package if OPKGLIBDIR == libdir, because default
> @@ -39,11 +38,9 @@ PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
>       "
>   PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
>   PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
> -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
>   PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
>   PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
>   
> -EXTRA_OECONF += " --disable-pathfinder"
>   EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
>   
>   do_install:append () {
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159234): https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/159234__;!!FbZ0ZwI3Qg!7tN48q7yAANgWzzpMBAysrcbhsbWEdwp0sXfb2Hl7bFTyNxbtdOuRQFNYTohWF4$
> Mute This Topic: https://urldefense.com/v3/__https://lists.openembedded.org/mt/87541521/3616788__;!!FbZ0ZwI3Qg!7tN48q7yAANgWzzpMBAysrcbhsbWEdwp0sXfb2Hl7bFTyNxbtdOuRQFNxmktw8A$
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/unsub__;!!FbZ0ZwI3Qg!7tN48q7yAANgWzzpMBAysrcbhsbWEdwp0sXfb2Hl7bFTyNxbtdOuRQFNBNnQw3g$  [alex.stewart@ni.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Richard Purdie Dec. 6, 2021, 11:27 p.m. UTC | #2
On Mon, 2021-12-06 at 13:13 -0600, Alex Stewart wrote:
> You beat me to posting my own recipe upgrade commit. :)
> 
> Toward the bottom of the opkg_*.bb recipe file is a 
> `package_qa_check_openssl_deprecation` function which I added in the 
> 0.4.5 release to warn BB users when they are building opkg with the 
> openssl options. Could you amend your patchset to remove that function 
> in its entirety, since it is no longer needed.

I added in that tweak since I wanted to get things queued for testing.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/opkg/opkg_0.4.5.bb b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
similarity index 92%
rename from meta/recipes-devtools/opkg/opkg_0.4.5.bb
rename to meta/recipes-devtools/opkg/opkg_0.5.0.bb
index 1fe6ed5ecb..bc2ee9728b 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
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "5dc41ad37d88803b5e0f456a9c5a0811"
-SRC_URI[sha256sum] = "a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e"
+SRC_URI[sha256sum] = "559c3e1b893abaa1dd473ce3a9a5f7dd3f60ceb6cd14caaef76ddf0f7721ad1c"
 
 # This needs to be before ptest inherit, otherwise all ptest files end packaged
 # in libopkg package if OPKGLIBDIR == libdir, because default
@@ -39,11 +38,9 @@  PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
     "
 PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
 PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
-PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
 PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
 PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
 
-EXTRA_OECONF += " --disable-pathfinder"
 EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
 
 do_install:append () {