[1/3] gtk+3: Revert "gtk+3: fix reproducible build failure"

Submitted by Khem Raj on Aug. 31, 2020, 5:20 a.m. | Patch ID: 175814

Details

Message ID 20200831052011.955722-1-raj.khem@gmail.com
State Master Next
Commit f4801ba600277389229309986c0026568938198e
Headers show

Commit Message

Khem Raj Aug. 31, 2020, 5:20 a.m.
Now that we have updated to 3.24.22, the needed fix [1] is in and this
change is no longer needed

This reverts commit c2e0b0785b8098dbe562e88f54b679ca87626937.

[1] https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-gnome/gtk+/gtk+3.inc | 8 --------
 1 file changed, 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 8d5edb7ee8..e1ecf504a0 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -1,4 +1,3 @@ 
-
 SUMMARY = "Multi-platform toolkit for creating GUIs"
 DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
 set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
@@ -32,13 +31,6 @@  do_configure_prepend() {
     ln -s ${TARGET_PREFIX}libtool libtool
     #delete a file that will get confused with generated one in ${B}
     rm -f ${S}/gtk/gtktypefuncs.c
-
-    # These files are generated by wayland-scanner but will race over modification
-    # time between the copies in the sysroot from wayland-protocols and the copy
-    # in the source tree. Solve the race by deleting so they need to be regenerated.
-    # 3.24.22 will not be shipping these files so this can be deleted then:
-    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
-    rm -f ${S}/modules/input/text-input-unstable-v3*.[ch]
 }
 
 EXTRA_OECONF += " \

Comments

Richard Purdie Sept. 2, 2020, 12:48 p.m.
On Sun, 2020-08-30 at 22:20 -0700, Khem Raj wrote:
> Now that we have updated to 3.24.22, the needed fix [1] is in and this
> change is no longer needed
> 
> This reverts commit c2e0b0785b8098dbe562e88f54b679ca87626937.
> 
> [1] https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-gnome/gtk+/gtk+3.inc | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> index 8d5edb7ee8..e1ecf504a0 100644
> --- a/meta/recipes-gnome/gtk+/gtk+3.inc
> +++ b/meta/recipes-gnome/gtk+/gtk+3.inc
> @@ -1,4 +1,3 @@
> -
>  SUMMARY = "Multi-platform toolkit for creating GUIs"
>  DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
>  set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
> @@ -32,13 +31,6 @@ do_configure_prepend() {
>      ln -s ${TARGET_PREFIX}libtool libtool
>      #delete a file that will get confused with generated one in ${B}
>      rm -f ${S}/gtk/gtktypefuncs.c
> -
> -    # These files are generated by wayland-scanner but will race over modification
> -    # time between the copies in the sysroot from wayland-protocols and the copy
> -    # in the source tree. Solve the race by deleting so they need to be regenerated.
> -    # 3.24.22 will not be shipping these files so this can be deleted then:
> -    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
> -    rm -f ${S}/modules/input/text-input-unstable-v3*.[ch]
>  }
>  

I did try this, we see:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1315/steps/8/logs/step2d

so it seems there is more to this.

Sadly, this means I'll now have to rerun yet another set of testing as
this aborts the current build's validity :(.

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#142112): https://lists.openembedded.org/g/openembedded-core/message/142112
Mute This Topic: https://lists.openembedded.org/mt/76528747/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Sept. 2, 2020, 3:17 p.m.
On Wed, Sep 2, 2020 at 5:48 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Sun, 2020-08-30 at 22:20 -0700, Khem Raj wrote:
> > Now that we have updated to 3.24.22, the needed fix [1] is in and this
> > change is no longer needed
> >
> > This reverts commit c2e0b0785b8098dbe562e88f54b679ca87626937.
> >
> > [1] https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > Cc: Ross Burton <ross.burton@arm.com>
> > ---
> >  meta/recipes-gnome/gtk+/gtk+3.inc | 8 --------
> >  1 file changed, 8 deletions(-)
> >
> > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> > index 8d5edb7ee8..e1ecf504a0 100644
> > --- a/meta/recipes-gnome/gtk+/gtk+3.inc
> > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc
> > @@ -1,4 +1,3 @@
> > -
> >  SUMMARY = "Multi-platform toolkit for creating GUIs"
> >  DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
> >  set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
> > @@ -32,13 +31,6 @@ do_configure_prepend() {
> >      ln -s ${TARGET_PREFIX}libtool libtool
> >      #delete a file that will get confused with generated one in ${B}
> >      rm -f ${S}/gtk/gtktypefuncs.c
> > -
> > -    # These files are generated by wayland-scanner but will race over modification
> > -    # time between the copies in the sysroot from wayland-protocols and the copy
> > -    # in the source tree. Solve the race by deleting so they need to be regenerated.
> > -    # 3.24.22 will not be shipping these files so this can be deleted then:
> > -    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
> > -    rm -f ${S}/modules/input/text-input-unstable-v3*.[ch]
> >  }
> >
>
> I did try this, we see:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1315/steps/8/logs/step2d
>
> so it seems there is more to this.
>
> Sadly, this means I'll now have to rerun yet another set of testing as
> this aborts the current build's validity :(.

ok. I think the comment perhaps should be fixed then Ross ?
>
> Cheers,
>
> Richard
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#142122): https://lists.openembedded.org/g/openembedded-core/message/142122
Mute This Topic: https://lists.openembedded.org/mt/76528747/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Ross Burton Sept. 2, 2020, 3:29 p.m.
Looks like my fix didn't quite work. Drop this and I'll fix again.

Ross

On Wed, 2 Sep 2020 at 16:17, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Wed, Sep 2, 2020 at 5:48 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Sun, 2020-08-30 at 22:20 -0700, Khem Raj wrote:
> > > Now that we have updated to 3.24.22, the needed fix [1] is in and this
> > > change is no longer needed
> > >
> > > This reverts commit c2e0b0785b8098dbe562e88f54b679ca87626937.
> > >
> > > [1] https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
> > >
> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > Cc: Ross Burton <ross.burton@arm.com>
> > > ---
> > >  meta/recipes-gnome/gtk+/gtk+3.inc | 8 --------
> > >  1 file changed, 8 deletions(-)
> > >
> > > diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
> > > index 8d5edb7ee8..e1ecf504a0 100644
> > > --- a/meta/recipes-gnome/gtk+/gtk+3.inc
> > > +++ b/meta/recipes-gnome/gtk+/gtk+3.inc
> > > @@ -1,4 +1,3 @@
> > > -
> > >  SUMMARY = "Multi-platform toolkit for creating GUIs"
> > >  DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
> > >  set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
> > > @@ -32,13 +31,6 @@ do_configure_prepend() {
> > >      ln -s ${TARGET_PREFIX}libtool libtool
> > >      #delete a file that will get confused with generated one in ${B}
> > >      rm -f ${S}/gtk/gtktypefuncs.c
> > > -
> > > -    # These files are generated by wayland-scanner but will race over modification
> > > -    # time between the copies in the sysroot from wayland-protocols and the copy
> > > -    # in the source tree. Solve the race by deleting so they need to be regenerated.
> > > -    # 3.24.22 will not be shipping these files so this can be deleted then:
> > > -    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
> > > -    rm -f ${S}/modules/input/text-input-unstable-v3*.[ch]
> > >  }
> > >
> >
> > I did try this, we see:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1315/steps/8/logs/step2d
> >
> > so it seems there is more to this.
> >
> > Sadly, this means I'll now have to rerun yet another set of testing as
> > this aborts the current build's validity :(.
>
> ok. I think the comment perhaps should be fixed then Ross ?
> >
> > Cheers,
> >
> > Richard
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#142125): https://lists.openembedded.org/g/openembedded-core/message/142125
Mute This Topic: https://lists.openembedded.org/mt/76528747/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-