From patchwork Thu Sep 12 22:42:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoann Congal X-Patchwork-Id: 49032 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 0CE08EEE270 for ; Thu, 12 Sep 2024 22:43:26 +0000 (UTC) Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by mx.groups.io with SMTP id smtpd.web11.61014.1726181000047829006 for ; Thu, 12 Sep 2024 15:43:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@smile.fr header.s=google header.b=KeTBPYuy; spf=pass (domain: smile.fr, ip: 209.85.167.65, mailfrom: yoann.congal@smile.fr) Received: by mail-lf1-f65.google.com with SMTP id 2adb3069b0e04-5356bb5522bso416162e87.1 for ; Thu, 12 Sep 2024 15:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1726180997; x=1726785797; 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=aqudEb4iuALcAfFzdqD+jJTf+dPzqZ9m1oOKyMj3c1M=; b=KeTBPYuya8RNK14YSqI0o8qg3XFprIwnCBA5TUwKP2mO8ybQPVb1hzdPWtF5qvy+/f 8CGu2n8RRKFhSg7JazaxKR6eayfFiEvcK0qUraCJgfbF65nJ6M6LQNIQ+Aa9qfYDP0Xj l183dgMQ25PUhY18mEQMOE2mxh4+CgJJR9QPs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726180997; x=1726785797; 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=aqudEb4iuALcAfFzdqD+jJTf+dPzqZ9m1oOKyMj3c1M=; b=u2HycRPKRS7nmZ3GNpRkJCPkWiYQbR0c0a/ThNBybLeHTH6vy7O6ajFahvb8GcQWhp 7c7A92oa7lJhPc1cc0YnMB0PDAu9P6mNIkDmonZMBCPtKe5i85rhF5nq3TR5AuwTD83H oXFdKTzXXwRGZ69B9Kr7ZgUd3DkCIOoNQ1FPT74KvLHjaOrWkeSH/agildBfwRUx5t1J Qbp98aoTNAHhNsX5m1gSbVywYnesPTGPCZaC+a4SFp5CldsdSMoNF1f644Sc6/o7SQqP DYvwS/86gHdreC28iaqmJv7bTbKGyJ7f+g3sWT0Oh9eavKKbzsnLT+BrSBEOavpSY9lG rFEQ== X-Gm-Message-State: AOJu0YzrlJwBhR2ywJZNy5FUTmL2ZOfByxuhbjg5c2cnoRP0FO6e+MC8 XN6NyINaTxRQLjEugHAfKJ7KtkB1O+MDnMh21rykX+VCjZ5XDsFtoS/JmJ0X+ATxArlhWY0yty3 lz3zBPQ== X-Google-Smtp-Source: AGHT+IFFZVZM0JYgPPmpKj9PLNpdg5mhpAAbMzSs8/60e3jIodLRzg0iGB7xw36U0s2MCscb+EEHuQ== X-Received: by 2002:a05:6512:12d1:b0:530:e228:779c with SMTP id 2adb3069b0e04-5367fed849fmr427476e87.19.1726180996730; Thu, 12 Sep 2024 15:43:16 -0700 (PDT) Received: from P-ASN-ECS-830T8C3.local (53.1.159.89.rev.sfr.net. [89.159.1.53]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5365f868d64sm2017607e87.55.2024.09.12.15.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 15:43:16 -0700 (PDT) From: Yoann Congal To: openembedded-devel@lists.openembedded.org Cc: Yoann Congal Subject: [meta-gnome][PATCH] grilo: fix buildpaths QA error Date: Fri, 13 Sep 2024 00:42:51 +0200 Message-Id: <20240912224250.2145628-1-yoann.congal@smile.fr> X-Mailer: git-send-email 2.39.2 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 ; Thu, 12 Sep 2024 22:43:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112257 From: Yoann Congal grl-type-builtins.* are generated by glib-mkenums which leave full paths in comment and #include directives. Rewrite those before *-src packaging. Previous fix did not correct the .c file and did not work in the "devtool modify" case. Fix these errors: ERROR: grilo-0.3.16-r0 do_package_qa: QA Issue: File /usr/src/debug/grilo/0.3.16/src/grl-type-builtins.c in package grilo-src contains reference to TMPDIR [buildpaths] ERROR: grilo-0.3.16-r0 do_package_qa: QA Issue: File /usr/src/debug/grilo/0.3.16/src/grl-type-builtins.h in package grilo-src contains reference to TMPDIR [buildpaths] ERROR: grilo-0.3.16-r0 do_package_qa: Fatal QA errors were found, failing task. Signed-off-by: Yoann Congal --- meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb index 14e1ca9fe1..b6ac75dd8a 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb +++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb @@ -26,5 +26,14 @@ PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 l EXTRA_OEMESON = "-Denable-grl-pls=false" do_compile:append() { - sed -i -e 's,${B}/../,,' ${B}/src/grl-type-builtins.h + # grl-type-builtins.* are generated by glib-mkenums which leave full paths + # in comment and #include directives. Rewrite those before *-src packaging. + + # Path can be relative to B or WORKDIR in devtool modify + for base in ${B} ${WORKDIR} ; do + relpath="$(realpath --relative-to="$base" "${S}")" + sed -i -e "s,$base/$relpath/src/,," \ + ${B}/src/grl-type-builtins.h \ + ${B}/src/grl-type-builtins.c + done }