From aa88276c26b465039b45281b8c206dd5d7baa58e Mon Sep 17 00:00:00 2001 From: Yoann Congal Date: Fri, 13 Sep 2024 00:42:51 +0200 Subject: grilo: fix buildpaths QA error 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 Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'meta-gnome') 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 } -- cgit v1.2.3-54-g00ecf