From patchwork Sun May 28 00:43:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24622 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 17ACAC77B7E for ; Sun, 28 May 2023 00:44:04 +0000 (UTC) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.web11.21358.1685234637870754211 for ; Sat, 27 May 2023 17:43:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=RIdD6XYS; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1b01d7b3ee8so10274165ad.0 for ; Sat, 27 May 2023 17:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685234637; x=1687826637; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=b5X3t5eMbbbT72cBeCxK3nFGzfSwjCZzzhcfbrixGqI=; b=RIdD6XYS5oH7FQYO5M+pd1AhAvSmRrnX/2bYvn/HcWSR4KrZEBWVTpnqYn0ao457lw H3IH4A04EYZf0cJXcA0IuLYDK9/KR5flfRuna/BdJJr8wZSuZnKUqe5kn0rNGxMPTDHB F17Umpav2655oT0KVZB6drLOVfuQtrE9JP39iVYqXan0iWvNk1rM2w2zzdAufjDUUznS UohvtQm7WT/JEU+MX9ol/AWZ5EaKnfUlY9xduGLXmtEdwy1YuvwSUdmHRjTTuDw2eskB 885dY4mb1M1NQ/lKfKa7xxUwdoN2fmWfhQ6pRE2vBg5tCdM9R7EwpSLcmNjBKeo+10N8 R4Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685234637; x=1687826637; 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=b5X3t5eMbbbT72cBeCxK3nFGzfSwjCZzzhcfbrixGqI=; b=WzaX5ltuGGD77NGiQ2YYcJkLxLSuqL1G/QO1txUrHaIJzuRs7ZLBMbVDAkUHh8manC NuUq6HhJK3gOT8KxB0G/jsow09E1esQJU0UF2VlIDIw3fbp/WPvv3a+6TjV6xXrDLi1R vpUvZYqNB+ZhYuae62xbaXOfHefsg7psfHISPK1JMZZ5T/Ey75+c4a6KlILyF9hcizyT BhA+Eu1IAGMvERrtMrYJdHSEdAV1HI1sbYAKSWhUqmrWE+SvrlwIELdkabFkB0J7oaGz +Pmy7/hYoLTGFKsJQ6TaCpa+H2uaouP2tNFWkEVbHwAjIN4/r09vpamn2sCw2JD0PnsV VhGQ== X-Gm-Message-State: AC+VfDzANybqZ7mXQMu/ck5XC+rb97PsRwT8mo34LMHDPHwZgzIzP8aK PgphPw6yOxrXgyo/66+RlmbPgvmqyzs= X-Google-Smtp-Source: ACHHUZ6mmgUfCCinLH7oXr7AzEvdne8WrFimn3+MYu6bZySrwH8HqM6ugSM6PEjhlVduUgCOYYogjw== X-Received: by 2002:a17:902:d2d0:b0:1af:b678:5168 with SMTP id n16-20020a170902d2d000b001afb6785168mr9467437plc.67.1685234636838; Sat, 27 May 2023 17:43:56 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::89af]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001ac7c6fd12asm5415735plm.104.2023.05.27.17.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 May 2023 17:43:56 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-gnome][PATCH 1/3] gnome-online-accounts: Replace filename with basename Date: Sat, 27 May 2023 17:43:52 -0700 Message-Id: <20230528004354.1655629-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 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 ; Sun, 28 May 2023 00:44:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102884 Fixes WARNING: gnome-online-accounts-3.48.0-r0 do_package_qa: QA Issue: File /usr/src/debug/gnome-online-accounts/3.48.0-r0/src/goaidentity/goaidentityenumtypes.h in package gnome-online-accounts-src contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- .../0001-Replace-filename-with-basename.patch | 104 ++++++++++++++++++ .../gnome-online-accounts_3.48.0.bb | 1 + 2 files changed, 105 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch new file mode 100644 index 0000000000..9bb1d6bb59 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts/0001-Replace-filename-with-basename.patch @@ -0,0 +1,104 @@ +From c4a2951f8a75c4151f009e42b26639e4f456d5a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 May 2023 14:41:28 -0700 +Subject: [PATCH] Replace filename with basename + +This avoids emitting absolute paths into generated sourcecode, it +improves reproducibility. See [1] + +[1] https://developer-old.gnome.org/gobject/stable/glib-mkenums.html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/125] +Signed-off-by: Khem Raj +--- + src/goa/goaenumtypes.c.template | 2 +- + src/goa/goaenumtypes.h.template | 2 +- + src/goabackend/goabackendenumtypes.c.template | 2 +- + src/goabackend/goabackendenumtypes.h.template | 2 +- + src/goaidentity/goaidentityenumtypes.c.in | 4 ++-- + src/goaidentity/goaidentityenumtypes.h.in | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/goa/goaenumtypes.c.template b/src/goa/goaenumtypes.c.template +index 3150fa71..c2bc4b0a 100644 +--- a/src/goa/goaenumtypes.c.template ++++ b/src/goa/goaenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goa/goaenumtypes.h.template b/src/goa/goaenumtypes.h.template +index 040428c3..14548cb4 100644 +--- a/src/goa/goaenumtypes.h.template ++++ b/src/goa/goaenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goabackend/goabackendenumtypes.c.template b/src/goabackend/goabackendenumtypes.c.template +index 6d2651da..05156bdd 100644 +--- a/src/goabackend/goabackendenumtypes.c.template ++++ b/src/goabackend/goabackendenumtypes.c.template +@@ -5,7 +5,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goabackend/goabackendenumtypes.h.template b/src/goabackend/goabackendenumtypes.h.template +index 7321076e..51ce84bd 100644 +--- a/src/goabackend/goabackendenumtypes.h.template ++++ b/src/goabackend/goabackendenumtypes.h.template +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goaidentity/goaidentityenumtypes.c.in b/src/goaidentity/goaidentityenumtypes.c.in +index c0286907..8aad7ae4 100644 +--- a/src/goaidentity/goaidentityenumtypes.c.in ++++ b/src/goaidentity/goaidentityenumtypes.c.in +@@ -5,8 +5,8 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" +-/* enumerations from "@filename@" */ ++#include "@basename@" ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +diff --git a/src/goaidentity/goaidentityenumtypes.h.in b/src/goaidentity/goaidentityenumtypes.h.in +index 35d4d5c5..8719282a 100644 +--- a/src/goaidentity/goaidentityenumtypes.h.in ++++ b/src/goaidentity/goaidentityenumtypes.h.in +@@ -9,7 +9,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.40.1 + diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb index 948a738881..ca78fa0119 100644 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb @@ -8,6 +8,7 @@ inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_c DEPENDS = "gdk-pixbuf dbus glib-2.0" +SRC_URI += "file://0001-Replace-filename-with-basename.patch" SRC_URI[archive.sha256sum] = "418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf" PACKAGECONFIG ?= "goabackend kerberos owncloud lastfm google windows_live" From patchwork Sun May 28 00:43:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24621 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 14AB5C77B7C for ; Sun, 28 May 2023 00:44:04 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.21145.1685234639057724283 for ; Sat, 27 May 2023 17:43:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=NKnViBAc; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-53033a0b473so1310877a12.0 for ; Sat, 27 May 2023 17:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685234638; x=1687826638; 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=In+BlBgKgpGCyD3qk9A/kVloS3ilUrzn+1S53wxjfoQ=; b=NKnViBAcYIF6/9l+9SrbiNkafpvKDGPuVNfI9ErpVwe8/fGF9m3mZ6W24VdgnpW8D8 Pj3tPyqUY/epYffRSKpSvPj0UCvAC3xrgjSd117m6YKBC6EJWJR6cT3D2B/LM5ThXr5r xYlKvqOIP/wYfZDJ3np3qmvmXMsZ9k08VExVHjO0IQpGLDI1IWF6xrS5EgC/LRpx8tOK 8UfiMeuSe6jzFdrjLg593XP3YmUm+IgBdB0EYrteyKm/x+pQUEA/7Yq/6k2I/HFbuqoV /XUoXF3F2zH5uDQl07QPbCNWIZj3R607NU5mDBcxmzq4HPFksKxG+OUP0yYgAGnqwvOx zoWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685234638; x=1687826638; 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=In+BlBgKgpGCyD3qk9A/kVloS3ilUrzn+1S53wxjfoQ=; b=WzdihQVPArcSJptv86IRcTnAkGWo9CeUAumFyArERIoc9lowEzKrKx1MvDkyHSOdIV AmeAwcMM3ft6dUCJiRlI7tS9tJ0yyI6dYXb7Rf9cHmpiKmkWlRJnG6CGuKuAZ3cWy6p5 CfDvAoZi96uBObJmeHjMsBxEZKq+0Hpm2mg5zZOGATjiX5X1KcGUJIDYC/uDfvQkwt3w Kv5LV7L4l4kQIZN2hHEX64TGQLbEj9fBZFarF5kYrA2wxmjSB60OfU/r4sVMA8k5VXQ0 LwfpRLr7bHsxrAk2V+JQYLy/V6Fb2YXNJFDkUXwR/xXENtSuTpYK9KwacicRyzufh2HB VnoQ== X-Gm-Message-State: AC+VfDylSoarsuVQ0S7uadp3hGhhMdbthc0ND1002QKglZb8RqODoKfZ 2Wu0v1zFjkq+8kjts/9HfsqCcLrHoaM= X-Google-Smtp-Source: ACHHUZ4189p97e95TgUTBTOIIfuq1a5iRLXRxkrj12iApoYVN8/YqpuEDZeezAHXp7d5LEzBHJ6yNw== X-Received: by 2002:a17:903:1251:b0:1ab:29bc:bd87 with SMTP id u17-20020a170903125100b001ab29bcbd87mr7331967plh.35.1685234638064; Sat, 27 May 2023 17:43:58 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::89af]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001ac7c6fd12asm5415735plm.104.2023.05.27.17.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 May 2023 17:43:57 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-networking][PATCH 2/3] rdma-core: Use target path for systemctl Date: Sat, 27 May 2023 17:43:53 -0700 Message-Id: <20230528004354.1655629-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230528004354.1655629-1-raj.khem@gmail.com> References: <20230528004354.1655629-1-raj.khem@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 ; Sun, 28 May 2023 00:44:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102885 Fixes WARNING: rdma-core-46.0-r0 do_package_qa: QA Issue: File /usr/lib/udev/rules.d/60-srp_daemon.rules in package rdma-core contains reference to TMPDIR Signed-off-by: Khem Raj --- ...EMCTL_BIN-to-be-overridden-from-envi.patch | 33 +++++++++++++++++++ .../rdma-core/rdma-core_46.0.bb | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch new file mode 100644 index 0000000000..03ba872616 --- /dev/null +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -0,0 +1,33 @@ +From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 May 2023 17:22:10 -0700 +Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment + +This allows to encode correct paths which are inside the target rootfs +for systemctl + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b7462861..c4d82fb49 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,7 +226,10 @@ else() + set(CYTHON_EXECUTABLE "") + endif() + +-find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++if (NOT SYSTEMCTL_BIN) ++ find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") ++endif() ++ + if (NOT SYSTEMCTL_BIN) + set (SYSTEMCTL_BIN "/bin/systemctl") + endif() +-- +2.40.1 + diff --git a/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb b/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb index c4c4387988..a6927f566d 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb +++ b/meta-networking/recipes-support/rdma-core/rdma-core_46.0.bb @@ -5,7 +5,8 @@ SECTION = "libs" DEPENDS = "libnl" RDEPENDS:${PN} = "bash perl" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ + file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" SRCREV = "f2789cbd394c5839e8942d585a494ab72fd97e39" S = "${WORKDIR}/git" @@ -16,6 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ EXTRA_OECMAKE = " \ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DSYSTEMCTL_BIN=${base_bindir}/systemctl \ -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ -DNO_MAN_PAGES=1 \ " From patchwork Sun May 28 00:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 24620 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 16CE0C7EE23 for ; Sun, 28 May 2023 00:44:04 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.21360.1685234639956502831 for ; Sat, 27 May 2023 17:44:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=bqTyNfN1; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1b01d912a76so10051325ad.2 for ; Sat, 27 May 2023 17:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685234639; x=1687826639; 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=89DJsMo3i/DXnh/op3B6Dy7GZV3wmY5nCPG4LGoyKdI=; b=bqTyNfN1mn5XHafQp+TGiTz9FSNYb79zE1/zPdr707paZ+sJBtyU+MXfLgdLpLsmnp C1YXLrdec4yWzCw9mNjbtOtj/GE3Si80z3GcVI4vjJ/cqs39f80QKGEmh+goPYi0BUW8 RaSaME042alQRM67tAK9S0nfkBwUG4h/xVfbkTSn32Aij1MKIqbESZIeMGez+g7hnWGi sjelNmhvLBaQiReMxhRV1wqplz1tmj8Sxwg77hNSHWWKR8bRmVeElQA2eZOhjDnCi7qN 65JeGkmDP22tJcfch6s2hUArwf2qVns6gthth9hk8lKjWS+pKhozPE9Av9c8YqZ3u3Uh yTaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685234639; x=1687826639; 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=89DJsMo3i/DXnh/op3B6Dy7GZV3wmY5nCPG4LGoyKdI=; b=UWLTXma/DDxLDTTJ2Btq2981bsLZPUuRMkdSvzRjHVV4myqQhZgppDg+7O1m0o+dKO oDtTMrQnCkQqSFqETqF4JXnjo9cI0fOyDnxBaR192md1j91eU6cVHyVfdZiXRAYNlAB0 a/kDhQBPYeiDkK2yxATkEgGYGdUjcMKqdt216n+3sahtF3qGzofFcuiV0QWeY3EKsJKv nw7CTnvwaljIADnTkpfvaUTJYllUFio7yHEA0ennQfASRjbQUSJGRjnbyxd4m8s4E4T3 mmgcBPA57wMF4KeGLlOM+ohnx3m1aZtuAOTFknrsA0syj1XfCz2PvRdR5a0NosGbKnIh z6xg== X-Gm-Message-State: AC+VfDz3B8oxu6+xOw917eOMM6zWg3BqSdpFYTNoqpwHnx6irLa/KA0V TvwJWlrSL9mRzzHj+r6/sHszGEbyCII= X-Google-Smtp-Source: ACHHUZ6RelIXWsySL+i5SmRyfXdNa3VCZxIFmYE6t17fZYsPEefr2Ema9/KYXBVNifZkX78h1xFM5w== X-Received: by 2002:a17:902:cf02:b0:1af:cd00:d4e4 with SMTP id i2-20020a170902cf0200b001afcd00d4e4mr7731360plg.47.1685234638986; Sat, 27 May 2023 17:43:58 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9181:d380::89af]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001ac7c6fd12asm5415735plm.104.2023.05.27.17.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 May 2023 17:43:58 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 3/3] monkey: Remove buildpaths from generated mk_env.h Date: Sat, 27 May 2023 17:43:54 -0700 Message-Id: <20230528004354.1655629-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230528004354.1655629-1-raj.khem@gmail.com> References: <20230528004354.1655629-1-raj.khem@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 ; Sun, 28 May 2023 00:44:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/102886 It has paths to compiler and assembler which are technically cross compilers in OE. We do have these names symlinked on target too but paths needs to be removed. Fixes WARNING: monkey-1.6.9-r0 do_package_qa: QA Issue: File /usr/include/monkey/mk_env.h in package monkey-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index d3e22757c4..ee5dc16198 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -39,6 +39,10 @@ inherit cmake pkgconfig update-rc.d systemd OECMAKE_GENERATOR = "Unix Makefiles" +do_configure:append() { + sed -i -e 's|${STAGING_BINDIR_TOOLCHAIN}/||g' ${S}/include/monkey/mk_env.h +} + do_install:append() { rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log rmdir --ignore-fail-on-non-empty ${D}${localstatedir}