From patchwork Fri Jun 6 20:58:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 64495 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 2457FC5AD49 for ; Fri, 6 Jun 2025 20:58:36 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.5503.1749243509358190181 for ; Fri, 06 Jun 2025 13:58:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KE8bnzEg; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a376ba6f08so1470547f8f.1 for ; Fri, 06 Jun 2025 13:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749243508; x=1749848308; 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; bh=RbRWST3euR9pf6WLt2R3dh2vCvA4OZfH3xDvI+13VH8=; b=KE8bnzEg13faBFp75uXYhhkL66NwfCdtLlVXoqpMJ8mTqNg6u41sYlQgHahthvE5Io 31x3qf2nM24Cggz7KX35ETA78VVn0HPjfcvkzSxa2opHiREpGjYFDvROynV8s277h2g9 684jn30B4DuI1Wxfa0MT5DynegHS1/PsdL6VKJ7gbABMPzoC400UjWTlysdqB6UfO8VJ TwlVlHZ3AhHA9tdAjBfD1daSwQGmCurLXfKL6es1G6jVpxLTmcsdOqx1qJsykuvp9OWU gRtERsplVVgxIZlxzCpnWAwF4ss2yj3aSfBjL896OenC8RNh9h2ZyrfWpcEmWfxU+Kzh K/DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749243508; x=1749848308; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RbRWST3euR9pf6WLt2R3dh2vCvA4OZfH3xDvI+13VH8=; b=TUtHHBx+AtneA6Dp4IGo7qNYu2hX5IkIw5FRLcTztMGq7EdpE0TaDq6NztAqW1RrTq BZcZ/JKmJsOjVKAsXcQqsvZ0Kig1ry0SS+0b/gECv4qVvgN62Ex3fJxGB1hvYL8v1tF7 ucGV4xO6NlkJ9eolfKUFXShh1jQ70P+PWdKDPWQL+shSII7vb1LbDUjjsI611igBz19b ZdvVG+mUgObrzO1f4cwLrxTR8VfkZ8E6DLVBnFvKoin7g9WpK7V8Ry8XxzOgY5nXovIY 4rBAnLpINfikO4GRIPrjS+mGhlhx+PnjF/y0rYj9EWrzDOsk38vpWhSNqLBbNp2Mvg8f M6Cw== X-Gm-Message-State: AOJu0YxH8OiMZTzbgbn4dJSrxwSJneXeypyJoNophmVjaj+ZVcrWDpMl GJL3RXMdHIrms951S9BLqngRW7cWH1onA0eSnzawq/H091vTGorFgNr+Xdd80g== X-Gm-Gg: ASbGncsu1GTLMOZuUVmudWJ0ltjxwGYtL8/W8EO882t6Rv0rcCZw9aaihm6Dy1vJyKr zNGR1VLDnCqi1ZbkrbTfvabie0AzMVn6QRSCNaWtwaq7+T5Ms4YXLK2uGEDvgWGDWuyQfdmmHbQ YNJFhaQjB3NSIzJnoWViOvHknj9DVt4M9SiDmybSkYdGpg5h9Z2xjxqznPb/kSdkwfPTZkYQlMg DWJegetaHVWOMtNAQ7KJMvgHAgQtOgJzjQ7KUY05wBwj/mSCP+T1NUj9oubqXKSwibAzsuTDYoC Y+XZQETA9Jy/rDSLS+PFSF5ltG2Cz/4UBHeGbkkQzBl+pi4ygz/KrPBXadoH89Q2RLs0ni4jnWY qMQkkY/y0vc5E X-Google-Smtp-Source: AGHT+IEH8kWz9YnZdgPZWjBUUhwmCsj94GE5ZhaS0KZilBiAaaP4Ng6x5hQWKJt2JMP+8yBcfX3fpg== X-Received: by 2002:a05:6000:22c4:b0:3a5:2c18:b181 with SMTP id ffacd0b85a97d-3a5319b5920mr3970175f8f.53.1749243507405; Fri, 06 Jun 2025 13:58:27 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a53244f4e7sm2850859f8f.77.2025.06.06.13.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jun 2025 13:58:27 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 1/5] kea: correctly eliminate build host paths from installed file Date: Fri, 6 Jun 2025 22:58:05 +0200 Message-Id: <20250606205809.4071299-1-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Jun 2025 20:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218181 From: Alexander Kanavin Only the ${B} part should be trimmed, not what follows (which is subject to change, depending on where the sources are). Signed-off-by: Alexander Kanavin --- meta/recipes-connectivity/kea/kea_2.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/kea/kea_2.6.1.bb b/meta/recipes-connectivity/kea/kea_2.6.1.bb index ff7fb51fe0f..17e4378746d 100644 --- a/meta/recipes-connectivity/kea/kea_2.6.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.6.1.bb @@ -69,7 +69,7 @@ do_install:append() { sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl - sed -i "s:${B}/../${BPN}-${PV}:@abs_top_builddir_placeholder@:g" ${D}${sbindir}/kea-admin + sed -i "s:${B}:@abs_top_builddir_placeholder@:g" ${D}${sbindir}/kea-admin } do_install:append() { From patchwork Fri Jun 6 20:58:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 64498 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 304E2C61CE7 for ; Fri, 6 Jun 2025 20:58:36 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web10.5504.1749243509736897199 for ; Fri, 06 Jun 2025 13:58:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dZSvSzxT; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3a361b8a664so2048775f8f.3 for ; Fri, 06 Jun 2025 13:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749243508; x=1749848308; 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; bh=RbsHDccuT6LL7bD8T5NhyhXi1lVlStS9IMrDDvMxPGo=; b=dZSvSzxTutmnssrVpe5WpZPc8eFv5l+TCcSaHGGef3BomVC4rm7vl/jWNCJZyBUyMa /gS7z3p9G6fDXhYzCYGdGTGm7ONS5pjWW7nD8QNrVBcqFoNovWEJbw7xvIyAQNGt4DLk AWD+C+9iI6HwnmI4nfZXp1DgWMmTj5uSrSpbEtr8fJITqtw6p+eiDhBq+aVxiwDTMyZN YEn6nEo5HsqnDmR9adXIqd8WoxcVUUtbKpbcn6cj2jUOHr2DtLU/72A5P/1FzovG3ecN cYO8IP5est3wGGRaZ+CGtmzCqHW3RUKQiiryawlnxHjsAkoXOTZUpAWyfQlmEpAt2Vf4 buAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749243508; x=1749848308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RbsHDccuT6LL7bD8T5NhyhXi1lVlStS9IMrDDvMxPGo=; b=omramaiRTpqsrgFOjX4ze2k6gnC/CCmy8WHR6Drk8TBurOqiZ+g1PZRlbdf1UxpQLG tgekQVmKcKI7YluJJ+sThit1crupx3j4Vg16yO1ZWdyQ8q6J9szoKrYzIwwFv6cPaT8K Eo3vneowEFE5sdTMz+Cfhd2NsXV3NvwHNpDOsGGE9u0/A67uOuubDzX0P0oycgQjkThp +CtFdg9htXy1/zhutXEpkQH7FTrORFBwBiOHaU0Jp8VklLYyJVuXk8lrnbvlkzJu3ZxW OACO6gOtPfXdD/xSws1C9nrPpiI/sP+y+6bjEzyWCn40U++JsxHxLPYreW5G8Xcr83Mv z3MA== X-Gm-Message-State: AOJu0Yy+DeihhFRKlDMUMfxagwJ6nerMVypEqPMWIowrgGIQiXcoVggG pqCOnJNdYzcC81ESqP3JmBzvfpdLup7Iwuwhb7sprnQe0rgqevYjShLQszv/Kg== X-Gm-Gg: ASbGncshUeh9zBjrLCtm6Xqt1QXcSiVrFXKXpfTWdOenoMNzeMStutpYDjur0LdMvC4 JPwWBGaIhp3z20aNIaheJ8v7Ek0LxnByhcRrvIWaPBfvQi/05ZuoO/ZOYINu39GS8HsCCNUqc7T cI3cBlrawGoLhUSkxAu4BKhQ8mIUss+UjlchgyaTiVb+3d2iuHmQldmqPHrMWfzZHiz4sFmSswd K9+tdY2fPb/90RVn9UTfxOiCQXpbvvvbzadO1e/pqHJhIp/YKwsaPBMWNvTxetTvtWBlbCnK5Bq lSvbXk10KZJJ8G8Zs2I89kMr/vKQUwLAnKXwiroW/GwdLzdpZssNwvosghbB5r/KmbDG8yF3eAx kmg87J4FTbDZ5 X-Google-Smtp-Source: AGHT+IG0dNQK17ptKOqtO/3TNY9p1S5xyIqucKB+IMEASMoF0JiiC2zWm0a+2za9kwkdT8R/6Xfvbg== X-Received: by 2002:a05:6000:2585:b0:39f:175b:a68d with SMTP id ffacd0b85a97d-3a53188da55mr4223692f8f.11.1749243508017; Fri, 06 Jun 2025 13:58:28 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a53244f4e7sm2850859f8f.77.2025.06.06.13.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jun 2025 13:58:27 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 2/5] systemtap: correctly set include location for the python module Date: Fri, 6 Jun 2025 22:58:06 +0200 Message-Id: <20250606205809.4071299-2-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250606205809.4071299-1-alex.kanavin@gmail.com> References: <20250606205809.4071299-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Jun 2025 20:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218182 From: Alexander Kanavin This issue was as well exposed by setting S to be in UNPACKDIR. Signed-off-by: Alexander Kanavin --- ...am-use-absolute-path-for-source-dire.patch | 36 +++++++++++++++++++ .../recipes-kernel/systemtap/systemtap_git.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch b/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch new file mode 100644 index 00000000000..dacd19edd1d --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-python-Makefile.am-use-absolute-path-for-source-dire.patch @@ -0,0 +1,36 @@ +From 71e4ffd46dbbb7de1d06edb66f3e1fe0de423586 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 21 May 2025 13:25:46 +0200 +Subject: [PATCH] python/Makefile.am: use absolute path for source directory + includes as well + +Otherwise it would be relative to the build directory, +which works only if the build and source directory are in the +same parent directory, and breaks if they're on different levels. + +Upstream-Status: Submitted [by email to fche@redhat.com,wcohen@redhat.com,systemtap@sourceware.org] +Signed-off-by: Alexander Kanavin +--- + python/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 9d5cb7bcb..130e90b24 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -2,10 +2,10 @@ + + AUTOMAKE_OPTIONS = subdir-objects + +-# Note that we have to use 'abs_builddir' here since we change ++# Note that we have to use absolute directores here since we change + # directories back to the source directory when building the python + # extension. +-AM_CPPFLAGS = -I$(srcdir)/../includes ++AM_CPPFLAGS = -I$(abs_srcdir)/../includes + AM_CPPFLAGS += -I$(abs_builddir)/../includes/sys + + # Add OE's CFLAGS which contains `-fdebug-prefix-map' options to +-- +2.39.5 + diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 254bac4d6f9..588b3b8d36f 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -9,6 +9,7 @@ require systemtap_git.inc SRC_URI += " \ file://0001-improve-reproducibility-for-c-compiling.patch \ file://0001-staprun-address-ncurses-6.3-failures.patch \ + file://0001-python-Makefile.am-use-absolute-path-for-source-dire.patch \ " DEPENDS = "elfutils" From patchwork Fri Jun 6 20:58:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 64499 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 3586AC67861 for ; Fri, 6 Jun 2025 20:58:36 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.5505.1749243511011061791 for ; Fri, 06 Jun 2025 13:58:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IY0EPinO; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3a4f78ebec8so1535829f8f.0 for ; Fri, 06 Jun 2025 13:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749243509; x=1749848309; 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; bh=awotewyAkVEL81B7kiEkmlvcmedzvUDl8UFKqsHl8So=; b=IY0EPinOCzT+fTnCY+zvNQ5k+DGKqMGws+0Ufq8+F+2wB9MhOP3QrCgL/Q9s20gtM2 L2gDsegIIsFZLZdodKTBZMZeZDeDk70ESz+/8RenIDl6hvk+SUB4HNYR4HIfcCskjSLe WSSiuPlt+Ij8dLKlSwfuJy5GAHe1P9WCGbTcFtC9m7aRkZp+Opd6Q5oOnfk6I9y+46tx WOgD5mrxbhuuVX6tUrIIM29XWsddoDopGVC/sv4Y1d3rqsqcrWLqYD5G6fZ4NZs/WXhI FpJ9dNtpKsMNY3xjoy7i8wz8fLitXjE7BojqdhmG7Ii+WTo5F0MEAMsUDwWJyrq1xwJV qo5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749243509; x=1749848309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=awotewyAkVEL81B7kiEkmlvcmedzvUDl8UFKqsHl8So=; b=ayu9fxMwF4fhQy5qvq5iNkBJXp/AbRNIjCDXPMC7HByy9HwZ4OvGhmT5r7ytOfKl1u d1JeLUyj4akebwuY9vxwiAJddR2/J0mVoEsSnibaPcfbbDwzIFwubVxmIElJxisi/j+m ktxIIPHikC2f5Qnk7bGKKo+xRbRj36+L9yEwlc6txHrZ2u1qMbSdIkcIv3Wyl1sz/CAG IOMqr4zW/Pfjl6r36O7nR3I17CkYn5l+WUN7Q9DK8dXUoW62hn4zRNmlfGfPFI4Zi3iX yEI7yylgJqL2ezTxU0/uHIJ45is+ny/J5E4fEdOfMU44MDHYf0H6tlk3dQq9BraRxc1O lC/A== X-Gm-Message-State: AOJu0YxyC01lmdkwE5zLtdpTFtYs0xOCBkI0lQlGzWzhwdSpJEpQjytU lZXZ3xarxy/wWEui40ELZj8gVG74mCc5hzQneFG5yTrf8DY14JxJsOzqwxCNFA== X-Gm-Gg: ASbGncu18r5tRcopV1RBvptGHKL//Sisqx5FSocPkmz8AL3SVn2IH2gkUQyBMkOHBb4 1O8xHeZhl7c3etTuTGaofSUS26CZJxwZFcCzth40x9+bcRbz8OxPs4i3BbImQYJvBX1LAkyMNLa //nbBINLlX6aY2DKuG0r2qT1kBq/Oxxyzv8EvoF+c9nsZdqri/MvbE9gRCAbdRoTx17MTDgw2c/ jOvVLNV+sfETMzs8C8AGWfS7mXbOOaSW46nHdjKc7YYtDWvblqWAyPn1ci4aNUdHcxM/JY1DcPz gDGX8pRrgJVwWawbqb+9pH+FW0b6nyYRTDIlG0ZDtlH0IJ4xgrYoF8A2rJrIaSesWBLiYJ5Lg44 SjgVpXnH6X9vv X-Google-Smtp-Source: AGHT+IGW87zCbhK8sNtGoN1yTmhEHDYAY5QTVqvwrd+oBI238wTWLbMIAuX9C2L06xHpaZmv3X4UFQ== X-Received: by 2002:a05:6000:26c8:b0:3a4:eb92:b5eb with SMTP id ffacd0b85a97d-3a531cec2c6mr3794500f8f.50.1749243509266; Fri, 06 Jun 2025 13:58:29 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a53244f4e7sm2850859f8f.77.2025.06.06.13.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jun 2025 13:58:28 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 3/5] piglit: replace setting PIGLIT_BUILD_DIR with a correct reproducibility fix Date: Fri, 6 Jun 2025 22:58:07 +0200 Message-Id: <20250606205809.4071299-3-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250606205809.4071299-1-alex.kanavin@gmail.com> References: <20250606205809.4071299-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Jun 2025 20:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218183 From: Alexander Kanavin PIGLIT_BUILD_DIR was set to source tree location relative to B as a reproducibility workaround some years ago. Aafter some investigation I found where the actual issue is (addressed by the patch). Also, setting PIGLIT_BUILD_DIR relative to ${B} in a hardcoded way is problematic as S and B are not necessarily related that way (e.g. when sources are in UNPACKDIR or somewhere else entirely). Signed-off-by: Alexander Kanavin --- ...r.py-modify-_command-and-not-command.patch | 32 +++++++++++++++++++ meta/recipes-graphics/piglit/piglit_git.bb | 3 +- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch new file mode 100644 index 00000000000..f8600556e5d --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-no_error.py-modify-_command-and-not-command.patch @@ -0,0 +1,32 @@ +From 846efe923932d66810305b228fa09f83a172296d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 22 May 2025 17:34:15 +0200 +Subject: [PATCH] tests/no_error.py: modify _command and not command + +command getter function has hidden magic that prepends build paths; +this is an undesirable side effect here, as we only want to append a parameter +and not change anything else. + +In particular this avoids adding build paths to installed .xml.gz file, +ensuring reproducibility. Xml writer is already using _command for the +same reason. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/1016] +Signed-off-by: Alexander Kanavin +--- + tests/no_error.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/no_error.py b/tests/no_error.py +index 4ecaa9a01..c64eec0a1 100644 +--- a/tests/no_error.py ++++ b/tests/no_error.py +@@ -21,4 +21,4 @@ for name, test in itertools.chain(_profile1.test_list.items(), + _profile2.test_list.items()): + if isinstance(test, (PiglitGLTest, ShaderTest, MultiShaderTest)): + profile.test_list['{} khr_no_error'.format(name)] = test +- test.command += ['-khr_no_error'] ++ test._command += ['-khr_no_error'] +-- +2.39.5 + diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index e30efdf33bd..dc210ff56d8 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -12,6 +12,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0001-tests-Fix-narrowing-errors-seen-with-clang.patch \ file://0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch \ file://0001-tests-egl-spec-make-egl_ext_surface_compression-cond.patch \ + file://0001-tests-no_error.py-modify-_command-and-not-command.patch \ " UPSTREAM_CHECK_COMMITS = "1" @@ -48,8 +49,6 @@ PACKAGECONFIG[x11] = "-DPIGLIT_USE_X11=1 -DPIGLIT_BUILD_GL_TESTS=ON -DPIGLIT_BUI PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native vulkan-loader,glslang" PACKAGECONFIG[wayland] = "-DPIGLIT_USE_WAYLAND=1,-DPIGLIT_USE_WAYLAND=0,wayland-native wayland wayland-protocols" -export PIGLIT_BUILD_DIR = "../../../../git" - do_configure:prepend() { if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" = "no" ]; then sed -i -e "/^#.*include $/d" ${S}/src/piglit/glut_wrap.h From patchwork Fri Jun 6 20:58:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 64497 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 47267C677C4 for ; Fri, 6 Jun 2025 20:58:36 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.5506.1749243511805785406 for ; Fri, 06 Jun 2025 13:58:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KK9QWpjZ; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3a51d552de4so1423472f8f.0 for ; Fri, 06 Jun 2025 13:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749243510; x=1749848310; 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; bh=24KoRmr6j37rPZaMxaqnSd/338S1bGZaFmZ2mWjASH8=; b=KK9QWpjZTrtrPCWfiz7LX8enOB092GNUw9tXQg7p6uFwaWA+zDMzyn0/s5pPSq9aau 2poYS2l156jCWl4UZkTbAHERbSWfu8D62SNPkhcPR4pcM4qccWvY4c7Ml45cFdkIxx2T zEwKeKMbqngBwTyq/7x6RAsJxq2+mxcQMkXJxcRWbzexybYYkX/YHT0D2NmaAnXGL3Gw O35anXWaWOttfWkRWpCRsAkP068us6pArI1KWfB9ki8F7hWO4HNIKwsMC41cVFkVOD1q ga47/l4/YhKCNnsZ1hu7Lmc6LcBWHQCJ5+vkgv4KJO+4A3QBBJ9v9hKsUwUEETLlraO1 UsQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749243510; x=1749848310; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=24KoRmr6j37rPZaMxaqnSd/338S1bGZaFmZ2mWjASH8=; b=wLiSgIU/e5IfF1FjkTdkqVYDEFGW401KgIwnMgQvkY7s8W2H2t+VEf/LfNeTaLDE9p B7TL9OgHFG2kWvTAGHkKma9zQ+3yIX6bUJmNYSQ7Mk6jaz9mOlBEJtFILg9mu0GCmR78 ZBEHBUPtINdTe+YXwrxoKQnq04eQYwvVraWEfzkRxay1GncnXpQtCLaO4vKNHDHKs8aO KAJNtw9QffzNRS0N8AGoP3NucSNe1ciOwjANvz9wk192I5ydhMI2lvkPECmfLQcxjfo5 i7JXT77CvGuFvlxfAktG1Ss16WDQWeh+ZIudPibsJ2Zdz43y8p6/lfa3eV/eTPqMu124 KgmA== X-Gm-Message-State: AOJu0YzS18zcseUq3Js6UF6nntsTTTpcXl193/6LNI1PEpyj/IK7vo3s fxfPBqWYGMTSt1ZvmXTC/zHYC/YdhOvPwCCGdbV9QV7VDsTEjHpVdkZVA0Dhow== X-Gm-Gg: ASbGncsa8n/rYMVlmUXLGkSJZ6Jojm1XjvzIT5q0RDMh1C2SF0vtCluAghWJMvChEWE BmNn6ZhqM1jRSBXfduacdldcyAzUCyuEytTDbdEA/IsP6F3VlxosGifiPmII/7f9fMZfDGnIikK xiqHilG5ML3Am4tXLd3NfbieXQtQC7Z80wCSGNEGxtchI8J9nk4F22oSSkuQdYY1pNmLoeD3+0D fXDfih9iCGYI5/B3y0nlFz906VaCpejF254fvxHseuwjBvT1+ywy/0azEF3z9PMSAEmA2ldGVf5 pVuurhfj9n0LAzw/QpT10wpjaHmnaO6Qnz2ebIiNR1F3ogApOjtaBtLbaz8TtLdxtXj1FmEycnw TKz5+KT7IJWubJMXXO09yyek= X-Google-Smtp-Source: AGHT+IG21ua4ZSG73krRUk3s3bEe/CQtmXUVvvpojTeaedbcU7/+WH5P1ux3EtadS2s5Chnl2cNYdA== X-Received: by 2002:a05:6000:144b:b0:3a4:e6b4:9c4b with SMTP id ffacd0b85a97d-3a5317849cbmr4448064f8f.1.1749243509924; Fri, 06 Jun 2025 13:58:29 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a53244f4e7sm2850859f8f.77.2025.06.06.13.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jun 2025 13:58:29 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 4/5] strace: better sed expression for ptest Makefile Date: Fri, 6 Jun 2025 22:58:08 +0200 Message-Id: <20250606205809.4071299-4-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250606205809.4071299-1-alex.kanavin@gmail.com> References: <20250606205809.4071299-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Jun 2025 20:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218184 From: Alexander Kanavin The previous one wasn't particularly readable, and assumed a particular relationship between S and B. The new one also works when S is in UNPACKDIR, or anywhere else. Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/strace/strace_6.15.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/strace/strace_6.15.bb b/meta/recipes-devtools/strace/strace_6.15.bb index d8ac2a53d09..2093c92eb31 100644 --- a/meta/recipes-devtools/strace/strace_6.15.bb +++ b/meta/recipes-devtools/strace/strace_6.15.bb @@ -45,7 +45,7 @@ do_install_ptest() { mkdir -p ${D}${PTEST_PATH}/src install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/ - sed -e '/^src/s/strace.*[0-9]/ptest/' \ + sed -e 's/^srcdir = .*/srcdir = ..\/..\/ptest\/tests/' \ -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } From patchwork Fri Jun 6 20:58:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 64496 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 26B15C61CE8 for ; Fri, 6 Jun 2025 20:58:36 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.5463.1749243513018054745 for ; Fri, 06 Jun 2025 13:58:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lcEn/kxz; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-441ab63a415so25482225e9.3 for ; Fri, 06 Jun 2025 13:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749243511; x=1749848311; 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; bh=UGUtRVgK01lWp+cK69bvyOfQLszffiiiYwEGnPFfTe8=; b=lcEn/kxzkKqCudCQwH/jN1uh7Z3ljvKYKCb7Q4qCIKgwUn7XWWJ31BLykSvXfBBSG1 1EZP2o+m7BgYrJUyEl293jlDgHzNoIfOupmYoBv4RblWVJK1Eg9MdBjPOTRTz3rSPyry JVn3coF3CucTSizusVnRwZJE8LtwkffxMzqSjhFEwKkT9EX64TWvivT+BtfP7EF6EApA XexscVuTv0JeXI4Yde9ZRD8lsEqJKVXo2I3tVD0ZPRZlo2vWI71A5zkeFaqyugypFufq 7Aa9WJTFGYqu1KOMzOEA5uh21goLI+O0RETicQMebMUd4tX1HUBKWIZgppTKvejcEsWF puCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749243511; x=1749848311; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UGUtRVgK01lWp+cK69bvyOfQLszffiiiYwEGnPFfTe8=; b=D/e8+4pIeogvzlKLSgn1lKhXHV1q2YNqq9oIkR5mHB2GGXcO8XmaEt1SiZv39o4y97 WX06f0tYSyW1Z0v6oqTNMcNt2Bqx7ghzuiYqKGaycrK5ZCdFNODFeldgk0U7s+UDZva8 K2rfJstDgscpNzLAvnb7P6uDmfnMYOo3/h8l//BKxeowvoy0g9hryLm9YBvCWI9WNnfH KXgW0I+sr9ozLZBhEqQEF4oRgS8EuGP8Z8ab9tguIinDSPu/YkDOvPEEFdmNcen+jHkN YwzG2iRVt5kB1H5PxYe34tWULQt7uBCD+b4dJGJgUJICveJz3Jy1PsbOU7j5/mJGzLf/ Kdng== X-Gm-Message-State: AOJu0Yz3YQZyzmg3O9/fcfrxGkOwRtEHGGKBh5yK+VI7iOEsmmOV4Jwn oB5RIFYXKblL/a5+nV0OFc43kUTk0CZb1r/Z4ZFINgz3P/4oOyXzfS3inMJjIA== X-Gm-Gg: ASbGncumi/mcU0nl8jwR5XBJeBPHx99JN51XiKsVSHSW7uI9oT0RADuOLVDAEGe/iCX fRRAJEEcmTELWR+6hQbv7GvPfxLpUBimR3xlXpxneBsOkEeo4GDWkvzIabJ4IxWtlknOJI60wbl SWsOfTQ5KdZ/V3KGBDDsSaO+A7ZafMSlwx7DDI8pQFXyo8+C9DbLtwo/c+GpvZ8iWGzerw6voPV RU8kOdZX1kI1XMVCiri3PwF614LUUj1OlCljhpJsXEBrrE89kdeqyjPLHA246UmA2WwqtXgmgLG WkK75r9nsyRSR7LiXSvUPVX/rA6AlL6BN9Y8ThjcuCWF8/+r8HX+/grjqRXTEMMtD3xaF9+WcEX +gNhXQGfGOEYL0DBr/kKHx6Y= X-Google-Smtp-Source: AGHT+IEhB2l2+ZCC1+igVuNNHlw26bxvJ/iLBHFo/26E/4Bh0qBEIcKC500VHDgxUfnFvel0SCVOVg== X-Received: by 2002:a05:600c:8b02:b0:43d:745a:5a50 with SMTP id 5b1f17b1804b1-452013b08a9mr46748075e9.19.1749243511277; Fri, 06 Jun 2025 13:58:31 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (drugstore.linutronix.de. [80.153.143.164]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a53244f4e7sm2850859f8f.77.2025.06.06.13.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jun 2025 13:58:30 -0700 (PDT) From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 5/5] m4: simplify path substitutions in ptest Date: Fri, 6 Jun 2025 22:58:09 +0200 Message-Id: <20250606205809.4071299-5-alex.kanavin@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250606205809.4071299-1-alex.kanavin@gmail.com> References: <20250606205809.4071299-1-alex.kanavin@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Jun 2025 20:58:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218185 From: Alexander Kanavin There's no need to setup a fake 'source directory' and redirect the tests to it; rather it's possible to point them directly to ptest directory (this needs to be done twice, in Makefile substitutions, and as a C define during ptest compilation). This also eliminates the assumption that S and B are in the same directory (no longer true when S is in UNPACKDIR). Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/m4/m4-1.4.20.inc | 5 +---- meta/recipes-devtools/m4/m4/run-ptest | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/m4/m4-1.4.20.inc b/meta/recipes-devtools/m4/m4-1.4.20.inc index a31335f173e..aad57b8b649 100644 --- a/meta/recipes-devtools/m4/m4-1.4.20.inc +++ b/meta/recipes-devtools/m4/m4-1.4.20.inc @@ -27,7 +27,7 @@ EXTRA_OEMAKE += "'infodir=${infodir}'" do_compile_ptest() { cd ${B}/tests sed -i '/^buildtest-TESTS: /c buildtest-TESTS: $(TESTS) $(check_LIBRARIES) $(check_PROGRAMS)' Makefile - oe_runmake buildtest-TESTS + oe_runmake CPPFLAGS="-DSRCDIR=\\\"${PTEST_PATH}/tests/\\\"" buildtest-TESTS } do_install_ptest() { @@ -39,9 +39,6 @@ do_install_ptest() { chmod 0755 ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \ ${D}${PTEST_PATH}/tests/test-spawn-pipe-child ${D}${PTEST_PATH}/tests/test-version-etc \ ${D}${PTEST_PATH}/tests/test-xalloc-die - - ln -sf ptest ${D}${libdir}/${BPN}/${BP} - sed -i -e 's/@BP@/${BP}/g' ${D}${PTEST_PATH}/run-ptest } do_install_ptest:append:libc-glibc() { diff --git a/meta/recipes-devtools/m4/m4/run-ptest b/meta/recipes-devtools/m4/m4/run-ptest index a91c372e541..da786e26f43 100644 --- a/meta/recipes-devtools/m4/m4/run-ptest +++ b/meta/recipes-devtools/m4/m4/run-ptest @@ -2,4 +2,4 @@ # #This script is used to run m4 test suites cd tests -make -k runtest-TESTS abs_aux_dir=../../@BP@/tests/build-aux abs_top_srcdir=../../@BP@/tests abs_srcdir=../../@BP@/tests top_srcdir=.. srcdir=. +make -k runtest-TESTS abs_aux_dir=./build-aux abs_top_srcdir=. abs_srcdir=. top_srcdir=.. srcdir=.