Message ID | 1704720002-29880-1-git-send-email-wangmy@fujitsu.com |
---|---|
State | Under Review |
Headers | show |
Series | [meta-oe] iwd: upgrade 2.8 -> 2.12 | expand |
fails on musl https://sprunge.us/756nOz See my fixes to use POSIX basename for various recipes. You will need something similar. On Mon, Jan 8, 2024 at 5:20 AM wangmy <wangmy@fujitsu.com> wrote: > > From: Wang Mingyu <wangmy@fujitsu.com> > > Changelog > ======== > -Fix issue with DPP extra settings not being used. > -Fix issue with DPP and PRF+ handling on AARCH64. > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...s_top_srcdir-instead-of-abs_srcdir-for-e.patch | 15 +++++++-------- > .../iwd/{iwd_2.8.bb => iwd_2.12.bb} | 2 +- > 2 files changed, 8 insertions(+), 9 deletions(-) > rename meta-oe/recipes-connectivity/iwd/{iwd_2.8.bb => iwd_2.12.bb} (94%) > > diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch > index 9ed73104e..bc72f17e0 100644 > --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch > +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch > @@ -1,20 +1,22 @@ > -From b0b51d762f45ff9d320b96bd0acb89313148a446 Mon Sep 17 00:00:00 2001 > +From 2e782b849a2202d5a77bd5ac67160c4a47ae306d Mon Sep 17 00:00:00 2001 > From: Zang Ruochen <zangrc.fnst@fujitsu.com> > Date: Wed, 12 May 2021 14:28:24 +0900 > -Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources > +Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell > + sources > > this makes it build when build dir is outside of sources dir > > Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.org/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/] > + > --- > Makefile.am | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > -index 68035e4..e3f7990 100644 > +index 5ed6ab3..e0e3c87 100644 > --- a/Makefile.am > +++ b/Makefile.am > -@@ -628,7 +628,7 @@ ell/shared: Makefile > +@@ -697,7 +697,7 @@ ell/shared: Makefile > $(AM_V_at)$(MKDIR_P) ell > $(AM_V_GEN)for f in $(ell_shared) ; do \ > if [ ! -f $$f ] ; then \ > @@ -23,7 +25,7 @@ index 68035e4..e3f7990 100644 > fi \ > done > $@ > > -@@ -636,7 +636,7 @@ ell/internal: Makefile > +@@ -705,7 +705,7 @@ ell/internal: Makefile > $(AM_V_at)$(MKDIR_P) ell > $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ > if [ ! -f $$f ] ; then \ > @@ -32,6 +34,3 @@ index 68035e4..e3f7990 100644 > fi \ > done > $@ > > --- > -2.25.1 > - > diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb b/meta-oe/recipes-connectivity/iwd/iwd_2.12.bb > similarity index 94% > rename from meta-oe/recipes-connectivity/iwd/iwd_2.8.bb > rename to meta-oe/recipes-connectivity/iwd/iwd_2.12.bb > index ee310d295..2ed13afe3 100644 > --- a/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb > +++ b/meta-oe/recipes-connectivity/iwd/iwd_2.12.bb > @@ -8,7 +8,7 @@ DEPENDS = "ell" > SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ > file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ > " > -SRC_URI[sha256sum] = "a90e621f45b9c2f9021beea0fa6477ee0334fcd2ee34beaab42e31ea0fd3be29" > +SRC_URI[sha256sum] = "6b71a78c1e1a0200c6b0097efe0f4055a76f445c0e17cdd6225d89538d7dc35e" > > inherit autotools manpages pkgconfig python3native systemd > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#108133): https://lists.openembedded.org/g/openembedded-devel/message/108133 > Mute This Topic: https://lists.openembedded.org/mt/103596458/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch index 9ed73104e..bc72f17e0 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch @@ -1,20 +1,22 @@ -From b0b51d762f45ff9d320b96bd0acb89313148a446 Mon Sep 17 00:00:00 2001 +From 2e782b849a2202d5a77bd5ac67160c4a47ae306d Mon Sep 17 00:00:00 2001 From: Zang Ruochen <zangrc.fnst@fujitsu.com> Date: Wed, 12 May 2021 14:28:24 +0900 -Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources +Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell + sources this makes it build when build dir is outside of sources dir Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.org/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/] + --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 68035e4..e3f7990 100644 +index 5ed6ab3..e0e3c87 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -628,7 +628,7 @@ ell/shared: Makefile +@@ -697,7 +697,7 @@ ell/shared: Makefile $(AM_V_at)$(MKDIR_P) ell $(AM_V_GEN)for f in $(ell_shared) ; do \ if [ ! -f $$f ] ; then \ @@ -23,7 +25,7 @@ index 68035e4..e3f7990 100644 fi \ done > $@ -@@ -636,7 +636,7 @@ ell/internal: Makefile +@@ -705,7 +705,7 @@ ell/internal: Makefile $(AM_V_at)$(MKDIR_P) ell $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ if [ ! -f $$f ] ; then \ @@ -32,6 +34,3 @@ index 68035e4..e3f7990 100644 fi \ done > $@ --- -2.25.1 - diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb b/meta-oe/recipes-connectivity/iwd/iwd_2.12.bb similarity index 94% rename from meta-oe/recipes-connectivity/iwd/iwd_2.8.bb rename to meta-oe/recipes-connectivity/iwd/iwd_2.12.bb index ee310d295..2ed13afe3 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_2.12.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "a90e621f45b9c2f9021beea0fa6477ee0334fcd2ee34beaab42e31ea0fd3be29" +SRC_URI[sha256sum] = "6b71a78c1e1a0200c6b0097efe0f4055a76f445c0e17cdd6225d89538d7dc35e" inherit autotools manpages pkgconfig python3native systemd