* [OE-core] [PATCH v2 2/2] zlib: minizip: add recipe
2022-07-15 11:55 [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file Sean Nyekjaer
@ 2022-07-15 11:55 ` Sean Nyekjaer
2022-07-18 16:12 ` [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file Ross Burton
2022-07-23 12:27 ` Alexandre Belloni
2 siblings, 0 replies; 7+ messages in thread
From: Sean Nyekjaer @ 2022-07-15 11:55 UTC (permalink / raw)
To: openembedded-core, denis, richard.purdie, raj.khem; +Cc: Sean Nyekjaer
Add the minizip library for use as a dependency.
zlib doesn't support vanilla autotools, but atleast this minizip does.
minizip does depend on zlib, so combining these recipes turns out to be
a quite hacky approach.
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
---
Should we keep Denys Dmytriyenko <denis@denix.org> as maintainer here?
It's after all the same artifact that is used for both recipes?
meta/conf/distro/include/maintainers.inc | 1 +
meta/recipes-core/zlib/minizip_1.2.12.bb | 15 +++++++++++++++
2 files changed, 16 insertions(+)
create mode 100644 meta/recipes-core/zlib/minizip_1.2.12.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index a69af3d780..1db5cadbcf 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -506,6 +506,7 @@ RECIPE_MAINTAINER:pn-meta-world-pkgdata = "Richard Purdie <richard.purdie@linuxf
RECIPE_MAINTAINER:pn-mingetty = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER:pn-mini-x-session = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-minicom = "Anuj Mittal <anuj.mittal@intel.com>"
+RECIPE_MAINTAINER:pn-minizip = "Sean Nyekjaer <sean@geanix.com>"
RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>"
RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>"
diff --git a/meta/recipes-core/zlib/minizip_1.2.12.bb b/meta/recipes-core/zlib/minizip_1.2.12.bb
new file mode 100644
index 0000000000..548bb8c62b
--- /dev/null
+++ b/meta/recipes-core/zlib/minizip_1.2.12.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Minimal zip library using deflate from zlib"
+HOMEPAGE = "http://zlib.net/"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://MiniZip64_info.txt;beginline=53;endline=73;md5=02090b3a3511ed8a910b77dae6906cea"
+
+include zlib.inc
+
+inherit autotools
+
+DEPENDS = "zlib"
+
+S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.37.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file
2022-07-15 11:55 [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file Sean Nyekjaer
2022-07-15 11:55 ` [OE-core] [PATCH v2 2/2] zlib: minizip: add recipe Sean Nyekjaer
@ 2022-07-18 16:12 ` Ross Burton
2022-08-08 10:20 ` Sean Nyekjaer
2022-07-23 12:27 ` Alexandre Belloni
2 siblings, 1 reply; 7+ messages in thread
From: Ross Burton @ 2022-07-18 16:12 UTC (permalink / raw)
To: Sean Nyekjaer
Cc: Patches and discussions about the oe-core layer, denis@denix.org,
Richard Purdie, Khem Raj
This still seems overkill. You can build minizip from inside the zlib recipe by fixing the minizip Makefile (fix posted to https://github.com/madler/zlib/pull/681) and then adding one line to do_compile:
oe_runmake -C contrib/minizip CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
A corresponding manual do_install too, obviously.
Ross
> On 15 Jul 2022, at 12:55, Sean Nyekjaer via lists.openembedded.org <sean=geanix.com@lists.openembedded.org> wrote:
>
> This is done in preparation for adding packages from the zlib contrib
> directory.
> Unfortunatly it's not possible to add these via pkgconfig.
>
> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
> ---
> With this we are maintaining the same verison number for both zlib and
> minizip in the recipe name. Would it be better to have it in the inc
> file?
>
> PV = "1.2.12" ?
>
> meta/recipes-core/zlib/zlib.inc | 4 ++++
> meta/recipes-core/zlib/zlib_1.2.12.bb | 18 +++++++++---------
> 2 files changed, 13 insertions(+), 9 deletions(-)
> create mode 100644 meta/recipes-core/zlib/zlib.inc
>
> diff --git a/meta/recipes-core/zlib/zlib.inc b/meta/recipes-core/zlib/zlib.inc
> new file mode 100644
> index 0000000000..b607a82312
> --- /dev/null
> +++ b/meta/recipes-core/zlib/zlib.inc
> @@ -0,0 +1,4 @@
> +SRC_URI = "https://zlib.net/zlib-${PV}.tar.xz"
> +UPSTREAM_CHECK_URI = "http://zlib.net/"
> +
> +SRC_URI[sha256sum] = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
> diff --git a/meta/recipes-core/zlib/zlib_1.2.12.bb b/meta/recipes-core/zlib/zlib_1.2.12.bb
> index e921703137..ba986d8cf2 100644
> --- a/meta/recipes-core/zlib/zlib_1.2.12.bb
> +++ b/meta/recipes-core/zlib/zlib_1.2.12.bb
> @@ -6,16 +6,16 @@ SECTION = "libs"
> LICENSE = "Zlib"
> LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
>
> -SRC_URI = "https://zlib.net/${BP}.tar.xz \
> - file://cc.patch \
> - file://ldflags-tests.patch \
> - file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
> - file://run-ptest \
> - file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
> - "
> -UPSTREAM_CHECK_URI = "http://zlib.net/"
> +include zlib.inc
> +
> +SRC_URI += "file://cc.patch \
> + file://ldflags-tests.patch \
> + file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
> + file://run-ptest \
> + file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
> +"
>
> -SRC_URI[sha256sum] = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
> +UPSTREAM_CHECK_URI = "http://zlib.net/"
>
> CFLAGS += "-D_REENTRANT"
>
> --
> 2.37.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#168059): https://lists.openembedded.org/g/openembedded-core/message/168059
> Mute This Topic: https://lists.openembedded.org/mt/92398812/6875888
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file
2022-07-15 11:55 [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file Sean Nyekjaer
2022-07-15 11:55 ` [OE-core] [PATCH v2 2/2] zlib: minizip: add recipe Sean Nyekjaer
2022-07-18 16:12 ` [OE-core] [PATCH v2 1/2] zlib: split SRC_URI into inc file Ross Burton
@ 2022-07-23 12:27 ` Alexandre Belloni
2022-07-23 12:28 ` Richard Purdie
2 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2022-07-23 12:27 UTC (permalink / raw)
To: Sean Nyekjaer; +Cc: openembedded-core, denis, richard.purdie, raj.khem
Hello,
This doesn't pass the selftests:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/3865/steps/14/logs/stdio
2022-07-23 10:00:43,013 - oe-selftest - INFO - pkgdata.OePkgdataUtilTests.test_find_path (subunit.RemotedTestCase)
2022-07-23 10:00:43,026 - oe-selftest - INFO - ... FAIL
Stderr:
2022-07-23 08:46:34,614 - oe-selftest - INFO - Adding: "include selftest.inc" in /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-2078751/conf/local.conf
2022-07-23 08:46:34,615 - oe-selftest - INFO - Adding: "include bblayers.inc" in bblayers.conf
2022-07-23 10:00:17,568 - oe-selftest - INFO - Running bitbake to generate pkgdata
2022-07-23 10:00:43,026 - oe-selftest - INFO - 3: 49/59 163/494 (3.69s) (pkgdata.OePkgdataUtilTests.test_find_path)
2022-07-23 10:00:43,026 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/pkgdata.py", line 50, in test_find_path
result = runCmd('oe-pkgdata-util find-path /lib/libz.so.1')
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 207, in runCmd
raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output))
AssertionError: Command 'oe-pkgdata-util find-path /lib/libz.so.1' returned non-zero exit status 1:
ERROR: Unable to find any package producing path /lib/libz.so.1
Stderr:
2022-07-23 08:46:34,614 - oe-selftest - INFO - Adding: "include selftest.inc" in /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-2078751/conf/local.conf
2022-07-23 08:46:34,615 - oe-selftest - INFO - Adding: "include bblayers.inc" in bblayers.conf
2022-07-23 10:00:17,568 - oe-selftest - INFO - Running bitbake to generate pkgdata
2022-07-23 10:00:47,408 - oe-selftest - INFO - pkgdata.OePkgdataUtilTests.test_glob (subunit.RemotedTestCase)
2022-07-23 10:00:47,408 - oe-selftest - INFO - ... ok
2022-07-23 10:00:47,408 - oe-selftest - INFO - 3: 50/59 164/494 (4.39s) (pkgdata.OePkgdataUtilTests.test_glob)
2022-07-23 10:00:53,202 - oe-selftest - INFO - pkgdata.OePkgdataUtilTests.test_list_pkg_files (subunit.RemotedTestCase)
2022-07-23 10:00:53,202 - oe-selftest - INFO - ... FAIL
Stderr:
2022-07-23 08:46:34,614 - oe-selftest - INFO - Adding: "include selftest.inc" in /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-2078751/conf/local.conf
2022-07-23 08:46:34,615 - oe-selftest - INFO - Adding: "include bblayers.inc" in bblayers.conf
2022-07-23 10:00:17,568 - oe-selftest - INFO - Running bitbake to generate pkgdata
2022-07-23 10:00:53,202 - oe-selftest - INFO - 3: 51/59 165/494 (5.79s) (pkgdata.OePkgdataUtilTests.test_list_pkg_files)
2022-07-23 10:00:53,202 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/pkgdata.py", line 147, in test_list_pkg_files
self.assertTrue(found, 'Could not find zlib library file %s in libz1 package file list: %s' % (libspec, files['libz1']))
File "/usr/lib64/python3.9/unittest/case.py", line 688, in assertTrue
raise self.failureException(msg)
AssertionError: False is not true : Could not find zlib library file /lib/libz.so.1.* in libz1 package file list: ['/usr/lib/libz.so.1', '/usr/lib/libz.so.1.2.12']
On 15/07/2022 13:55:14+0200, Sean Nyekjaer wrote:
> This is done in preparation for adding packages from the zlib contrib
> directory.
> Unfortunatly it's not possible to add these via pkgconfig.
>
> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
> ---
> With this we are maintaining the same verison number for both zlib and
> minizip in the recipe name. Would it be better to have it in the inc
> file?
>
> PV = "1.2.12" ?
>
> meta/recipes-core/zlib/zlib.inc | 4 ++++
> meta/recipes-core/zlib/zlib_1.2.12.bb | 18 +++++++++---------
> 2 files changed, 13 insertions(+), 9 deletions(-)
> create mode 100644 meta/recipes-core/zlib/zlib.inc
>
> diff --git a/meta/recipes-core/zlib/zlib.inc b/meta/recipes-core/zlib/zlib.inc
> new file mode 100644
> index 0000000000..b607a82312
> --- /dev/null
> +++ b/meta/recipes-core/zlib/zlib.inc
> @@ -0,0 +1,4 @@
> +SRC_URI = "https://zlib.net/zlib-${PV}.tar.xz"
> +UPSTREAM_CHECK_URI = "http://zlib.net/"
> +
> +SRC_URI[sha256sum] = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
> diff --git a/meta/recipes-core/zlib/zlib_1.2.12.bb b/meta/recipes-core/zlib/zlib_1.2.12.bb
> index e921703137..ba986d8cf2 100644
> --- a/meta/recipes-core/zlib/zlib_1.2.12.bb
> +++ b/meta/recipes-core/zlib/zlib_1.2.12.bb
> @@ -6,16 +6,16 @@ SECTION = "libs"
> LICENSE = "Zlib"
> LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
>
> -SRC_URI = "https://zlib.net/${BP}.tar.xz \
> - file://cc.patch \
> - file://ldflags-tests.patch \
> - file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
> - file://run-ptest \
> - file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
> - "
> -UPSTREAM_CHECK_URI = "http://zlib.net/"
> +include zlib.inc
> +
> +SRC_URI += "file://cc.patch \
> + file://ldflags-tests.patch \
> + file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
> + file://run-ptest \
> + file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
> +"
>
> -SRC_URI[sha256sum] = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
> +UPSTREAM_CHECK_URI = "http://zlib.net/"
>
> CFLAGS += "-D_REENTRANT"
>
> --
> 2.37.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#168059): https://lists.openembedded.org/g/openembedded-core/message/168059
> Mute This Topic: https://lists.openembedded.org/mt/92398812/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread