libpsl: upgrade 0.22.0 -> 0.23.0
PATCH 1/2 libpsl: upgrade 0.22.0 -> 0.23.0
License-Update: copyright notice reworded, MIT terms unchanged
---
.../libpsl/{libpsl_0.22.0.bb => libpsl_0.23.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-support/libpsl/{libpsl_0.22.0.bb => libpsl_0.23.0.bb} (79%)meta/recipes-support/libpsl/libpsl_0.23.0.bb renamed from meta/recipes-support/libpsl/libpsl_0.22.0.bb +3 -3
@@ -7,13 +7,13 @@ HOMEPAGE = "https://rockdaboot.github.io/libpsl/" BUGTRACKER = "https://github.com/rockdaboot/libpsl/issues" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9f9e317096db2a598fc44237c5b8a4f7 \ - file://COPYING;md5=9f9e317096db2a598fc44237c5b8a4f7 \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=49296c1806ef92c28297fb264163d81e \ + file://COPYING;md5=49296c1806ef92c28297fb264163d81e \ " SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "c45c3aa17576b99873e05a9b09a44041b065bbfa390e6d474d06fbfaeb9c7722" +SRC_URI[sha256sum] = "f39b9631b3d369a21259ea4654f8875c0ec6995ce9551c0eb5d423e4c011f911" GITHUB_BASE_URI = "https://github.com/rockdaboot/libpsl/releases"
PATCH 2/2 libpsl: convert to meson build system
Switch the recipe from autotools to meson:
- inherit meson instead of autotools; drop gettext (the meson build has no i18n) and manpages (meson installs psl.1 unconditionally, without needing libxslt-native).
- Map the PACKAGECONFIG knobs to meson options: --enable-runtime=X becomes -Druntime=X, and builtin PSL data stays enabled via meson's default (-Dbuiltin=true), matching the previous --enable-builtin.
- Disable the bundled tests and fuzzers with -Dtests=false.
- The gtk-doc class drives -Ddocs on its own via GTKDOC_MESON_OPTION.
Unlike the autotools tarball, meson regenerates psl.1 at build time and stamps it with date +%B %Y, which is not reproducible. Backport the proposed upstream fix to honour SOURCE_DATE_EPOCH.
--- .../0001-Support-reproducible-builds.patch | 50 +++++++++++++++++++ meta/recipes-support/libpsl/libpsl_0.23.0.bb | 11 ++-- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-support/libpsl/libpsl/0001-Support-reproducible-builds.patch
meta/recipes-support/libpsl/libpsl/0001-Support-reproducible-builds.patch new file +50 -0
@@ -0,0 +1,50 @@ +From deaa74f9dea55d4dbf1ef98879049c02d23749e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]> +Date: Thu, 16 Jul 2026 13:20:21 +0200 +Subject: [PATCH] Support reproducible builds + +Co-authored-by: Chris Lamb <[email protected]> +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/pull/290] +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 4 ++-- + meson.build | 11 ++++++++++- + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8b7ccc8..3f8158d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,8 +42,8 @@ AC_SUBST([LIBPSL_VERSION_MAJOR], [$(echo $VERSION | cut -d'.' -f1)]) + AC_SUBST([LIBPSL_VERSION_MINOR], [$(echo $VERSION | cut -d'.' -f2)]) + AC_SUBST([LIBPSL_VERSION_PATCH], [$(echo $VERSION | cut -d'.' -f3)]) + AC_SUBST([LIBPSL_VERSION_NUMBER], [$(printf '0x%02x%02x%02x' $LIBPSL_VERSION_MAJOR $LIBPSL_VERSION_MINOR $LIBPSL_VERSION_PATCH)]) +-AC_SUBST([COPYRIGHT_MONTH], [$(date +%B)]) +-AC_SUBST([COPYRIGHT_YEAR], [$(date +%Y)]) ++AC_SUBST([COPYRIGHT_MONTH], [m4_esyscmd([LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" +%B 2>/dev/null || LC_ALL=C date -u -r "$SOURCE_DATE_EPOCH" +%B 2>/dev/null || LC_ALL=C date -u +%B])]) ++AC_SUBST([COPYRIGHT_YEAR], [m4_esyscmd([LC_ALL=Cdate -u -d "@$SOURCE_DATE_EPOCH" +%Y 2>/dev/null || LC_ALL=C date -u -r "$SOURCE_DATE_EPOCH" +%Y 2>/dev/null || LC_ALL=C date -u +%Y])]) + AC_CONFIG_FILES([include/libpsl.h tools/psl.1]) + + dnl +diff --git a/meson.build b/meson.build +index 1e46d06..06c36c6 100644 +--- a/meson.build ++++ b/meson.build +@@ -157,7 +157,16 @@ endif + # Shared configuration data for copyright date and version + _cdata = configuration_data() + _cdata.set('PACKAGE_VERSION', meson.project_version()) +-copyright_date = run_command(['date', '+%B %Y'], check: true).stdout().strip() ++date_exe = find_program('date') ++epoch_cmd = run_command('sh', '-c', 'LC_ALL=C echo "${SOURCE_DATE_EPOCH:-$(date +%s)}"', check: true) ++source_date_epoch = epoch_cmd.stdout().strip() ++copyright_cmd = run_command('sh', '-c', ++ 'date -u -d "@' + source_date_epoch + '" "+%B %Y" 2>/dev/null || ' + ++ 'date -u -r "' + source_date_epoch + '" "+%B %Y" 2>/dev/null || ' + ++ 'date -u "+%B %Y"', ++ check: true ++) ++copyright_date = copyright_cmd.stdout().strip() + _cdata.set('COPYRIGHT_MONTH', copyright_date.split()[0]) + _cdata.set('COPYRIGHT_YEAR', copyright_date.split()[1]) +
meta/recipes-support/libpsl/libpsl_0.23.0.bb +7 -4
@@ -12,15 +12,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=49296c1806ef92c28297fb264163d81e \ " SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ + file://0001-Support-reproducible-builds.patch \ " SRC_URI[sha256sum] = "f39b9631b3d369a21259ea4654f8875c0ec6995ce9551c0eb5d423e4c011f911" GITHUB_BASE_URI = "https://github.com/rockdaboot/libpsl/releases" -inherit autotools gettext gtk-doc manpages pkgconfig lib_package github-releases +inherit meson gtk-doc pkgconfig lib_package github-releases + +# Do not build the bundled tests and fuzzers. +EXTRA_OEMESON = "-Dtests=false" PACKAGECONFIG ?= "idn2" -PACKAGECONFIG[manpages] = "--enable-man,--disable-man,libxslt-native" -PACKAGECONFIG[icu] = "--enable-runtime=libicu --enable-builtin=libicu,,icu" -PACKAGECONFIG[idn2] = "--enable-runtime=libidn2 --enable-builtin=libidn2,,libidn2 libunistring" +PACKAGECONFIG[icu] = "-Druntime=libicu,,icu" +PACKAGECONFIG[idn2] = "-Druntime=libidn2,,libidn2 libunistring" BBCLASSEXTEND = "native nativesdk"
Re: [OE-core] [PATCH 2/2] libpsl: convert to meson build system
Quoted 3 lines · Khem Raj via lists.openembedded.org
- inherit meson instead of autotools; drop gettext (the meson build has no i18n) and manpages (meson installs psl.1 unconditionally, without needing libxslt-native).
This is only true when the manpage doesn’t need regenerating, so whilst I expect it to be true most of the time it might cause problems in the future.
Also we should still inherit manpages for the postinsts that do manpage wrangling.
Quoted 3 lines
- Map the PACKAGECONFIG knobs to meson options: --enable-runtime=X becomes -Druntime=X, and builtin PSL data stays enabled via meson's default (-Dbuiltin=true), matching the previous --enable-builtin.
I had a very similar patch locally that I hadn’t sent for the problems that Matthieu noticed and added a PACKAGECONFIG for the builtin option.
Ross
Quoted 4 lines · Khem Raj via lists.openembedded.org
License-Update: copyright notice reworded, MIT terms unchanged
Signed-off-by Khem Raj <[email protected]>---
Hi Khem,
Thanks for the upgrade.
We do have new QA issues:
ERROR: libpsl-0.23.0-r0 do_package_qa: QA Issue: File /usr/src/debug/libpsl/0.23.0/src/suffixes_dafsa.h in package libpsl-src contains reference to TMPDIR [buildpaths]
ERROR: libpsl-0.23.0-r0 do_package_qa: QA Issue: File /usr/src/debug/libpsl/0.23.0/src/suffixes_dafsa.h in package libpsl-src contains a reference to the build host HOME directory. If upstream hardcodes a directory path that matches your home, you can set OEQA_BUILDPATHS_SKIP = "/srv/pokybuild" in the recipe. [buildpaths]
ERROR: libpsl-0.23.0-r0 do_package_qa: Fatal QA errors were found, failing task.
https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/4184
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 23 lines · Mathieu Dubois-Briand
Quoted 4 lines · Khem Raj via lists.openembedded.org
License-Update: copyright notice reworded, MIT terms unchanged
Signed-off-by Khem Raj <[email protected]>---
Hi Khem,
Thanks for the upgrade.
We do have new QA issues:
ERROR: libpsl-0.23.0-r0do_package_qa: QA Issue: File/usr/src/debug/libpsl/0.23.0/src/suffixes_dafsa.hin package libpsl-src contains reference to TMPDIR [buildpaths]
ERROR: libpsl-0.23.0-r0do_package_qa: QA Issue: File/usr/src/debug/libpsl/0.23.0/src/suffixes_dafsa.hin package libpsl-src contains a reference to the build host HOME directory. If upstream hardcodes a directory path that matches your home, you can setOEQA_BUILDPATHS_SKIP= "/srv/pokybuild" in the recipe. [buildpaths]
ERROR: libpsl-0.23.0-r0do_package_qa: Fatal QA errors were found, failing task.
Yeah, saw that on AB earlier, sent a patch to fix it just now. Please take that as well.
Quoted 9 lines
Thanks,
Mathieu--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Quoted 26 lines · Khem Raj
Quoted 23 lines · Mathieu Dubois-Briand
Quoted 4 lines · Khem Raj via lists.openembedded.org
License-Update: copyright notice reworded, MIT terms unchanged
Signed-off-by Khem Raj <[email protected]>---
Hi Khem,
Thanks for the upgrade.
We do have new QA issues:
ERROR: libpsl-0.23.0-r0do_package_qa: QA Issue: File/usr/src/debug/libpsl/0.23.0/src/suffixes_dafsa.hin package libpsl-src contains reference to TMPDIR [buildpaths]
ERROR: libpsl-0.23.0-r0do_package_qa: QA Issue: File/usr/src/debug/libpsl/0.23.0/src/suffixes_dafsa.hin package libpsl-src contains a reference to the build host HOME directory. If upstream hardcodes a directory path that matches your home, you can setOEQA_BUILDPATHS_SKIP= "/srv/pokybuild" in the recipe. [buildpaths]
ERROR: libpsl-0.23.0-r0do_package_qa: Fatal QA errors were found, failing task.
Quoted 5 lines
Yeah, saw that on AB earlier, sent a patch to fix it just now. Please take that as well.
I did pick it. It's better now, but:
ERROR: libpsl-0.23.0-r0 do_configure: Execution of '/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86-64-v3-poky-linux/libpsl/0.23.0/temp/run.do_configure.829053' failed with exit code 1
...
| Configuring psl.1 using configuration | | ../sources/libpsl-0.23.0/docs/libpsl/meson.build:7:20: ERROR: Unknown variable "cdata". | | A full log can be found at /srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86-64-v3-poky-linux/libpsl/0.23.0/build/meson-logs/meson-log.txt | | Last 10 lines of meson-log.txt: | | --- stderr --- | | | Configuring libpsl.h using configuration | Pkg-config binary for host machine specified from cross file, native file, or env var as ['pkg-config'] | Found pkg-config: YES (/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86-64-v3-poky-linux/libpsl/0.23.0/recipe-sysroot-native/usr/bin/pkg-config) 3.0.3 | Configuring psl.1 using configuration | | ../sources/libpsl-0.23.0/docs/libpsl/meson.build:7:20: ERROR: Unknown variable "cdata". | | ERROR: meson setup failed
https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/4023
An you have a look at the issue?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com