diff mbox series

[v2] opkg: upgrade 0.7.0 -> 0.9.0

Message ID 20251016111628.3050999-1-ecordonnier@snap.com
State New
Headers show
Series [v2] opkg: upgrade 0.7.0 -> 0.9.0 | expand

Commit Message

Etienne Cordonnier Oct. 16, 2025, 11:16 a.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

See release notes at
- http://downloads.yoctoproject.org/releases/opkg/opkg-0.9.0.release-notes
- http://downloads.yoctoproject.org/releases/opkg/opkg-0.8.0.release-notes

[0.9.0] - 2025-06-27

Semiannual opkg release.
Bumping the minor version as a result of the project build tooling changing from autotools to cmake.

- Added a Dockerfile container definition (`:docker/`) for a valid developer build environment for opkg.
  - It's recommended that project contributors use this container to build and test their changes.
- The AutoTools-based build framework has [been replaced](https://git.yoctoproject.org/opkg/commit/?id=3f6040e321634471ec442fb0e80f140f1437e90b) with a more modern, CMake framework.
  - Refer to the `docs/CONTRIBUTING.md` documentation for updated build instructions.

[0.8.0] - 2025-01-10

The minor version bump in this release is due to the changes to cURL error output line format.

- [Changed](https://git.yoctoproject.org/opkg/commit/?id=ab03377868256427279b36c4b2a298edae4260b8) the error output for the curl download backend, to now report the HTTP error code for failed requests.
  - e.g. `error: log_curl_download_error: Failed to download headers of https://foo.bar/all/Packages.gz: The requested URL returned error: 401`
- Enabling debug-verbosity, while using the cURL backend, [will now](https://git.yoctoproject.org/opkg/commit/?id=ce6fede3db931bb0da70d1334cdc4101d0aec702) print cURL's verbose error log to stderr when there is a download failure.
  - The verbose output may contain confidential information about your cURL transactions. So this is your reminder that debug-verbosity should not be enabled in production systems or sensitive security environments.
- The commandline configuration file option (`-f`) [can now](https://git.yoctoproject.org/opkg/commit/?id=36d08b93d2859992b624a4ba2f412cfa5c766050) be specified multiple times, and each configuration file will be loaded and their settings merged.
- [Fixed](https://git.yoctoproject.org/opkg/commit/?id=c87188d7535684fddb8cf80993c147b215602b63) a bug in control field parsing where custom fields whose keys are similar to other fields could be confused by the parser.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 meta/recipes-devtools/opkg/opkg/run-ptest     |  3 +--
 .../opkg/{opkg_0.7.0.bb => opkg_0.9.0.bb}     | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename meta/recipes-devtools/opkg/{opkg_0.7.0.bb => opkg_0.9.0.bb} (77%)

Comments

Mathieu Dubois-Briand Oct. 16, 2025, 3:33 p.m. UTC | #1 
On Thu Oct 16, 2025 at 1:16 PM CEST, Etienne Cordonnier via lists.openembedded.org wrote:
> From: Etienne Cordonnier <ecordonnier@snap.com>
>
> See release notes at
> - http://downloads.yoctoproject.org/releases/opkg/opkg-0.9.0.release-notes
> - http://downloads.yoctoproject.org/releases/opkg/opkg-0.8.0.release-notes
>
> [0.9.0] - 2025-06-27
>
> Semiannual opkg release.
> Bumping the minor version as a result of the project build tooling changing from autotools to cmake.
>
> - Added a Dockerfile container definition (`:docker/`) for a valid developer build environment for opkg.
>   - It's recommended that project contributors use this container to build and test their changes.
> - The AutoTools-based build framework has [been replaced](https://git.yoctoproject.org/opkg/commit/?id=3f6040e321634471ec442fb0e80f140f1437e90b) with a more modern, CMake framework.
>   - Refer to the `docs/CONTRIBUTING.md` documentation for updated build instructions.
>
> [0.8.0] - 2025-01-10
>
> The minor version bump in this release is due to the changes to cURL error output line format.
>
> - [Changed](https://git.yoctoproject.org/opkg/commit/?id=ab03377868256427279b36c4b2a298edae4260b8) the error output for the curl download backend, to now report the HTTP error code for failed requests.
>   - e.g. `error: log_curl_download_error: Failed to download headers of https://foo.bar/all/Packages.gz: The requested URL returned error: 401`
> - Enabling debug-verbosity, while using the cURL backend, [will now](https://git.yoctoproject.org/opkg/commit/?id=ce6fede3db931bb0da70d1334cdc4101d0aec702) print cURL's verbose error log to stderr when there is a download failure.
>   - The verbose output may contain confidential information about your cURL transactions. So this is your reminder that debug-verbosity should not be enabled in production systems or sensitive security environments.
> - The commandline configuration file option (`-f`) [can now](https://git.yoctoproject.org/opkg/commit/?id=36d08b93d2859992b624a4ba2f412cfa5c766050) be specified multiple times, and each configuration file will be loaded and their settings merged.
> - [Fixed](https://git.yoctoproject.org/opkg/commit/?id=c87188d7535684fddb8cf80993c147b215602b63) a bug in control field parsing where custom fields whose keys are similar to other fields could be confused by the parser.
>
> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
> ---

Hi Etienne,

Thanks for the new version. However we now have another issue:

ERROR: core-image-sato-1.0-r0 do_rootfs: Unable to install packages. Command '/srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/recipe-sysroot-native/usr/bin/opkg --volatile-cache -f /srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/opkg.conf -t /srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/temp/ipktemp/ -o /srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/rootfs  --force-postinstall --prefer-arch-to-version   install locale-base-c locale-base-en-gb locale-base-en-us' returned 255:
error: pkg_extract_data_file_names_to_stream: Failed to extract data.tar.* from package '/srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/rootfs//var/cache/opkg/volatile.121547/938adf05ba43d7b754c8c03468af836d_glibc-binary-localedata-c_2.42+git-r0_cortexa57.ipk'.
error: pkg_get_installed_files: Error extracting file list from /srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/rootfs//var/cache/opkg/volatile.121547/938adf05ba43d7b754c8c03468af836d_glibc-binary-localedata-c_2.42+git-r0_cortexa57.ipk.
Installing glibc-binary-localedata-c (2.42+git) on root
Downloading file:/srv/pokybuild/yocto-worker/qemuarm64-alt/build/build/tmp/work/qemuarm64-poky-linux/core-image-sato/1.0/oe-rootfs-repo/cortexa57/glibc-binary-localedata-c_2.42+git-r0_cortexa57.ipk.

https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/2584
https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/2576
https://autobuilder.yoctoproject.org/valkyrie/#/builders/22/builds/2629
https://autobuilder.yoctoproject.org/valkyrie/#/builders/65/builds/2594
https://autobuilder.yoctoproject.org/valkyrie/#/builders/74/builds/2582
https://autobuilder.yoctoproject.org/valkyrie/#/builders/93/builds/2600

Can you have a look at what is the issue here?

Thanks,
Mathieu
Jose Quaresma Oct. 16, 2025, 4:01 p.m. UTC | #2 
Hi Etienne

Can you split the patch in two commits for each version.

Etienne Cordonnier via lists.openembedded.org <ecordonnier=
snap.com@lists.openembedded.org> escreveu (quinta, 16/10/2025 à(s) 12:18):

> From: Etienne Cordonnier <ecordonnier@snap.com>
>
> See release notes at
> - http://downloads.yoctoproject.org/releases/opkg/opkg-0.9.0.release-notes
> - http://downloads.yoctoproject.org/releases/opkg/opkg-0.8.0.release-notes
>
> [0.9.0] - 2025-06-27
>
> Semiannual opkg release.
> Bumping the minor version as a result of the project build tooling
> changing from autotools to cmake.
>
> - Added a Dockerfile container definition (`:docker/`) for a valid
> developer build environment for opkg.
>   - It's recommended that project contributors use this container to build
> and test their changes.
> - The AutoTools-based build framework has [been replaced](
> https://git.yoctoproject.org/opkg/commit/?id=3f6040e321634471ec442fb0e80f140f1437e90b)
> with a more modern, CMake framework.
>   - Refer to the `docs/CONTRIBUTING.md` documentation for updated build
> instructions.
>
> [0.8.0] - 2025-01-10
>
> The minor version bump in this release is due to the changes to cURL error
> output line format.
>
> - [Changed](
> https://git.yoctoproject.org/opkg/commit/?id=ab03377868256427279b36c4b2a298edae4260b8)
> the error output for the curl download backend, to now report the HTTP
> error code for failed requests.
>   - e.g. `error: log_curl_download_error: Failed to download headers of
> https://foo.bar/all/Packages.gz: The requested URL returned error: 401`
> - Enabling debug-verbosity, while using the cURL backend, [will now](
> https://git.yoctoproject.org/opkg/commit/?id=ce6fede3db931bb0da70d1334cdc4101d0aec702)
> print cURL's verbose error log to stderr when there is a download failure.
>   - The verbose output may contain confidential information about your
> cURL transactions. So this is your reminder that debug-verbosity should not
> be enabled in production systems or sensitive security environments.
> - The commandline configuration file option (`-f`) [can now](
> https://git.yoctoproject.org/opkg/commit/?id=36d08b93d2859992b624a4ba2f412cfa5c766050)
> be specified multiple times, and each configuration file will be loaded and
> their settings merged.
> - [Fixed](
> https://git.yoctoproject.org/opkg/commit/?id=c87188d7535684fddb8cf80993c147b215602b63)
> a bug in control field parsing where custom fields whose keys are similar
> to other fields could be confused by the parser.
>
> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
> ---
>  meta/recipes-devtools/opkg/opkg/run-ptest     |  3 +--
>  .../opkg/{opkg_0.7.0.bb => opkg_0.9.0.bb}     | 21 +++++++++++--------
>  2 files changed, 13 insertions(+), 11 deletions(-)
>  rename meta/recipes-devtools/opkg/{opkg_0.7.0.bb => opkg_0.9.0.bb} (77%)
>
> diff --git a/meta/recipes-devtools/opkg/opkg/run-ptest
> b/meta/recipes-devtools/opkg/opkg/run-ptest
> index 5fb7077eec9..8cf09adba57 100644
> --- a/meta/recipes-devtools/opkg/opkg/run-ptest
> +++ b/meta/recipes-devtools/opkg/opkg/run-ptest
> @@ -1,5 +1,4 @@
>  #!/bin/sh
>
>  OPKG_PATH=$(which opkg)
> -
> -make OPKG_PATH=$OPKG_PATH run-tests
> +make -C tests DATADIR=/share SYSCONFDIR=/etc VARDIR=/var
> OPKG_PATH=$OPKG_PATH
> diff --git a/meta/recipes-devtools/opkg/opkg_0.7.0.bb
> b/meta/recipes-devtools/opkg/opkg_0.9.0.bb
> similarity index 77%
> rename from meta/recipes-devtools/opkg/opkg_0.7.0.bb
> rename to meta/recipes-devtools/opkg/opkg_0.9.0.bb
> index 95480b47164..9fa32268541 100644
> --- a/meta/recipes-devtools/opkg/opkg_0.7.0.bb
> +++ b/meta/recipes-devtools/opkg/opkg_0.9.0.bb
> @@ -18,31 +18,31 @@ SRC_URI = "
> http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
>             file://run-ptest \
>             "
>
> -SRC_URI[sha256sum] =
> "d973fd0f1568f58f87d6aecd9aa95e3e1f60214a45cee26704bf8fe757c54567"
> +SRC_URI[sha256sum] =
> "440ef321862e01f83da4d02884a0cbb4d9d7b32f82faa81a6a85493f0c89d0f5"
>
>  # This needs to be before ptest inherit, otherwise all ptest files end
> packaged
>  # in libopkg package if OPKGLIBDIR == libdir, because default
>  # PTEST_PATH ?= "${libdir}/${BPN}/ptest"
>  PACKAGES =+ "libopkg"
>
> -inherit autotools pkgconfig ptest
> +inherit cmake pkgconfig ptest
>
>  target_localstatedir := "${localstatedir}"
>  OPKGLIBDIR ??= "${target_localstatedir}/lib"
>
>  PACKAGECONFIG ??= "libsolv"
>
> -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
> +PACKAGECONFIG[gpg] = "-DWITH_GPGME=ON,-DWITH_GPGME=OFF,\
>      gnupg gpgme libgpg-error,\
>      ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\
>      "
> -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
> -PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl
> openssl"
> -PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
> -PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
> +PACKAGECONFIG[curl] = "-DWITH_CURL=0N,-DWITH_CURL=OFF,curl"
> +PACKAGECONFIG[ssl-curl] = "-DWITH_SSLCURL=ON,-DWITH_SSLCURL=OFF,curl
> openssl"
> +PACKAGECONFIG[sha256] = "-DWITH_SHA256=ON,-DWITH_SHA256=OFF"
> +PACKAGECONFIG[libsolv] =
> "-DUSE_SOLVER_LIBSOLV=ON,-DUSE_SOLVER_LIBSOLV=OFF,libsolv"
>
> -EXTRA_OECONF = "--enable-zstd"

-EXTRA_OECONF:append:class-native = "
> --localstatedir=/${@os.path.relpath('${localstatedir}',
> '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}',
> '${STAGING_DIR_NATIVE}')}"
> +EXTRA_OECMAKE = "-DWITH_ZSTD=ON"
>

I wonder if we shouldn't also disable the XZ which is enabled by default
and we don't use it.

Jose


> +EXTRA_OECMAKE:append:class-native = "
> -DVARDIR=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')}
> -DSYSCONFDIR=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
>
>  do_install:append () {
>         install -d ${D}${sysconfdir}/opkg
> @@ -56,6 +56,9 @@ do_install:append () {
>  }
>
>  do_install_ptest () {
> +       # the ptest class uses a Makefile for installation, but cmake uses
> Ninja per default so we need to install ptests manually:
> +       cp -r ${S}/tests ${D}${PTEST_PATH}
> +
>         sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile
>         sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0"
> ];then echo "FAIL:"$^;else echo "PASS:"$^;fi'
> ${D}${PTEST_PATH}/tests/Makefile
>  }
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#224962):
> https://lists.openembedded.org/g/openembedded-core/message/224962
> Mute This Topic: https://lists.openembedded.org/mt/115787032/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Etienne Cordonnier Oct. 20, 2025, 5:15 p.m. UTC | #3 
@Jose Quaresma <quaresma.jose@gmail.com> : I have split the patch in 2.
Regarding the removal of XZ, it doesn't really make a difference, as xz is
included in the image anyway, and opkg compilation time is the same.

@mathieu Dubois-Briand: I had mistakenly tested the branch using a build of
poky (which doesn't use ipk files). I've tested it on master 416731b875 +
poky-altcfg now, and fixed the issue which was a typo in config.h.in.



On Thu, Oct 16, 2025 at 6:02 PM Jose Quaresma <quaresma.jose@gmail.com>
wrote:

> Hi Etienne
>
> Can you split the patch in two commits for each version.
>
> Etienne Cordonnier via lists.openembedded.org
> <https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.openembedded.org&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=DfOve6GcE4fkNBG-2ZFQrmKfq__XSi4vz52l-aykKAw&e=>
> <ecordonnier=snap.com@lists.openembedded.org> escreveu (quinta,
> 16/10/2025 à(s) 12:18):
>
>> From: Etienne Cordonnier <ecordonnier@snap.com>
>>
>> See release notes at
>> -
>> http://downloads.yoctoproject.org/releases/opkg/opkg-0.9.0.release-notes
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__downloads.yoctoproject.org_releases_opkg_opkg-2D0.9.0.release-2Dnotes&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=KNbnXUHj2fSREpHV0s2F6aYqYvjxWDuTswGzIvWWV2k&e=>
>> -
>> http://downloads.yoctoproject.org/releases/opkg/opkg-0.8.0.release-notes
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__downloads.yoctoproject.org_releases_opkg_opkg-2D0.8.0.release-2Dnotes&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=O6V-VGqDq5zU3nAG7icfVZe36d6oVOHOodkO840sECs&e=>
>>
>> [0.9.0] - 2025-06-27
>>
>> Semiannual opkg release.
>> Bumping the minor version as a result of the project build tooling
>> changing from autotools to cmake.
>>
>> - Added a Dockerfile container definition (`:docker/`) for a valid
>> developer build environment for opkg.
>>   - It's recommended that project contributors use this container to
>> build and test their changes.
>> - The AutoTools-based build framework has [been replaced](
>> https://git.yoctoproject.org/opkg/commit/?id=3f6040e321634471ec442fb0e80f140f1437e90b
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__git.yoctoproject.org_opkg_commit_-3Fid-3D3f6040e321634471ec442fb0e80f140f1437e90b&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=DcpmG3-Bx6ce6HheIfWkI-J9FHTUksxIfct1E8oOiNw&e=>)
>> with a more modern, CMake framework.
>>   - Refer to the `docs/CONTRIBUTING.md` documentation for updated build
>> instructions.
>>
>> [0.8.0] - 2025-01-10
>>
>> The minor version bump in this release is due to the changes to cURL
>> error output line format.
>>
>> - [Changed](
>> https://git.yoctoproject.org/opkg/commit/?id=ab03377868256427279b36c4b2a298edae4260b8
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__git.yoctoproject.org_opkg_commit_-3Fid-3Dab03377868256427279b36c4b2a298edae4260b8&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=H70DYguzkjmnuvRkCHHMveEPaNPlcBv9RxaLksBFUTo&e=>)
>> the error output for the curl download backend, to now report the HTTP
>> error code for failed requests.
>>   - e.g. `error: log_curl_download_error: Failed to download headers of
>> https://foo.bar/all/Packages.gz
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__foo.bar_all_Packages.gz&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=RAtB8yMZIGmu5FIMg0JykVg8nV76aiQ9bfu6IrQrC8A&e=>:
>> The requested URL returned error: 401`
>> - Enabling debug-verbosity, while using the cURL backend, [will now](
>> https://git.yoctoproject.org/opkg/commit/?id=ce6fede3db931bb0da70d1334cdc4101d0aec702
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__git.yoctoproject.org_opkg_commit_-3Fid-3Dce6fede3db931bb0da70d1334cdc4101d0aec702&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=Ug3p6iIXLdlkNAjIPwAYEeaOBSGz4W9rI6gca8Aa-Qw&e=>)
>> print cURL's verbose error log to stderr when there is a download failure.
>>   - The verbose output may contain confidential information about your
>> cURL transactions. So this is your reminder that debug-verbosity should not
>> be enabled in production systems or sensitive security environments.
>> - The commandline configuration file option (`-f`) [can now](
>> https://git.yoctoproject.org/opkg/commit/?id=36d08b93d2859992b624a4ba2f412cfa5c766050
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__git.yoctoproject.org_opkg_commit_-3Fid-3D36d08b93d2859992b624a4ba2f412cfa5c766050&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=UOBoaRU5Y4tzdqAYhSrdZ5XG3GT7V_HTW8kVlQnqHX0&e=>)
>> be specified multiple times, and each configuration file will be loaded and
>> their settings merged.
>> - [Fixed](
>> https://git.yoctoproject.org/opkg/commit/?id=c87188d7535684fddb8cf80993c147b215602b63
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__git.yoctoproject.org_opkg_commit_-3Fid-3Dc87188d7535684fddb8cf80993c147b215602b63&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=jyBf9SJwZSCnTtZVGZohRY_fHgAj-ZbDYtX8O3SnT1k&e=>)
>> a bug in control field parsing where custom fields whose keys are similar
>> to other fields could be confused by the parser.
>>
>> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
>> ---
>>  meta/recipes-devtools/opkg/opkg/run-ptest     |  3 +--
>>  .../opkg/{opkg_0.7.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.7.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=OMsg5j2SntLtnq639bM4Jdhqbu8G8whfBGssWJUthzs&e=>
>> => opkg_0.9.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.9.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=RFGtFKAinYLuzar9ujH_U3dTosu9W2Tk1qnMxj9oBfs&e=>}
>>    | 21 +++++++++++--------
>>  2 files changed, 13 insertions(+), 11 deletions(-)
>>  rename meta/recipes-devtools/opkg/{opkg_0.7.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.7.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=OMsg5j2SntLtnq639bM4Jdhqbu8G8whfBGssWJUthzs&e=>
>> => opkg_0.9.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.9.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=RFGtFKAinYLuzar9ujH_U3dTosu9W2Tk1qnMxj9oBfs&e=>}
>> (77%)
>>
>> diff --git a/meta/recipes-devtools/opkg/opkg/run-ptest
>> b/meta/recipes-devtools/opkg/opkg/run-ptest
>> index 5fb7077eec9..8cf09adba57 100644
>> --- a/meta/recipes-devtools/opkg/opkg/run-ptest
>> +++ b/meta/recipes-devtools/opkg/opkg/run-ptest
>> @@ -1,5 +1,4 @@
>>  #!/bin/sh
>>
>>  OPKG_PATH=$(which opkg)
>> -
>> -make OPKG_PATH=$OPKG_PATH run-tests
>> +make -C tests DATADIR=/share SYSCONFDIR=/etc VARDIR=/var
>> OPKG_PATH=$OPKG_PATH
>> diff --git a/meta/recipes-devtools/opkg/opkg_0.7.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.7.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=OMsg5j2SntLtnq639bM4Jdhqbu8G8whfBGssWJUthzs&e=>
>> b/meta/recipes-devtools/opkg/opkg_0.9.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.9.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=RFGtFKAinYLuzar9ujH_U3dTosu9W2Tk1qnMxj9oBfs&e=>
>> similarity index 77%
>> rename from meta/recipes-devtools/opkg/opkg_0.7.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.7.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=OMsg5j2SntLtnq639bM4Jdhqbu8G8whfBGssWJUthzs&e=>
>> rename to meta/recipes-devtools/opkg/opkg_0.9.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.9.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=RFGtFKAinYLuzar9ujH_U3dTosu9W2Tk1qnMxj9oBfs&e=>
>> index 95480b47164..9fa32268541 100644
>> --- a/meta/recipes-devtools/opkg/opkg_0.7.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.7.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=OMsg5j2SntLtnq639bM4Jdhqbu8G8whfBGssWJUthzs&e=>
>> +++ b/meta/recipes-devtools/opkg/opkg_0.9.0.bb
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__opkg-5F0.9.0.bb&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=RFGtFKAinYLuzar9ujH_U3dTosu9W2Tk1qnMxj9oBfs&e=>
>> @@ -18,31 +18,31 @@ SRC_URI = "
>> http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
>> <https://urldefense.proofpoint.com/v2/url?u=http-3A__downloads.yoctoproject.org_releases_-24-257BBPN-257D_-24-257BBPN-257D-2D-24-257BPV-257D.tar.gz&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=ta5Qcisz9X4bnk0_9uPOiSJqA4eK3OCu7IW2PaElyRw&e=>
>>             file://run-ptest \
>>             "
>>
>> -SRC_URI[sha256sum] =
>> "d973fd0f1568f58f87d6aecd9aa95e3e1f60214a45cee26704bf8fe757c54567"
>> +SRC_URI[sha256sum] =
>> "440ef321862e01f83da4d02884a0cbb4d9d7b32f82faa81a6a85493f0c89d0f5"
>>
>>  # This needs to be before ptest inherit, otherwise all ptest files end
>> packaged
>>  # in libopkg package if OPKGLIBDIR == libdir, because default
>>  # PTEST_PATH ?= "${libdir}/${BPN}/ptest"
>>  PACKAGES =+ "libopkg"
>>
>> -inherit autotools pkgconfig ptest
>> +inherit cmake pkgconfig ptest
>>
>>  target_localstatedir := "${localstatedir}"
>>  OPKGLIBDIR ??= "${target_localstatedir}/lib"
>>
>>  PACKAGECONFIG ??= "libsolv"
>>
>> -PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
>> +PACKAGECONFIG[gpg] = "-DWITH_GPGME=ON,-DWITH_GPGME=OFF,\
>>      gnupg gpgme libgpg-error,\
>>      ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\
>>      "
>> -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
>> -PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl
>> openssl"
>> -PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
>> -PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
>> +PACKAGECONFIG[curl] = "-DWITH_CURL=0N,-DWITH_CURL=OFF,curl"
>> +PACKAGECONFIG[ssl-curl] = "-DWITH_SSLCURL=ON,-DWITH_SSLCURL=OFF,curl
>> openssl"
>> +PACKAGECONFIG[sha256] = "-DWITH_SHA256=ON,-DWITH_SHA256=OFF"
>> +PACKAGECONFIG[libsolv] =
>> "-DUSE_SOLVER_LIBSOLV=ON,-DUSE_SOLVER_LIBSOLV=OFF,libsolv"
>>
>> -EXTRA_OECONF = "--enable-zstd"
>
> -EXTRA_OECONF:append:class-native = "
>> --localstatedir=/${@os.path.relpath('${localstatedir}',
>> '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}',
>> '${STAGING_DIR_NATIVE}')}"
>> +EXTRA_OECMAKE = "-DWITH_ZSTD=ON"
>>
>
> I wonder if we shouldn't also disable the XZ which is enabled by default
> and we don't use it.
>
> Jose
>
>
>> +EXTRA_OECMAKE:append:class-native = "
>> -DVARDIR=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')}
>> -DSYSCONFDIR=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
>>
>>  do_install:append () {
>>         install -d ${D}${sysconfdir}/opkg
>> @@ -56,6 +56,9 @@ do_install:append () {
>>  }
>>
>>  do_install_ptest () {
>> +       # the ptest class uses a Makefile for installation, but cmake
>> uses Ninja per default so we need to install ptests manually:
>> +       cp -r ${S}/tests ${D}${PTEST_PATH}
>> +
>>         sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile
>>         sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0"
>> ];then echo "FAIL:"$^;else echo "PASS:"$^;fi'
>> ${D}${PTEST_PATH}/tests/Makefile
>>  }
>> --
>> 2.43.0
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#224962):
>> https://lists.openembedded.org/g/openembedded-core/message/224962
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_224962&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=A96g_c8XIWmusAl7AYv3FfTlBFDiBfjZbK3EvrBmeqA&e=>
>> Mute This Topic: https://lists.openembedded.org/mt/115787032/5052612
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_115787032_5052612&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=7yYXkjigmF_deWqMGtQck7PTivbq6UQX_SHIKBjDK00&e=>
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwMFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=HFaQCCsFdUt-sQumyb3LInOO7B8b8F55J7i-eRwUTnghNpJxAqAQMyXF3F4V21bh&s=NqoQnEJdeqGKN_jWENKSttGZ2q78jAuMI51cyCnSsYs&e=>
>> [quaresma.jose@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>
>
> --
> Best regards,
>
> José Quaresma
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/opkg/opkg/run-ptest b/meta/recipes-devtools/opkg/opkg/run-ptest
index 5fb7077eec9..8cf09adba57 100644
--- a/meta/recipes-devtools/opkg/opkg/run-ptest
+++ b/meta/recipes-devtools/opkg/opkg/run-ptest
@@ -1,5 +1,4 @@ 
 #!/bin/sh
 
 OPKG_PATH=$(which opkg)
-
-make OPKG_PATH=$OPKG_PATH run-tests
+make -C tests DATADIR=/share SYSCONFDIR=/etc VARDIR=/var OPKG_PATH=$OPKG_PATH
diff --git a/meta/recipes-devtools/opkg/opkg_0.7.0.bb b/meta/recipes-devtools/opkg/opkg_0.9.0.bb
similarity index 77%
rename from meta/recipes-devtools/opkg/opkg_0.7.0.bb
rename to meta/recipes-devtools/opkg/opkg_0.9.0.bb
index 95480b47164..9fa32268541 100644
--- a/meta/recipes-devtools/opkg/opkg_0.7.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.9.0.bb
@@ -18,31 +18,31 @@  SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "d973fd0f1568f58f87d6aecd9aa95e3e1f60214a45cee26704bf8fe757c54567"
+SRC_URI[sha256sum] = "440ef321862e01f83da4d02884a0cbb4d9d7b32f82faa81a6a85493f0c89d0f5"
 
 # This needs to be before ptest inherit, otherwise all ptest files end packaged
 # in libopkg package if OPKGLIBDIR == libdir, because default
 # PTEST_PATH ?= "${libdir}/${BPN}/ptest"
 PACKAGES =+ "libopkg"
 
-inherit autotools pkgconfig ptest
+inherit cmake pkgconfig ptest
 
 target_localstatedir := "${localstatedir}"
 OPKGLIBDIR ??= "${target_localstatedir}/lib"
 
 PACKAGECONFIG ??= "libsolv"
 
-PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,\
+PACKAGECONFIG[gpg] = "-DWITH_GPGME=ON,-DWITH_GPGME=OFF,\
     gnupg gpgme libgpg-error,\
     ${@ "gnupg" if ("native" in d.getVar("PN")) else "gnupg-gpg"}\
     "
-PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
-PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
-PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
-PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
+PACKAGECONFIG[curl] = "-DWITH_CURL=0N,-DWITH_CURL=OFF,curl"
+PACKAGECONFIG[ssl-curl] = "-DWITH_SSLCURL=ON,-DWITH_SSLCURL=OFF,curl openssl"
+PACKAGECONFIG[sha256] = "-DWITH_SHA256=ON,-DWITH_SHA256=OFF"
+PACKAGECONFIG[libsolv] = "-DUSE_SOLVER_LIBSOLV=ON,-DUSE_SOLVER_LIBSOLV=OFF,libsolv"
 
-EXTRA_OECONF = "--enable-zstd"
-EXTRA_OECONF:append:class-native = " --localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
+EXTRA_OECMAKE = "-DWITH_ZSTD=ON"
+EXTRA_OECMAKE:append:class-native = " -DVARDIR=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} -DSYSCONFDIR=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
 
 do_install:append () {
 	install -d ${D}${sysconfdir}/opkg
@@ -56,6 +56,9 @@  do_install:append () {
 }
 
 do_install_ptest () {
+	# the ptest class uses a Makefile for installation, but cmake uses Ninja per default so we need to install ptests manually:
+	cp -r ${S}/tests ${D}${PTEST_PATH}
+
 	sed -i -e '/@echo $^/d' ${D}${PTEST_PATH}/tests/Makefile
 	sed -i -e '/@PYTHONPATH=. $(PYTHON) $^/a\\t@if [ "$$?" != "0" ];then echo "FAIL:"$^;else echo "PASS:"$^;fi' ${D}${PTEST_PATH}/tests/Makefile
 }