From patchwork Fri Jul 24 07:29:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93422 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 5A8FBC531FC for ; Fri, 24 Jul 2026 07:29:54 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.14458.1784878185225501540 for ; Fri, 24 Jul 2026 00:29:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=BEghoWMM; spf=pass (domain: gmail.com, ip: 209.85.215.181, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-ca00f126b7eso89869a12.2 for ; Fri, 24 Jul 2026 00:29:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784878184; x=1785482984; 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=H8lF/vEc99GAU+8iT5W28hUU8tStBnwqjKmDLtXZKEU=; b=BEghoWMMtxa8ilie+XndjIp/hXIRmI1P/hVE3UJeVWbO1FHCUPlvfpzUFZM2b/EFdo apMN1k5TO5Bu0AK9Thfg8v3EXO/+O46vJZHV5aS4+Js9vYbvMg5bzo7QPY01b2rXV4wQ ueLOTiV+ZLgrT2qv9CYv8kzHWq+zIf0EZ82nANeGD0UrR4pz4SpsFbbkuE2+OKUhq7hw KMf7W6Pl7LD2p+BhJWqh6wyT2bTENiOWvJ/RVQlZ10Pok823biBJ+K2Ue+JMgpf0V6ti 7JBMUaU2TAqmQClK/oyLrxBCyWtCoRGUthMuhuwmZtg3slWZSHlxA4aEn12GQac2cgCi pXqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784878184; x=1785482984; 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=H8lF/vEc99GAU+8iT5W28hUU8tStBnwqjKmDLtXZKEU=; b=khg0KpY//+dOnDFFzTESOsFC8aOpusB92YrOVqFmR6jRHiWlBVBZLLrfZycdbVjnoP 9Q5s2sa9MQa/vvd9ta3YbQ/pIoeMXlSNi9Ns3Fi/FzYMoQQCnuokYewxTSDindcsU7DU mFdObxP/aWzME6aEjTtEjuXCSSnPMQIucNhnAMlNdQfWto2VfzutBu4FLAhLJAxqAWhH ZzU9XwUd7y28RmG/r9Z4xkSEwgIZfZ+nuMhySrFHlp43xepbpnHMKyNy26L01uEpSeWR SdM54di5Xpa4rxg1r5ihYHKRPORn4PKsqfW/plL9qfhdgoGsmxjyZ9A5Jt7kW7TljPMS rqQg== X-Gm-Message-State: AOJu0YwV64puKVZ2FQvg4DUO4oYHNKmBE4pa74Ap0C9glDNAi5kic80Z tyqu7i9C5sZaGqs6FaJsNoA9mk8tsmk9DcCfwFaxtnLAFw/wf1TPmxhXiGHvsQ== X-Gm-Gg: AR+sD12t+35s3JyDrq+a7FXlxLiccdL1A0nZQvytg9L1i+6HzAM8D8pMWSYTtiAzUgp 4agiACWKfidnYjV4zlIBziY+IbxC3X0zyke+7u5WGu6mLylqJRnGltVGaQUlC5/iOM3VWUiNQd/ 0P9TlFlkadJCUfs3leyg80+5VUuhtoGp2keF+XpeyHpskvNss95FQF/OV/cIC8Si1eyWt5DBs7U TOpHElXAr1wxWY4vPWXrXucyS2PGoQnvJZeDbjlLkEjTxIdNo2DKabfPN29WiMjcMv4dAZ4eky5 niuKUaclKOR3q0kBziMkatgTOtZwgR+e+sitQgfeIDBbFAsoX90+/SxJcKKMe3WC7OgpcX5A/xl eI4lhMQ0kThdkRwZ2GqmmfD19yUt31urD0ixpzxR1neV4GI+Q9k+f4G15zBEdc3aYAtVel4HPCo Epc3YbmQ7UJDC/AD0Be2k7YbnyJes4kZoTNYwaOnJYY9lOutLAdgdd0RdnTUX5yaBvm4H4KMCxH T4KciKVS0UaRRLFoK6zTJtiG95j84gUuD12hT15/Di6W1lB6Iv53EG2FvT96dd2XUi3QY6P+pQF nMCPUw6EA7DzL5Sdf0M= X-Received: by 2002:a05:6a21:4a97:b0:3c3:b4e8:5565 with SMTP id adf61e73a8af0-3c44b24449bmr7075755637.61.1784878184168; Fri, 24 Jul 2026 00:29:44 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc193f8sm45091397eec.1.2026.07.24.00.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 00:29:43 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Khem Raj Subject: [PATCH v3 1/4] libpsl: upgrade 0.22.0 -> 0.23.0 Date: Fri, 24 Jul 2026 00:29:36 -0700 Message-ID: <20260724072940.2807849-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 ; Fri, 24 Jul 2026 07:29:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241902 From: Khem Raj 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 Fri Jul 24 07:29:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93421 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 26948C531F9 for ; Fri, 24 Jul 2026 07:29:54 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.14280.1784878186142307318 for ; Fri, 24 Jul 2026 00:29:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=K7whpYTo; spf=pass (domain: gmail.com, ip: 209.85.215.177, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c981c2c37cbso115008a12.0 for ; Fri, 24 Jul 2026 00:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784878185; x=1785482985; 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=hToJqclZJjUS/y10vPDgiGP8bIQtWf/N0tlK5X/cjuA=; b=K7whpYToPLS9fF7v3tt+E6rlt10NW5w/Vbi6C4ee0PlfJzdrwQkUt3M4sHMM8i6vFH EoC01wNNRPy0MmmdTXaf5UI5/oc/aYZfy4K455IAXKiHCZlanOZsP8XBm00zSv0uRqNX mnj8vI4gFkJr4RIf2HDcSHvT1jOiXw+R5+mH1hDJVm7GfBLURxTdkmKwwJnKlbMqfW32 C4J5nCe2TxCBl7dY/Y9CVA+Q64NiBz4qbRigv6TKPfwga5NS/UOLs1+sHL3E3HhNLgNS Tb6heoR9Ee1YRQi/A0VNHgfmdzeDI3qnUOoaqspcmkM1JFv3sNSRcDO86CTaPQR7+UIp hqAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784878185; x=1785482985; 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=hToJqclZJjUS/y10vPDgiGP8bIQtWf/N0tlK5X/cjuA=; b=Uuig5MF3Mdy1oQexEw+vt2IwXCm+uAaj1IPprhRM28awunv1DNhkLT4Yhb4ghS0F42 r7VD9GQZt6YCknZzPwXnq76g6HpSq1Si+Fz/4Pu+8aQOUZtvU87qg587OANSe2uL4ZbX 7rbm6mDwowMms993vEgrMIWEDpY8ZZCtqTie+hMaVf/7E2I9T6rW+KLAjCScKsvQSihG K4HKqA9HPnLFdFq0jR4pjDvaenNBZJ+I+heDeuFx10q99yspyRR707MhHmQO+0AbE3gE tmyFvItR0AaZ+MeJ5D18gEeDtbvuUanPniK/nQBJgqUElfRRdldY6aIStBpR5rRD8K+F V/Aw== X-Gm-Message-State: AOJu0YzMyjw1OjQATYaxaFywXDHcjuezdC76J/sMcEkyb4LBvoX9hCWu KvFt+dowEcyNi9QstRw0Jb7qSAMVRHXJkhWse6VX9k+Smj5+Bc0vbJSMwhiCvA== X-Gm-Gg: AR+sD12nKJsyS4ZDskbrigIBcxmu4dEa4o5qlbpruQwXkOKiAWIV8lCn66JW7cBG0Yb xD34BmO2FUlVMNVsuVdeEfol/Q9V4w7lMX3MoX8OsDpv3i74gWuIor/Sbi2ooFBw192Q+Cr4ka/ oN3il41Gh01eB1ft9RZNqh429mozF/NKhixEND9MsKh4ZCmnQaSy26wX8OAVocIm3no+0Zs22sN 49Kh7BggUb4fPga6j5Z6+j/30n3k5mDIddKmtgJCiVh0zVo0FmSlS4sLDYuCLh4i1F7twoB7NXk oU/tDGM9xA5duFXIOtmy+gmZulY8dGnuhXPvMUKKgoskFz7O8YeCY1SK1fBmOM/OFjxwL9KVNHJ fQeOdUXV6mhppRSx6UibHYWLV/0EPJcRsh6WU6jSt1HN6pVBDZBv+Hq8wkTDypbROyqmAJUuq0d v9vsAP0WZSyL7cPy+wY+L8HGT4NQYgMyyWrXfCQStA/SnVIxCADPi0Lfc4Ab4KPrkbMzD3sICQ7 NCRJQkGnMT73pd6g37YpgakXHb3rnc9uE2g3tqOZFgLpWa5w+BgRPZK6Qgr262oLlaI8ZF0MeaB XyCVXZgpd3hwZ8MlFF8= X-Received: by 2002:a05:6a21:7008:b0:3c3:8de3:8eee with SMTP id adf61e73a8af0-3c44b222849mr7226765637.61.1784878185357; Fri, 24 Jul 2026 00:29:45 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc193f8sm45091397eec.1.2026.07.24.00.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 00:29:44 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Khem Raj Subject: [PATCH v3 2/4] libpsl: convert to meson build system Date: Fri, 24 Jul 2026 00:29:37 -0700 Message-ID: <20260724072940.2807849-2-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260724072940.2807849-1-khem.raj@oss.qualcomm.com> References: <20260724072940.2807849-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 ; Fri, 24 Jul 2026 07:29:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241903 From: Khem Raj 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 --- .../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..5060e3d863 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 gtk-doc + +# 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 Fri Jul 24 07:29:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93420 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 328DFC531FA for ; Fri, 24 Jul 2026 07:29:54 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.14460.1784878187289657750 for ; Fri, 24 Jul 2026 00:29:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=U7f8CRaF; spf=pass (domain: gmail.com, ip: 209.85.215.176, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-ca7c1176317so113065a12.1 for ; Fri, 24 Jul 2026 00:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784878187; x=1785482987; 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=fvDVmTcA6xwj+YU+84NPdzfkCbuWmNpWUl+xCB6EE5g=; b=U7f8CRaFv+0/2y3gPsxHzIbkHacCLiZXCW3hkZURv2DMqXgCmfyaCRABxU9ogssToJ sGivAkFUDVev0Gkh17fDC/0sKciG11on7G5IT7nj5bcxmNQAenVOHa+5E1UY2Hx9hKQZ D46/IVSafrkQpvSVoq35vDdUWphcctZMR0ezYHIgHkgLO12I3mO1T4tXvnABnwv9AXoy gmYtOb0JDoyHVTBg7yU+FuYFfV5gVS0utorh2bTUVAQiw+mfh9t6Gkcp8/EROSJjlmd9 6GFxPe5HoPoukXcXFl6v1iRVgQjN+qOC5SzDG7r+DVAtAcbJNlpT2m2vnVqftvt6NwQG eaQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784878187; x=1785482987; 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=fvDVmTcA6xwj+YU+84NPdzfkCbuWmNpWUl+xCB6EE5g=; b=rZva1uzipCKUgqYEQz5ObcBQgk6mKU1GmIT4V2svDUud6/O7aRbK/y8Z13drNz3VRx puAtDiY0Pogk5aSjYz137jqZYz4ssWnxxBn4MHa45httbBNNiElBnp++8GdMij5kWVJt 6y8qRYqlju73lWl8XsjsOBcxcz+lG3W3Xptyz0dxEFRBK0hYm38sm0zZUn9bbziZS5sj euR3ctLMy/jbOpiQh1uuR46vzucO5qYGRxXR38MfvgqNmVhMOFEPyUK0V7WQskV3OYP7 ae1FuYEquxymMDaiXi3w9oY5AG1uyzJe2gbMTnV5RxqMfEYAYJ3j8XCnvsPDCewBrBpa uvJA== X-Gm-Message-State: AOJu0YxPX7VC2MIW3zojnLk38+KEWed/IYmdz6Zm0zmENP1GYD3PinHr PgXipxef61DjRdMAZh141LQXsnkQ/Y9K3+CVW2YP0XwTR0Ay+LPX/xmHWrb/VQ== X-Gm-Gg: AR+sD13oCLvnsG6STTcPef/NmOdBFFzJ+F2AP2BAK4TJBXKktuxuuB9HxtiOvZtT1U+ 23d1jIMN8ck6YNq2jFov/w1ZaGxXWoeMW8xeQ7oeaaMWt36YgUI/JKEU+SKEOHhNhPIi4ptkhqn oqwAegZWDvoqX/Z2TBrhxf8k7FDYRsNfhWuq8KBp1i+B6VEkRNPvywXGDQ3viNH9DYHMrFu+FQb vQtddyJf+TDvZdq5/1a1OegBYTWWgklylIIenitCJwa6BLF04LpYDyJZWtr1ixDZFYT11WunpQ4 +MMDXUJdOoMgl2VyxGYcwSZbSdu0kdArYdm4rnYaLn/iwgoYSlr8H8nSSuB/A4Ql6u9lgjFA7at LLS0lW1wuDYTt9rpoE3T9OXazcamfiKSXZHr/JzF9FQhcoFcgu/A67QtsFNoPeS3mi6RJ3TaznG G3P2Zn9tS5g62Ru38Y+MEyiq8t3JB9A4pVTuUUrwKUQwM70KhN2bXWGd+Vh0laisQLOxXLIStrS jKjFHSOR9N46kIyM4k0Ljhuendkrj23pMDJP6bwRvwinvjlko/3zJj8dPrY7yTHrLfIYpSIS05U RZ3aK6oiMGTaK/borVE= X-Received: by 2002:a05:6a21:7008:b0:3bf:7081:9356 with SMTP id adf61e73a8af0-3c44affe1afmr7012432637.17.1784878186548; Fri, 24 Jul 2026 00:29:46 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc193f8sm45091397eec.1.2026.07.24.00.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 00:29:46 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Khem Raj Subject: [PATCH v3 3/4] libpsl: Do not embed the build path in suffixes_dafsa.h Date: Fri, 24 Jul 2026 00:29:38 -0700 Message-ID: <20260724072940.2807849-3-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260724072940.2807849-1-khem.raj@oss.qualcomm.com> References: <20260724072940.2807849-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 ; Fri, 24 Jul 2026 07:29:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241904 From: Khem Raj 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 5060e3d863..0994b5a030 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 Fri Jul 24 07:29:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93423 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 4D744C53209 for ; Fri, 24 Jul 2026 07:29:54 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.14461.1784878188890405201 for ; Fri, 24 Jul 2026 00:29:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=cuDJpYod; spf=pass (domain: gmail.com, ip: 209.85.215.175, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-c998fd549a8so100484a12.2 for ; Fri, 24 Jul 2026 00:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784878188; x=1785482988; 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=eGWelDjJyU+xQBDEIyA2YT+BYueHXZciTls3fxw92l4=; b=cuDJpYod6a4w35aKmTmPkN/LccStz2h5AhNP9m8HC9rNdTnpoAx1L+ts6UaadFJhJo iW4nbystCc+Dlu1oYBt9WXOkGNz4u5mp9FtCknRJN5Nu/n+L4cNqFbxlIcboOAfpm3Hh eRxxiEl3FIYzPqKmnXqsnYuwQzRJ0EmBYeG0O2lsfyijJFG2ydtiMkFdRwJ+sN9QVpHN V7luodGp2X002b0whmoiXAqz2HpgLzBP2PA938z/7nZW8yAbV0qjiRY1PuOpYCSy473n 2znxX7/pzi0HV/tEIyTxob1uR2hxITyJcYcnvSU6Y6fz7sW2No5T1luFv/rl1QwDiacN k/wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784878188; x=1785482988; 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=eGWelDjJyU+xQBDEIyA2YT+BYueHXZciTls3fxw92l4=; b=OgLe0xVfV8Esq6CreaiJE6r+c7GRFAQlpbAdVjOxg/ZkBK/rhlIzKSTlpsZhRuzSGM amSkn0fFPvYmKAIRLodRgd3ytxNV5U6UBw8uVKzzNuXWefZdzHtAOttBR15BtI0GD5Vn wEL50AVePxZmnWJ3iYcHBnN9e64BHX0SCeLlMh9ebKM8aDXCCB+l0VLzbReOYUHh0jac qfiqxg/vu5aanKSQXMu8pOZdkhgeqrHC5JS2s7IBIYi9pmi8yMr78W+hx1XmNxLsI6jH mxbKROevWVjPjr0wXekU44yZARCSAsDYORuJjeqTxwyc2tiahjBAUpUY2flupFmZOect rv0A== X-Gm-Message-State: AOJu0Yz2mUBUOGUAgspkDh5tB03T+GmXKNJlpnEYotBzsHhndhbqrAQX 4mTHWHkVosN5+oXK7KKt1E+wX/X4Qveq1B+3FceB7ezRt35S9VFgqMRNdhJ/Bg== X-Gm-Gg: AR+sD12ogJv6vjBH/diNS8RVJKf8EtuTbAcsHD/KMN26L5zawhWbU7M0HnSswTOc56H QX4msDS9foRbU9KvAYawREpoPV2tAfoVJym1WlMGBFfjEz43+4Zt5otR5441dRDOdafth9cu8y1 JxEtNk/owSF0Q/VuArTZXKtvzxShS4uEp0n01yPMn2uuUNQnvyZ3i/FiXAq17GBrrt/6pJOtbLJ asTi1TFI4rC2PgI7KGOuHD5mKerNgi5oAeA9NYQAVPvq40jWUlQVUQ8YiTSN/S4auGiWRg7bF0w KHQr5K0hWX/f/ISBo99hBVV/xK9BzFH6aQT1++pvhte+XzLsyGid/FStzewanELuHIdTxvp1cbc FlOg2V7uBi8B08joB0Wm/AFMnTGCL7S4x9Hf/4+Xa0w3Jc6UAgRvXzx8mg2o5Kgai9VmeVCtT0A /8sDVYqCjRU8x4K7xihV9waQbXQmLfKMP8XzChWXBv1XvmWvVudPD9wLrOJPg6tpNQgdSXcKvE8 2NMECJz4Gi/0kqhKOWzHr1fVJqKi0vB8JY9b6EQx5k8/o0VrFJ6qfFpXyStVdbPLMR2cTPpZnfs 5/BqbP/V/8/MIkqyR68= X-Received: by 2002:a05:6a20:4304:b0:3c0:9c19:65a8 with SMTP id adf61e73a8af0-3c44b2443c2mr7064541637.64.1784878188038; Fri, 24 Jul 2026 00:29:48 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3147dc193f8sm45091397eec.1.2026.07.24.00.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 00:29:47 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Khem Raj Subject: [PATCH v3 4/4] libpsl: Fix meson configure failure when docs are enabled Date: Fri, 24 Jul 2026 00:29:39 -0700 Message-ID: <20260724072940.2807849-4-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260724072940.2807849-1-khem.raj@oss.qualcomm.com> References: <20260724072940.2807849-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 ; Fri, 24 Jul 2026 07:29:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/241905 From: Khem Raj 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 0994b5a030..193f560772 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"