* [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure"
@ 2020-08-31 5:20 Khem Raj
2020-08-31 5:20 ` [PATCH 2/3] lttng-tools: lttng-ust works on riscv64 Khem Raj
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Khem Raj @ 2020-08-31 5:20 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj, Ross Burton
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]
}
EXTRA_OECONF += " \
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] lttng-tools: lttng-ust works on riscv64
2020-08-31 5:20 [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Khem Raj
@ 2020-08-31 5:20 ` Khem Raj
2020-08-31 5:20 ` [PATCH 3/3] util-linux: Allow update alternatives for mcookie Khem Raj
2020-09-02 12:48 ` [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Richard Purdie
2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2020-08-31 5:20 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb
index f7e6ec2cba..0787e04d19 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb
@@ -164,6 +164,3 @@ do_install_ptest () {
esac
done
}
-
-COMPATIBLE_HOST_riscv64 = "null"
-
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] util-linux: Allow update alternatives for mcookie
2020-08-31 5:20 [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Khem Raj
2020-08-31 5:20 ` [PATCH 2/3] lttng-tools: lttng-ust works on riscv64 Khem Raj
@ 2020-08-31 5:20 ` Khem Raj
2020-09-02 12:48 ` [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Richard Purdie
2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2020-08-31 5:20 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
mcookie is also provided by toybox
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/util-linux/util-linux_2.36.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/util-linux/util-linux_2.36.bb b/meta/recipes-core/util-linux/util-linux_2.36.bb
index 2fac9793a2..7a88285fbf 100644
--- a/meta/recipes-core/util-linux/util-linux_2.36.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.36.bb
@@ -263,6 +263,7 @@ ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger"
ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup"
ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg"
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
+ALTERNATIVE_LINK_NAME[mcookie] = "${bindir}/mcookie"
ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount"
ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure"
2020-08-31 5:20 [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Khem Raj
2020-08-31 5:20 ` [PATCH 2/3] lttng-tools: lttng-ust works on riscv64 Khem Raj
2020-08-31 5:20 ` [PATCH 3/3] util-linux: Allow update alternatives for mcookie Khem Raj
@ 2020-09-02 12:48 ` Richard Purdie
2020-09-02 15:17 ` Khem Raj
2 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2020-09-02 12:48 UTC (permalink / raw)
To: Khem Raj, openembedded-core; +Cc: Ross Burton
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure"
2020-09-02 12:48 ` [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Richard Purdie
@ 2020-09-02 15:17 ` Khem Raj
2020-09-02 15:29 ` Ross Burton
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-09-02 15:17 UTC (permalink / raw)
To: Richard Purdie
Cc: Patches and discussions about the oe-core layer, Ross Burton
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure"
2020-09-02 15:17 ` Khem Raj
@ 2020-09-02 15:29 ` Ross Burton
0 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2020-09-02 15:29 UTC (permalink / raw)
To: Khem Raj
Cc: Richard Purdie, Patches and discussions about the oe-core layer,
Ross Burton
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
> >
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-09-02 15:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-31 5:20 [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Khem Raj
2020-08-31 5:20 ` [PATCH 2/3] lttng-tools: lttng-ust works on riscv64 Khem Raj
2020-08-31 5:20 ` [PATCH 3/3] util-linux: Allow update alternatives for mcookie Khem Raj
2020-09-02 12:48 ` [OE-core] [PATCH 1/3] gtk+3: Revert "gtk+3: fix reproducible build failure" Richard Purdie
2020-09-02 15:17 ` Khem Raj
2020-09-02 15:29 ` Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.