From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f41.google.com (mail-ua1-f41.google.com [209.85.222.41]) by mx.groups.io with SMTP id smtpd.web11.2810.1627983309189731703 for ; Tue, 03 Aug 2021 02:35:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=UfX9W81X; spf=pass (domain: gmail.com, ip: 209.85.222.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ua1-f41.google.com with SMTP id t26so7974941uao.12 for ; Tue, 03 Aug 2021 02:35:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+jcRI65UYUGB6VuECIbCoXzypyOS/Im214xpx9yeB6o=; b=UfX9W81XU9hHVwADCPj5G6r5qjA3yDUvmPU44N5HNjM5aNGHSubdYEQlDbvuFj1GFh xTDBhfF49SYyKZnxtsuz8pOobzs6coqcxBAon53jAfvuOGDewp1mbJ4YJzE56rgwW5wm hV7R/8o0KJIY8snaiqp6KBismQYYCS6W/JeWuS4O5OL/T7rA/KfW0ycPy9eE0O0Iv02u Jv8wvGO/uvAoBiPqcYpf/PWKAXKR99EZeAMRODJgS2+NSmkw87Ut5Bijk/VteiXoel31 IRBNpbRZoGx84P3PZxaOzU7m8st71m/BRfRGfFvjzzphDwzbw6k76QhOujnage6aI5Vl UIqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+jcRI65UYUGB6VuECIbCoXzypyOS/Im214xpx9yeB6o=; b=aDLP4qunVv5+1Q0wni07/uKaiEqVHp6jibVkLvsxI9Tz2LIyAfi8NaAIE3na3dfwfB iI7Dd5K1YGS9DP3YU92CwXf89GFI+L3l/p4C7RZhwW7t4U7tryFSKleG4LwRTq42x68i kzEzsueqJfqy/j2mqJ2sXd5LWuHZZDHZOybFAPCBaYSCS7BEGiPDlcCTJVHHNmmJ9N6g 0q3Uh2aZIYbm+0cvw5K6vqjPlkH849I05heada2jCs9i1XdAJoM4u7K3LKHeAytMxURE YKyFBuu/OHAY6VlRMR0ljbaNxJC37lFO1L72DyMMUmk1iSm8onLVcZYtOuSV8IC+tAlo Mq6g== X-Gm-Message-State: AOAM531dM5HLTZzR+ADe6LGHtQa7Epvd3MBH+eB98m437kl/uPBBRNDt SrBgOA++EAn2l/AnShwe79OMrl6/uG8+L0HoJjA= X-Google-Smtp-Source: ABdhPJzYnXq6ft7rZkF8mKzWdMtonjFC7+kAhGUJaofpMqDnpU5X29eCX5QyByJoMQhRYz+bFXcDtRYW1c5Sng+qokk= X-Received: by 2002:ab0:3314:: with SMTP id r20mr1792942uao.89.1627983308103; Tue, 03 Aug 2021 02:35:08 -0700 (PDT) MIME-Version: 1.0 References: <20210802062543.101415-1-Qi.Chen@windriver.com> In-Reply-To: From: "Alexander Kanavin" Date: Tue, 3 Aug 2021 11:34:56 +0200 Message-ID: Subject: Re: [OE-core][PATCH] gobject-introspection: fix default search path for girdir To: "Chen, Qi" Cc: OE-core Content-Type: multipart/alternative; boundary="000000000000c7a4b005c8a46673" --000000000000c7a4b005c8a46673 Content-Type: text/plain; charset="UTF-8" Can you please provide the steps needed to reproduce the error? Can they be automated and added to the AB? Otherwise, I cannot meaningfully review the patch. Also, the second concern is still not addressed: please submit upstream first, and include the link to the oe-core submission. It's only a merge request on gnome gitlab. Alex On Tue, 3 Aug 2021 at 06:51, Chen, Qi wrote: > I didn't notice the previous email. > The reason that it's not seen on autobuilder is that it's runtime error. > At build time, it uses a wrapper which adds extra parameters including the > correct path. That's why we didn't see any error at build time. > > Regards, > Qi > ------------------------------ > *From:* Alexander Kanavin > *Sent:* Monday, August 2, 2021 20:57 > *To:* Chen, Qi > *Cc:* OE-core > *Subject:* Re: [OE-core][PATCH] gobject-introspection: fix default search > path for girdir > > The concerns are the same as the previous time this patch was submitted: > > This is not seen in the autobuilder, how can it be reproduced? > > Also, please submit upstream first. > > > Alex > > On Mon, 2 Aug 2021 at 08:25, Chen Qi wrote: > > When running g-ir-scanner, we get the following error: > > Couldn't find include 'GObject-2.0.gir' (search path: > '['/usr/lib64', 'gir-1.0', '/usr/local/share/gir-1.0', > '/usr/share/gir-1.0', > '/usr/share/gir-1.0', '/usr/share/gir-1.0']') > > This is because g-ir-tool-template.in > > is not setting girdir correctly. > It's using the prefix instead of the actual girdir. > > Signed-off-by: Chen Qi > --- > ...-ir-tool-template.in-fix-girdir-path.patch | 33 +++++++++++++++++++ > .../gobject-introspection_1.68.0.bb > > | 1 + > 2 files changed, 34 insertions(+) > create mode 100644 > meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch > > diff --git > a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch > b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch > new file mode 100644 > index 0000000000..c0d263946b > --- /dev/null > +++ > b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch > @@ -0,0 +1,33 @@ > +From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001 > +From: Chen Qi > +Date: Tue, 13 Jul 2021 02:05:11 -0700 > +Subject: [PATCH] g-ir-tool-template.in > : > fix girdir path > + > +In case gir_dir_prefix is set, it's possible that g-ir-scanner > +cannot find the .gir files. This is because that the girdir > +is set to gir_dir_prefix, which is wrong. It's not a prefix, > +it the actual gir dir. > + > +Upstream-Status: Pending > + > +Signed-off-by: Chen Qi > +--- > + tools/g-ir-tool-template.in > > | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/tools/g-ir-tool-template.in > > b/tools/g-ir-tool-template.in > > +index 6e98f52e..62c07c31 100755 > +--- a/tools/g-ir-tool-template.in > > ++++ b/tools/g-ir-tool-template.in > > +@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir > + > + # Respect gir_dir_prefix > + girdir = '' > +-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@ > ')) > ++girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', > 'gir-1.0')) > + builtins.__dict__['GIRDIR'] = [girdir] > + > + # Again, relative paths first so that the installation prefix is > relocatable > +-- > +2.30.2 > + > diff --git a/meta/recipes-gnome/gobject-introspection/ > gobject-introspection_1.68.0.bb > > b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb > > index 048deabe64..647511f7ad 100644 > --- a/meta/recipes-gnome/gobject-introspection/ > gobject-introspection_1.68.0.bb > > +++ b/meta/recipes-gnome/gobject-introspection/ > gobject-introspection_1.68.0.bb > > @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ > > SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", > 2)}/${BPN}-${PV}.tar.xz \ > > file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ > + file://0001-g-ir-tool-template.in-fix-girdir-path.patch \ > " > > SRC_URI[sha256sum] = > "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" > -- > 2.30.2 > > > > > --000000000000c7a4b005c8a46673 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Can you please provide the steps needed to reproduce = the error? Can they be automated and added to the AB? Otherwise, I cannot m= eaningfully review the patch.

Also, the second con= cern is still not addressed: please submit upstream first, and include the = link to the oe-core submission. It's only a merge request on gnome gitl= ab.

Alex

On Tue, 3 Aug 2021 at 06:51,= Chen, Qi <Qi.Chen@windriver.co= m> wrote:
I didn't notice the previous email.
The reason that it's not seen on autobuilder is that it's runtime = error.
At build time, it uses a wrapper which adds extra parameters including the= correct path. That's why we didn't see any error at build time.

Regards,
Qi
Fro= m: Alexander Kanavin <alex.kanavin@gmail.com>
Sent: Monday, August 2, 2021 20:57
To: Chen, Qi <Qi.Chen@windriver.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>=
Subject: Re: [OE-core][PATCH] gobject-introspection: fix default se= arch path for girdir
=C2=A0
The concerns are the same as the previous time this patch was submitt= ed:

This is not seen in the autobuilder, how can it be repro= duced?

Also, please submit upstream first.


Alex

On Mon, 2 Aug 2021 at 08:25, Chen Qi <Qi.Chen@windriver.com> wr= ote:
When running g-ir-scanner, we get the following error:

=C2=A0 Couldn't find include 'GObject-2.0.gir' (search path: =C2=A0 '['/usr/lib64', 'gir-1.0', '/usr/local/shar= e/gir-1.0', '/usr/share/gir-1.0',
=C2=A0 '/usr/share/gir-1.0', '/usr/share/gir-1.0']')
This is because g-ir-tool-template.in is not setting girdir correctly.
It's using the prefix instead of the actual girdir.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
=C2=A0...-ir-tool-template.in-fix-girdir-path.patch | 33 +++++++++++++++++= ++
=C2=A0.../gobject-intros= pection_1.68.0.bb=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 1 + =C2=A02 files changed, 34 insertions(+)
=C2=A0create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-= introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspectio= n/0001-g-ir-tool-template.in-fix-girdir-path.patch b/meta/recipes-gnome/gob= ject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-gir= dir-path.patch
new file mode 100644
index 0000000000..c0d263946b
--- /dev/null
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-= g-ir-tool-template.in-fix-girdir-path.patch
@@ -0,0 +1,33 @@
+From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com>
+Date: Tue, 13 Jul 2021 02:05:11 -0700
+Subject: [PATCH] g-ir-tool-template.in: fix girdir path
+
+In case gir_dir_prefix is set, it's possible that g-ir-scanner
+cannot find the .gir files. This is because that the girdir
+is set to gir_dir_prefix, which is wrong. It's not a prefix,
+it the actual gir dir.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ tools/g-ir-tool-template.in = | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/g-ir-tool-temp= late.in b/tools/g-ir-tool-templ= ate.in
+index 6e98f52e..62c07c31 100755
+--- a/tools/g-ir-tool-template.in=
++++ b/tools/g-ir-tool-template.in=
+@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] =3D datadir
+
+ # Respect gir_dir_prefix
+ girdir =3D ''
+-girdir =3D os.path.abspath(os.path.join(filedir, '..', '@gir= _dir_prefix@'))
++girdir =3D os.path.abspath(os.path.join(filedir, '..', '@gir= _dir_prefix@', 'gir-1.0'))
+ builtins.__dict__['GIRDIR'] =3D [girdir]
+
+ # Again, relative paths first so that the installation prefix is relocat= able
+--
+2.30.2
+
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb
index 048deabe64..647511f7ad 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Dc434e812= 8a68bedd59b80b2ac1eb1c4a \

=C2=A0SRC_URI =3D "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version(&q= uot;${PV}", 2)}/${BPN}-${PV}.tar.xz \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 file://0001-giscanner-ignore-err= or-return-codes-from-ldd-wrapper.patch \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0file://0001-g-ir-tool-template.i= n-fix-girdir-path.patch \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "

=C2=A0SRC_URI[sha256sum] =3D "d229242481a201b84a0c66716de1752bca41db4= 133672cfcfb37c93eb6e54a27"
--
2.30.2




--000000000000c7a4b005c8a46673--