From patchwork Wed Jul 22 21:57:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93292 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 744DEC4453F for ; Wed, 22 Jul 2026 21:57:51 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11275.1784757461954363269 for ; Wed, 22 Jul 2026 14:57:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=Jm2pZdPh; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-8486672f03cso12989665b3a.0 for ; Wed, 22 Jul 2026 14:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784757461; x=1785362261; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=BKtNK5sGf45A67olY4snbv3P1pfhp7CjSWTHdikyRV8=; b=Jm2pZdPhoBFs8y40WVCDVH3pU2oF2u2MLGbGyLasKLRl5hgSV8Fxjxjq8QBYInlAo1 wjewIzwbx4F5y2LTP92m+lEVyA0fMDqOHGg53IES7HaET83cU4vA/JUlna/AqNwqR9m+ 8S4DUaCbNSlzMp3jRFQRq4d6biQb3B8Mzx8aU39663j7t6V2D7NiGK/drXf/laWoW8Zn wXIAi5irg2y8Dqnbm72a/mqbwck6vsJphRjHD6Z1LxsW+tLpzhr/6gq4ia4tCYHqpifv yWR1qF4jO/7t3DutnG5TPJTEEPBwjIKu9ziJAhxVTKViB91gfEm9PPY0ILHuM8jXfYTT D3GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784757461; x=1785362261; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BKtNK5sGf45A67olY4snbv3P1pfhp7CjSWTHdikyRV8=; b=jFT5Gal6Nu9r1YhMxwi4lseQ8KlO9IKfVxxwH702QHiIuwLZ3QvDOh+JZzmXHG08Zg Uof4BFFghqsXtKmhhllWX82z2/U1MlJy753dNMrfDfwcCDA0wi2Rxwko8N/fqVJwezo9 9VeMnzax01+Z/WRyQWoIIEh0KgJs2YERaPK0/jKTAC/zo/64ZrmX0uYFBD/t1CbiPj6U JPpa11Px7PxHLfwP7GEhKhR4gi87ZzcSGCbgB1zQtiYqP21fc0X9rzwJjdjsE+LJ3vjP tfRztpnWPDxYJyvu8mUNngUAf848plWHjobLQ35jWi/ddY67ut4Kpgpbv0OLoKk+7MMg 8rtA== X-Gm-Message-State: AOJu0YyShBqK1GGmrYsnZN361KbmpurrW54DUirqcASLQcgAiZ9/EfFw Sa1fTDVv3fQSvI6foue2yFHww+o2t7omW/yWt+BoxJsmJ4AzQyPW5iBZ+h7KtA== X-Gm-Gg: AR+sD11Shqd+ySBu2n3Bu31rNfJl9F/DtW57MaODLim32SM61A7yQh/N3Zr9DMhlzlG wU5R0QgE6w1PlgiPfsCQpde6u4e6KA9nwKgOrm14AWsY99kMVOhwHA4FikOfkigcbVXj1ro9zHv 3CsjiqU0EjZ7r2TUHSBtd/NBbsccFE+t1RF9tniwUM6mZ4zkvre1D9kotr32FLvzw1pwQEIEL1G d+BbAdt7rStsN2RjJYazEbFayL/cHZoekRHcMGqJ2FA8ykQaocHPejKILCcxGuhdQe+Skd5cJLz T4txMeWMpxU2aRvOmIlrsktZ1ICbHZCGDh+EYziRtRuTqnDPJTPrPH+ibAJSYsXvS7FFmNDzhr7 56WZWjRvjRCXFwGBSWfxLsr5HHWsSXDg55n0zc+e1JJAS5WPkAQBQ/gOQPeWCyvsNSxf9N6UxTA wuf29sFURZyWIQZzZIeIpaec3Wwqt9++tZCahtMjR+9KjjjnyZXPrrTFr4Ik/rnl2ujKtzhiU1K D0AYEUQOG9OcehXbvcM1g3ERhWBti8AWEsAtK3q19N0qnOHTA+Q+ESK5lCvk8KbAP7IhygXcxHm LZdADHx08x3uPy2V4Jfo66eC1aV3lA== X-Received: by 2002:a05:6a21:7d02:b0:3c0:9c19:65a7 with SMTP id adf61e73a8af0-3c44b244700mr295392637.63.1784757460973; Wed, 22 Jul 2026 14:57:40 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc9f2f0sm13264388eec.13.2026.07.22.14.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 14:57:40 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 1/4] libpsl: upgrade 0.22.0 -> 0.23.0 Date: Wed, 22 Jul 2026 14:57:32 -0700 Message-ID: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 22 Jul 2026 21:57:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241758 License-Update: copyright notice reworded, MIT terms unchanged Signed-off-by: Khem Raj --- .../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%) diff --git a/meta/recipes-support/libpsl/libpsl_0.22.0.bb b/meta/recipes-support/libpsl/libpsl_0.23.0.bb similarity index 79% rename from meta/recipes-support/libpsl/libpsl_0.22.0.bb rename to meta/recipes-support/libpsl/libpsl_0.23.0.bb index 1e5e9c74b4..793fe0d73b 100644 --- a/meta/recipes-support/libpsl/libpsl_0.22.0.bb +++ b/meta/recipes-support/libpsl/libpsl_0.23.0.bb @@ -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" From patchwork Wed Jul 22 21:57:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93293 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67C2CC44536 for ; Wed, 22 Jul 2026 21:57:51 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11276.1784757463614949042 for ; Wed, 22 Jul 2026 14:57:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=aRpopa19; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-38e071ed6aeso8622557a91.0 for ; Wed, 22 Jul 2026 14:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784757463; x=1785362263; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VlCApHEtHAWFE8cCFZ289I03S7g63wlHpzPBWpc7I0k=; b=aRpopa19RTi250GHNWxvqIGWznYlUNpBmevN+74muroAPziaOWQzUCs8xNU4nljIAJ QYCoxhNjvLznudX1Z8j8rrXQhOZ6hmPmBhToH2VvJlBBIT9ffMVcw1bsSDa88ztuwKmC MAiHa3QdkdSY/jk9nPG2HhMT8HuzhGa7jSfv2pBK9yah+1RmbtAPpPMvBbHNSVKbPY8V I0uVG74zc8TKLtNFE1kdCFn9oiBEv0y0LPNgKxQTvDGotheDhLDVjL8UolyLYntSCsL9 hdWrhG2C5iGCcstj/XVQGBkShe8+oE9SJvoT3Y4UxWH/G7NDyPuubf/7oioaEr3On1SP nyew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784757463; x=1785362263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=VlCApHEtHAWFE8cCFZ289I03S7g63wlHpzPBWpc7I0k=; b=rJvJDCE2Q5od9ksFaSTdne2gMsyT5mcN6V26R8OekFkAXc4lRE4M06wpWKOC7RPRwj KFdbG4qav8TWU/HBR6INk8o7jquJtZkObgKe/Q3pGSZ9sTwVyXlvi8Lic6kIX83LMinp 11dXfVSeWiUm/BxZgd0rFEXrzoEdh6gY1rZw/jzDoreGRIb3fm8BDf0MTKid2uqOspik lppH6tM/kZeEFfmJZr5CB7giXUgIa4nYZrkhPeOoJvltHIsUGlhQenuUq74lU98S6lQb uu5HKjMlAwulAPIgi1pLPqj4FFbEbDewZzATQ9F2dbRTlUclP+xmQW4wQkzuc1Nreg5t xmKw== X-Gm-Message-State: AOJu0YwhSkaQdQPl0boPG+j3gRumlv2POh1IKo/lH3PbnCfTcMXART0l qGuwDNVViD7ae0e+rm9bUKS3qwmbJTQb+RFW5h8QIceEMIWf5u6UHYPWV93nig== X-Gm-Gg: AR+sD10u+ng5CkaGyfgeMwDf9MgyDi5Cpfg+FagU9NJp94+7BL0H/V5BUvNMZBqT4wT OYl5R1EsINbIyEXZE77xpZWt1cgXlT8LnNTBbMBPALZzwWZspxDLXM9JPESoMrCb6ibSsFQVW1H O7rGqFKUX3Gs4q3gNOaSflfs9/4tuKkKqr4RP/zxWFBzSD2wjBRFKw8LFzLkv+QN2ZmngxMFiyz jV8XEHFVMo5AW/TRYtVq0Lbx2k9P4WYfc5l4FL3GAe4ZZ2ri/1w3b5/jtwF2AhAPYeneAuwv7zo uStiZ51mhGyIT0qqJxNR8fbkGGWiPeqfAdJVXHcxZRNaUVJeewsSdIAGEKAyn/KtOB7CNTNPBwd hdGI5LRrivHyz68FWR6614Yt0mbEtaWHvmjnQQgbvyJ3juyPSFDD21k055f4qZM4iDLFRYVnFpx jk9/jwu/m1pfn2od6IZfF9Dr0FMIYA0MPKoxg19BfZ4nzD4o7Qm2J0GJ1o+foS9N+UO2zHFGmNB C7i+RPZr7bOlQ0YOqyYhsok+6wvhELFoNEG50yGwUlJoN9KcQ+mtZClHkb5e8+fHLaHZsQZT5jn RCJtmMi4bSoTcq1IAbU= X-Received: by 2002:a05:6a20:9148:b0:3c3:83e6:c6e6 with SMTP id adf61e73a8af0-3c44b1ee701mr295259637.55.1784757462916; Wed, 22 Jul 2026 14:57:42 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc9f2f0sm13264388eec.13.2026.07.22.14.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 14:57:41 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 2/4] libpsl: convert to meson build system Date: Wed, 22 Jul 2026 14:57:33 -0700 Message-ID: <20260722215737.1940382-2-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> References: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 22 Jul 2026 21:57:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241759 Switch the recipe from autotools to meson: - inherit meson instead of autotools; drop gettext (the meson build has no i18n) - 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. Signed-off-by: Khem Raj --- v2: Inherit manpages .../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 diff --git a/meta/recipes-support/libpsl/libpsl/0001-Support-reproducible-builds.patch b/meta/recipes-support/libpsl/libpsl/0001-Support-reproducible-builds.patch new file mode 100644 index 0000000000..16a3ed37db --- /dev/null +++ b/meta/recipes-support/libpsl/libpsl/0001-Support-reproducible-builds.patch @@ -0,0 +1,50 @@ +From deaa74f9dea55d4dbf1ef98879049c02d23749e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= +Date: Thu, 16 Jul 2026 13:20:21 +0200 +Subject: [PATCH] Support reproducible builds + +Co-authored-by: Chris Lamb +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/1d28619bde704d5b5037e0680e72c1c326663234] +Signed-off-by: Khem Raj +--- + 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]) + diff --git a/meta/recipes-support/libpsl/libpsl_0.23.0.bb b/meta/recipes-support/libpsl/libpsl_0.23.0.bb index 793fe0d73b..f915fae621 100644 --- a/meta/recipes-support/libpsl/libpsl_0.23.0.bb +++ b/meta/recipes-support/libpsl/libpsl_0.23.0.bb @@ -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 manpages + +# 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" From patchwork Wed Jul 22 21:57:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93290 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57F2FC4453A for ; Wed, 22 Jul 2026 21:57:51 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11278.1784757465096121503 for ; Wed, 22 Jul 2026 14:57:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=itaekLG3; spf=pass (domain: gmail.com, ip: 209.85.215.173, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-cbb662575d3so10463a12.0 for ; Wed, 22 Jul 2026 14:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784757464; x=1785362264; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BIyFVzQxmZcQ6lyJrFkYj0rMXXvYuZnfMiFDGWZ4jmM=; b=itaekLG3RL1UCIgITvjzzsQ3ZghvuwZ2vVBLBRKpwUnkpdslDHFawoW4aGANTAXqFg 3wD+7H4TZYQw8Opr7gYfQS0ZBFF6Fk/ZU2uUORJE+Kwn39cjr3Df9us+r94oXIav5ol7 fR+omb+qTNADDekWbC8BjezjgJqX+6e2b0smxVWQcurRWWWX0WVxRodp5OWKJRFP/8OQ bCr9AD1yekb9EIu0PkS05sbcId73+mgEYegXwbcmCeEadO1lRQ0AATnru8ltMN89ngWi 7qIKhG6ulGRiCiytxht1x3+KnCcR8g/sNNtNnQazs4NkUa7gtf+hzSwS+ZW7j1Uf69zs dQdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784757464; x=1785362264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=BIyFVzQxmZcQ6lyJrFkYj0rMXXvYuZnfMiFDGWZ4jmM=; b=EIc52w1lhoXXlhSRkyapTFChQ6ntDhpaAGmS73gIn7tj2yN72Dq3oT2jMmHWyNyVkc L9b5DyjL/dua8xpISY4gKxmas7+r3m3G+D5YAdxmf5526kMhjiYGJLyEW5Hwr7SJrsLk ivhRt/FvpLMxqqvkoSkHW1PIgNXhRdfvZM37de47j9aAi8X34zPIjX7HBUE/pvC1Dfp6 H/hmy/eGWNvzQl8pkIZgj4HwyYnZpBMM3BjePs7hvkNIDIYIkud9vWikBi+DL5sqbqDo LDTUtdDRojd8rFGecnir1mZ6SkhrOLfY7gX9s31gktrshLVXC4l03wiHsfoopirdGxfh c7Vw== X-Gm-Message-State: AOJu0YyHe+TQX6qTJgh3Dm4Xu822IiumwjmFrw1gCr8VE3qDQ4RtXjZD eGvx0GtxYmmOe2EkDihduo0pIpmOS25VVkTUfwMWA3e0SeAgiHhqRBw1zZpg/w== X-Gm-Gg: AR+sD13znrbzBWXbLXawqrbWcvtzoZT+VDWTt1RsbphOXjF4tn4SPA7BtPvpSN1gUPK Um8/YIs7C9Fh+Sy4qKaJUPPct5WtIYXrGgRI8qJ8Yq+v8PiSJdBG0ghU9dlAxxeyOGc7vMxAP4L 3bS2SH9o0Qt/nzNkHuucY3AjEX4JhCU6NJsld8pD2UTCyajs5JRfJbyRo/CudwHL3IsFf1ojE2B 6ADPt4LfiSFR9s/9x07mDCc/MzSiwi/HdB2f3e3It0eVkEYtRKJ7jnd/phF75NeWKnM/4qamy7q R6uYavSjxZuQQhdo4slROafvCCRV3a3NVUF+RuGObQNijixml99mNeDsgEdTpw0zgDbbEdZ2EFI tzuVXm5und6RIZs1SyZvey2n2FQpBSYAKEw0ayReTqsH4Kpuh+z5b24Yqw4LI6SxDzsPNrC3NoE Hf8X7AaHoxzr4ciyEtYqnn22/FgERxxJWqITLvT46LNsNDOk2MaSzldKPBAbFP0nW32+4rjvSG+ 8qC6yaFWqgBF7T7y8MpJpV4UfncyyGgdQbfn/cu5uD0WdDsE1ylZGAWYLCN4SyJKCR6E6hIDQv/ caNa/v834rLYrlD2rX4= X-Received: by 2002:a05:6a20:6a06:b0:3c3:a17c:1f77 with SMTP id adf61e73a8af0-3c44b245a28mr281195637.51.1784757464271; Wed, 22 Jul 2026 14:57:44 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc9f2f0sm13264388eec.13.2026.07.22.14.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 14:57:43 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 3/4] libpsl: Do not embed the build path in suffixes_dafsa.h Date: Wed, 22 Jul 2026 14:57:34 -0700 Message-ID: <20260722215737.1940382-3-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> References: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 22 Jul 2026 21:57:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241760 The generated src/suffixes_dafsa.h records the public suffix list it was built from in _psl_filename[]. meson feeds psl-make-dafsa an absolute input path, so the full build directory gets baked into the header and, through it, into the library and its -src/-dbg packages. On an autobuilder whose build tree lives under $HOME/TMPDIR this trips the buildpaths QA check with references to both TMPDIR and the build host HOME directory, and it makes the build non-reproducible. The absolute path is useless on the target: it is only consumed by psl_builtin_outdated() to stat() the source list, which never exists on the running system. psl_builtin_filename() is documented to return "the file name", so embed only the basename. Fixes 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] Signed-off-by: Khem Raj --- ...mbed-only-the-basename-of-the-input-.patch | 46 +++++++++++++++++++ meta/recipes-support/libpsl/libpsl_0.23.0.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-support/libpsl/libpsl/0002-psl-make-dafsa-embed-only-the-basename-of-the-input-.patch diff --git a/meta/recipes-support/libpsl/libpsl/0002-psl-make-dafsa-embed-only-the-basename-of-the-input-.patch b/meta/recipes-support/libpsl/libpsl/0002-psl-make-dafsa-embed-only-the-basename-of-the-input-.patch new file mode 100644 index 0000000000..32dfc02983 --- /dev/null +++ b/meta/recipes-support/libpsl/libpsl/0002-psl-make-dafsa-embed-only-the-basename-of-the-input-.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 Jul 2026 09:00:00 -0700 +Subject: [PATCH] psl-make-dafsa: embed only the basename of the input file + +The generated suffixes_dafsa.h records the path of the public suffix +list it was built from in _psl_filename[]. meson passes this input as an +absolute path (meson.current_source_dir()/list/public_suffix_list.dat), +so the full build directory ends up baked into the header and, through +it, into the compiled library and its -src/-dbg packages. This is not +reproducible and trips the OE buildpaths QA check (references to TMPDIR +and to the build host HOME directory) when the build tree lives under +those prefixes on an autobuilder. + +The absolute path is useless on the target anyway: it is only consumed +by psl_builtin_outdated(), which stat()s _psl_filename and compares its +mtime; the build-host path never exists on the running system so the +stat always fails. psl_builtin_filename() is documented to return "the +file name of the Public Suffix List file", so a basename is in fact the +more faithful value. + +Embed only os.path.basename() of the input. The unmodified path is still +used to open, stat and checksum the file, so only the leaked string +changes. + +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/b16a2c4d66e94acc3388088c7a13ae62dbacb71d] +Signed-off-by: Khem Raj +--- + src/psl-make-dafsa | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/psl-make-dafsa b/src/psl-make-dafsa +index 1111111..2222222 100755 +--- a/src/psl-make-dafsa ++++ b/src/psl-make-dafsa +@@ -518,7 +518,7 @@ def to_cxx_plus(data, codecs): + text += b'static int _psl_nexceptions = %d;\n' % psl_nexceptions + text += b'static int _psl_nwildcards = %d;\n' % psl_nwildcards + text += b'static const char _psl_sha1_checksum[] = "%s";\n' % bytes(sha1_file(psl_input_file), **codecs) +- text += b'static const char _psl_filename[] = "%s";\n' % bytes(psl_input_file, **codecs) ++ text += b'static const char _psl_filename[] = "%s";\n' % bytes(os.path.basename(psl_input_file), **codecs) + return text + + def words_to_whatever(words, converter, utf_mode, codecs): +-- +2.51.0 diff --git a/meta/recipes-support/libpsl/libpsl_0.23.0.bb b/meta/recipes-support/libpsl/libpsl_0.23.0.bb index f915fae621..6026adad9f 100644 --- a/meta/recipes-support/libpsl/libpsl_0.23.0.bb +++ b/meta/recipes-support/libpsl/libpsl_0.23.0.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=49296c1806ef92c28297fb264163d81e \ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ file://0001-Support-reproducible-builds.patch \ + file://0002-psl-make-dafsa-embed-only-the-basename-of-the-input-.patch \ " SRC_URI[sha256sum] = "f39b9631b3d369a21259ea4654f8875c0ec6995ce9551c0eb5d423e4c011f911" From patchwork Wed Jul 22 21:57:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59712C4453C for ; Wed, 22 Jul 2026 21:57:51 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.11280.1784757466206991038 for ; Wed, 22 Jul 2026 14:57:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=rWuITPUK; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ceb096e675so42685ad.0 for ; Wed, 22 Jul 2026 14:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784757465; x=1785362265; darn=lists.openembedded.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=79uv6b9kpGK3L9wWaFCFvGy8djv5dMf5yobbeY0Lvj0=; b=rWuITPUK12f/lU8UPug4xZUuviQinronM3qVB3kdR4Zlq0vHvpfZcOjatSAqS4ZXeL u7w6+Nn7KEeii4vHLAvM43BQKJQsULkvDCDhPc1rnPKUZG2eZ2JrB1e6ATeKDJ+t3Kev o/AeoGs//tQ4LnQ6bQq5oJqWsIgpONyWs0vwHY8vcG72kF907K/jG3DTIOzFQUZ2Q9Oo +cWgoMO36ejvVpuYBv/H0sQY4s8Z14JL4HgjOmf5uR0Ur4eIa8QmP7oC5Seh1ALCVrGc ho0d8LcjqKZDi9oiD1M8d988RSTSbkzvh7ugL9I28m4UXGWRZAvKUu0hlbVbHcu78nj5 9jWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784757465; x=1785362265; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=79uv6b9kpGK3L9wWaFCFvGy8djv5dMf5yobbeY0Lvj0=; b=smT9+6yYMNN0HXVGgNAUSmRpZGy7WNUweBinN1uk0hG5YbVJdsh5gpeQsg1Za1Bg5g qy+P4CQqplQremziPEFLbbFaFcb3tDbrdiP55zA8qdDGvdHSxhadjaJ5SIFzq3NZOi3K wTAB6NpznPrxvNrRSNGgaLZRCyYx9Dvnt1SFjfggTO48QqDM46NdrgYJ5uZZjF7ITReq MfIvPrb6+4t5QMLV3VzwwkOKhGL8eElhdWhVegj9vEi4j6kbHECNDOUCjzOm9YcffdWm OPMHUEeQGOAW/3diDL+HiqwkpeTpgBuYj/gntIwS4UOYxd8i6QyHX/8TFfpWcV6fEhS9 kwWA== X-Gm-Message-State: AOJu0YzrIj3dk/QunelWQ2awnBRiqykpcFz5NUucynGn3Uiy2bVAekvD vyrSwUd7fnzBilQaYUli45LhObDB3MTgV44cJcQzyphrKrLBGYgB40GYRE5wjw== X-Gm-Gg: AR+sD10KfFbR1Yq9n5va5xKzZB2W9GppAjpbX60VCIeUshH+rN0Y71zjeyVf0VJq2aH bF0u0Kh2bK7OSKXfWtJSnqvldoFjFEmq0J89U2O6h4jCozaUsOp8JUeNjN7OZ7s0IKyq278U21S 0x+jKNSqu/DAEWs5Y9hRIAb7HqN1nPbYxoNk5LyIptaGjCMf5LGK/M11/VaOvsSX0jHPsHB8xiR jN9udczrEi3yWPom5e/QQgjtphLgMOJvf9ewAuz+uWgAv5Qex9fO+dcDZOHHTURzRFYiMFVkGcY wmXVTqilJH0VQWrhmce/OL+b8e5u65l/4cX/B37VVAujk7wyn1hVJOLZF1UPS16ADFCmizfEXVK sDePDpjh3bFbZkXOMptAicngmGF3RA1s3bX5Aut6vksywmzBe8se0Z+Unbxjux5Ihx9ap0Bp4T8 gVPQgGD9J+0ApQpZjXZqky9bQCU+L69ooVIyp0efVWc7Pxt+rvwCB3CEQV7aQ4+ykScKoAeRphO R8TrWLOZsaCH6t2762DXpxwVnU62nK9fpkY9DYka4XrBcgZSRk/jbF/kNGOKWCM2symz/7hlK+q 5rGFYATlhmCDwTZO8Yg= X-Received: by 2002:a17:903:4687:b0:2ca:20b1:3e0a with SMTP id d9443c01a7336-2cfa6a5a2d0mr7885385ad.3.1784757465504; Wed, 22 Jul 2026 14:57:45 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc9f2f0sm13264388eec.13.2026.07.22.14.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 14:57:44 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH v2 4/4] libpsl: Fix meson configure failure when docs are enabled Date: Wed, 22 Jul 2026 14:57:35 -0700 Message-ID: <20260722215737.1940382-4-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> References: <20260722215737.1940382-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 22 Jul 2026 21:57:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241761 libpsl 0.23.0 ships docs/libpsl/meson.build referencing an undefined "cdata" configuration object; the top-level meson.build only defines "_cdata". meson shares scope across subdir(), so with docs enabled (which OE does via gtk-doc) do_configure fails: docs/libpsl/meson.build:7:20: ERROR: Unknown variable "cdata". Backport the upstream one-line fix to reference "_cdata", which already carries LIBPSL_VERSION for version.xml.in. Signed-off-by: Khem Raj --- ...ta-to-_cdata-in-docs-libpsl-meson.bu.patch | 38 +++++++++++++++++++ meta/recipes-support/libpsl/libpsl_0.23.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-support/libpsl/libpsl/0003-meson-rename-cdata-to-_cdata-in-docs-libpsl-meson.bu.patch diff --git a/meta/recipes-support/libpsl/libpsl/0003-meson-rename-cdata-to-_cdata-in-docs-libpsl-meson.bu.patch b/meta/recipes-support/libpsl/libpsl/0003-meson-rename-cdata-to-_cdata-in-docs-libpsl-meson.bu.patch new file mode 100644 index 0000000000..8aecf34e4a --- /dev/null +++ b/meta/recipes-support/libpsl/libpsl/0003-meson-rename-cdata-to-_cdata-in-docs-libpsl-meson.bu.patch @@ -0,0 +1,38 @@ +From 3e02f2cd038209e873c970709a9eeeead4d70afa Mon Sep 17 00:00:00 2001 +From: Tim Rühsen +Date: Mon, 22 Jul 2026 09:00:00 +0200 +Subject: [PATCH] meson: also rename cdata to _cdata in docs/libpsl/meson.build + +The 0.23.0 release ships docs/libpsl/meson.build referencing a +configuration data object named "cdata", but the top-level meson.build +(and include/meson.build, which sets LIBPSL_VERSION on it) only defines +"_cdata". Meson shares the interpreter scope across subdir(), so once the +docs are enabled (get_option('docs'), which OE turns on via gtk-doc) the +configure step fails with: + + docs/libpsl/meson.build:7:20: ERROR: Unknown variable "cdata". + +Reference the existing "_cdata", which already carries LIBPSL_VERSION as +needed by version.xml.in. + +Upstream-Status: Backport [https://github.com/rockdaboot/libpsl/commit/3e02f2cd038209e873c970709a9eeeead4d70afa] +Signed-off-by: Khem Raj +--- + docs/libpsl/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/libpsl/meson.build b/docs/libpsl/meson.build +index 1111111..2222222 100644 +--- a/docs/libpsl/meson.build ++++ b/docs/libpsl/meson.build +@@ -4,7 +4,7 @@ if get_option('docs') + configure_file( + input : 'version.xml.in', + output : 'version.xml', +- configuration : cdata) ++ configuration : _cdata) + + docs = gnome.gtkdoc('libpsl', + main_sgml: 'libpsl-docs.sgml', +-- +2.51.0 diff --git a/meta/recipes-support/libpsl/libpsl_0.23.0.bb b/meta/recipes-support/libpsl/libpsl_0.23.0.bb index 6026adad9f..3b3c4aa32b 100644 --- a/meta/recipes-support/libpsl/libpsl_0.23.0.bb +++ b/meta/recipes-support/libpsl/libpsl_0.23.0.bb @@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=49296c1806ef92c28297fb264163d81e \ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ file://0001-Support-reproducible-builds.patch \ file://0002-psl-make-dafsa-embed-only-the-basename-of-the-input-.patch \ + file://0003-meson-rename-cdata-to-_cdata-in-docs-libpsl-meson.bu.patch \ " SRC_URI[sha256sum] = "f39b9631b3d369a21259ea4654f8875c0ec6995ce9551c0eb5d423e4c011f911"