gtk+3: Revert "gtk+3: fix reproducible build failure"
PATCH 1/3 gtk+3: Revert "gtk+3: fix reproducible build failure"
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
--- meta/recipes-gnome/gtk+/gtk+3.inc | 8 -------- 1 file changed, 8 deletions(-)
meta/recipes-gnome/gtk+/gtk+3.inc +0 -8
@@ -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 += " \
Signature · 1 line
2.28.0
PATCH 2/3 lttng-tools: lttng-ust works on riscv64
--- meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb | 3 --- 1 file changed, 3 deletions(-)
meta/recipes-kernel/lttng/lttng-tools_2.12.2.bb +0 -3
@@ -164,6 +164,3 @@ do_install_ptest () { esac done } - -COMPATIBLE_HOST_riscv64 = "null" -
Signature · 1 line
2.28.0
PATCH 3/3 util-linux: Allow update alternatives for mcookie
In reply to Khem Rajmcookie is also provided by toybox
--- meta/recipes-core/util-linux/util-linux_2.36.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/util-linux/util-linux_2.36.bb +1 -0
@@ -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"
Signature · 1 line
2.28.0
Quoted 25 lines · Khem Raj
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 <[email protected]>Cc Ross Burton <[email protected]>--- meta/recipes-gnome/gtk+/gtk+3.inc | 8 -------- 1 file changed, 8 deletions(-)meta/recipes-gnome/gtk+/gtk+3.inc +0
-1@@ -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}
meta/recipes-gnome/gtk+/gtk+3.inc do_configure_prepend() { · line 35
Quoted 10 lines
meta/recipes-gnome/gtk+/gtk+3.inc +0
-7rm -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
Quoted 40 lines · Richard Purdie
Quoted 25 lines · Khem Raj
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 <[email protected]>Cc Ross Burton <[email protected]>--- meta/recipes-gnome/gtk+/gtk+3.inc | 8 -------- 1 file changed, 8 deletions(-)meta/recipes-gnome/gtk+/gtk+3.inc +0
-1@@ -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}meta/recipes-gnome/gtk+/gtk+3.inc do_configure_prepend() { · line 35
Quoted 10 lines
meta/recipes-gnome/gtk+/gtk+3.inc +0
-7rm -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:
Quoted 6 lines
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 ?
Quoted 5 lines
Cheers,
Richard
Looks like my fix didn't quite work. Drop this and I'll fix again.
Ross
Quoted 57 lines · Khem Raj
Quoted 40 lines · Richard Purdie
Quoted 25 lines · Khem Raj
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 <[email protected]>Cc Ross Burton <[email protected]>--- meta/recipes-gnome/gtk+/gtk+3.inc | 8 -------- 1 file changed, 8 deletions(-)meta/recipes-gnome/gtk+/gtk+3.inc +0
-1@@ -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}meta/recipes-gnome/gtk+/gtk+3.inc do_configure_prepend() { · line 35
Quoted 10 lines
meta/recipes-gnome/gtk+/gtk+3.inc +0
-7rm -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:
Quoted 6 lines
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 ?
Quoted 5 lines
Cheers,
Richard