| Message ID | 20220705170339.771017-4-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | e525db4eb9556979c67f6a908f6646363154cd06 |
| Headers | show |
| Series | [1/7] sato: work around missing icons in adwaita 42.0 | expand |
Hello Alex, I guess you have seen it in your build but this is probably the cause of the meta-mingw failure: https://autobuilder.yoctoproject.org/typhoon/#/builders/89/builds/5467/steps/12/logs/stdio On 05/07/2022 19:03:36+0200, Alexander Kanavin wrote: > Drop the patch, as it is no longer necessary > (genereated .pc defines everything as relative to the .pc path). > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...hardcode-the-path-to-wayland-scanner.patch | 27 ------------------- > .../{wayland_1.20.0.bb => wayland_1.21.0.bb} | 5 ++-- > 2 files changed, 2 insertions(+), 30 deletions(-) > delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > rename meta/recipes-graphics/wayland/{wayland_1.20.0.bb => wayland_1.21.0.bb} (90%) > > diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > deleted file mode 100644 > index e3e71925b8..0000000000 > --- a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From 3e7cd56611aeec274e48a4816bc7c21f74f15be0 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex.kanavin@gmail.com> > -Date: Mon, 17 Feb 2020 21:46:18 +0100 > -Subject: [PATCH] Do not hardcode the path to wayland-scanner > - > -This results in host contamination during builds. > - > -Upstream-Status: Inappropriate [oe-core specific] > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > - > ---- > - src/meson.build | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/src/meson.build b/src/meson.build > -index 15730a3..61edbc8 100644 > ---- a/src/meson.build > -+++ b/src/meson.build > -@@ -52,7 +52,7 @@ if get_option('scanner') > - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), > - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), > - 'bindir=' + join_paths('${prefix}', get_option('bindir')), > -- 'wayland_scanner=${bindir}/wayland-scanner' > -+ 'wayland_scanner=wayland-scanner' > - ], > - filebase: 'wayland-scanner' > - ) > diff --git a/meta/recipes-graphics/wayland/wayland_1.20.0.bb b/meta/recipes-graphics/wayland/wayland_1.21.0.bb > similarity index 90% > rename from meta/recipes-graphics/wayland/wayland_1.20.0.bb > rename to meta/recipes-graphics/wayland/wayland_1.21.0.bb > index dd48a29dc4..ce59e601d2 100644 > --- a/meta/recipes-graphics/wayland/wayland_1.20.0.bb > +++ b/meta/recipes-graphics/wayland/wayland_1.21.0.bb > @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ > > DEPENDS = "expat libffi wayland-native" > > -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ > +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ > file://run-ptest \ > - file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ > file://0001-build-Fix-strndup-detection-on-MinGW.patch \ > " > -SRC_URI[sha256sum] = "b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725" > +SRC_URI[sha256sum] = "6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac" > > UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" > UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#167672): https://lists.openembedded.org/g/openembedded-core/message/167672 > Mute This Topic: https://lists.openembedded.org/mt/92189298/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Yes, the fix to meta-mingw was already sent, and is already in master-next. Alex On Wed, 6 Jul 2022 at 15:22, Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > Hello Alex, > > I guess you have seen it in your build but this is probably the cause of > the meta-mingw failure: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/89/builds/5467/steps/12/logs/stdio > > On 05/07/2022 19:03:36+0200, Alexander Kanavin wrote: > > Drop the patch, as it is no longer necessary > > (genereated .pc defines everything as relative to the .pc path). > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > --- > > ...hardcode-the-path-to-wayland-scanner.patch | 27 ------------------- > > .../{wayland_1.20.0.bb => wayland_1.21.0.bb} | 5 ++-- > > 2 files changed, 2 insertions(+), 30 deletions(-) > > delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > > rename meta/recipes-graphics/wayland/{wayland_1.20.0.bb => wayland_1.21.0.bb} (90%) > > > > diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > > deleted file mode 100644 > > index e3e71925b8..0000000000 > > --- a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > -From 3e7cd56611aeec274e48a4816bc7c21f74f15be0 Mon Sep 17 00:00:00 2001 > > -From: Alexander Kanavin <alex.kanavin@gmail.com> > > -Date: Mon, 17 Feb 2020 21:46:18 +0100 > > -Subject: [PATCH] Do not hardcode the path to wayland-scanner > > - > > -This results in host contamination during builds. > > - > > -Upstream-Status: Inappropriate [oe-core specific] > > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > - > > ---- > > - src/meson.build | 2 +- > > - 1 file changed, 1 insertion(+), 1 deletion(-) > > - > > -diff --git a/src/meson.build b/src/meson.build > > -index 15730a3..61edbc8 100644 > > ---- a/src/meson.build > > -+++ b/src/meson.build > > -@@ -52,7 +52,7 @@ if get_option('scanner') > > - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), > > - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), > > - 'bindir=' + join_paths('${prefix}', get_option('bindir')), > > -- 'wayland_scanner=${bindir}/wayland-scanner' > > -+ 'wayland_scanner=wayland-scanner' > > - ], > > - filebase: 'wayland-scanner' > > - ) > > diff --git a/meta/recipes-graphics/wayland/wayland_1.20.0.bb b/meta/recipes-graphics/wayland/wayland_1.21.0.bb > > similarity index 90% > > rename from meta/recipes-graphics/wayland/wayland_1.20.0.bb > > rename to meta/recipes-graphics/wayland/wayland_1.21.0.bb > > index dd48a29dc4..ce59e601d2 100644 > > --- a/meta/recipes-graphics/wayland/wayland_1.20.0.bb > > +++ b/meta/recipes-graphics/wayland/wayland_1.21.0.bb > > @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ > > > > DEPENDS = "expat libffi wayland-native" > > > > -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ > > +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ > > file://run-ptest \ > > - file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ > > file://0001-build-Fix-strndup-detection-on-MinGW.patch \ > > " > > -SRC_URI[sha256sum] = "b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725" > > +SRC_URI[sha256sum] = "6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac" > > > > UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" > > UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" > > -- > > 2.30.2 > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#167672): https://lists.openembedded.org/g/openembedded-core/message/167672 > > Mute This Topic: https://lists.openembedded.org/mt/92189298/3617179 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
diff --git a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch b/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch deleted file mode 100644 index e3e71925b8..0000000000 --- a/meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e7cd56611aeec274e48a4816bc7c21f74f15be0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 17 Feb 2020 21:46:18 +0100 -Subject: [PATCH] Do not hardcode the path to wayland-scanner - -This results in host contamination during builds. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 15730a3..61edbc8 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -52,7 +52,7 @@ if get_option('scanner') - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), -- 'wayland_scanner=${bindir}/wayland-scanner' -+ 'wayland_scanner=wayland-scanner' - ], - filebase: 'wayland-scanner' - ) diff --git a/meta/recipes-graphics/wayland/wayland_1.20.0.bb b/meta/recipes-graphics/wayland/wayland_1.21.0.bb similarity index 90% rename from meta/recipes-graphics/wayland/wayland_1.20.0.bb rename to meta/recipes-graphics/wayland/wayland_1.21.0.bb index dd48a29dc4..ce59e601d2 100644 --- a/meta/recipes-graphics/wayland/wayland_1.20.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.21.0.bb @@ -12,12 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libffi wayland-native" -SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ file://run-ptest \ - file://0002-Do-not-hardcode-the-path-to-wayland-scanner.patch \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ " -SRC_URI[sha256sum] = "b8a034154c7059772e0fdbd27dbfcda6c732df29cae56a82274f6ec5d7cd8725" +SRC_URI[sha256sum] = "6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
Drop the patch, as it is no longer necessary (genereated .pc defines everything as relative to the .pc path). Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...hardcode-the-path-to-wayland-scanner.patch | 27 ------------------- .../{wayland_1.20.0.bb => wayland_1.21.0.bb} | 5 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/wayland/0002-Do-not-hardcode-the-path-to-wayland-scanner.patch rename meta/recipes-graphics/wayland/{wayland_1.20.0.bb => wayland_1.21.0.bb} (90%)