All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH v2] iwd: Upgade to 1.13
@ 2021-04-05 21:38 Khem Raj
  2021-04-07 23:16 ` [oe] " akuster
  0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-04-05 21:38 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Khem Raj

Fix out of tree builds
Switch to tarball fetch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Fix out of tree builds and switch to tarball fetcher

 ...p_srcdir-instead-of-abs_srcdir-for-e.patch | 35 +++++++++++++++++++
 .../iwd/{iwd_1.12.bb => iwd_1.13.bb}          |  6 ++--
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch
 rename meta-oe/recipes-connectivity/iwd/{iwd_1.12.bb => iwd_1.13.bb} (85%)

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
new file mode 100644
index 0000000000..63d617f3e1
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch
@@ -0,0 +1,35 @@
+From 0532cddcec9c3abff1f3bc22d2fa50df03d55d17 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 5 Apr 2021 14:11:40 -0700
+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(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -625,9 +625,10 @@ unit/tls-settings.8021x: unit/cert-ca.pe
+ BUILT_SOURCES = $(ell_built_sources) src/builtin.h
+ 
+ ell/shared: Makefile
++	$(AM_V_at)$(MKDIR_P) ell
+ 	$(AM_V_GEN)for f in $(ell_shared) ; do \
+ 		if [ ! -f $$f ] ; then \
+-			$(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
++			$(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \
+ 		fi \
+ 	done > $@
+ 
+@@ -635,7 +636,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 \
+-			$(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
++			$(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \
+ 		fi \
+ 	done > $@
+ 
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
similarity index 85%
rename from meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
rename to meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
index ccdc65ac6c..19d3a509ca 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
 
 DEPENDS = "ell"
 
-SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
+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 \
           "
-SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5"
-S = "${WORKDIR}/git"
+SRC_URI[sha256sum] = "b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a"
 
 inherit autotools manpages pkgconfig python3native systemd
 
-- 
2.31.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [oe] [meta-oe][PATCH v2] iwd: Upgade to 1.13
  2021-04-05 21:38 [meta-oe][PATCH v2] iwd: Upgade to 1.13 Khem Raj
@ 2021-04-07 23:16 ` akuster
  2021-04-07 23:17   ` Khem Raj
  0 siblings, 1 reply; 3+ messages in thread
From: akuster @ 2021-04-07 23:16 UTC (permalink / raw)
  To: Khem Raj, openembedded-devel



On 4/5/21 2:38 PM, Khem Raj wrote:
> Fix out of tree builds
> Switch to tarball fetch
I am seeing this error on Ubuntu 20.x

checking for ell >= 0.39... no
configure: error: Embedded Linux library >= 0.39 is required

core master and hardknott are at 0.38

https://errors.yoctoproject.org/Errors/Details/575735/


> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Fix out of tree builds and switch to tarball fetcher
>
>  ...p_srcdir-instead-of-abs_srcdir-for-e.patch | 35 +++++++++++++++++++
>  .../iwd/{iwd_1.12.bb => iwd_1.13.bb}          |  6 ++--
>  2 files changed, 38 insertions(+), 3 deletions(-)
>  create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch
>  rename meta-oe/recipes-connectivity/iwd/{iwd_1.12.bb => iwd_1.13.bb} (85%)
>
> 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
> new file mode 100644
> index 0000000000..63d617f3e1
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch
> @@ -0,0 +1,35 @@
> +From 0532cddcec9c3abff1f3bc22d2fa50df03d55d17 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 5 Apr 2021 14:11:40 -0700
> +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(-)
> +
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -625,9 +625,10 @@ unit/tls-settings.8021x: unit/cert-ca.pe
> + BUILT_SOURCES = $(ell_built_sources) src/builtin.h
> + 
> + ell/shared: Makefile
> ++	$(AM_V_at)$(MKDIR_P) ell
> + 	$(AM_V_GEN)for f in $(ell_shared) ; do \
> + 		if [ ! -f $$f ] ; then \
> +-			$(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
> ++			$(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \
> + 		fi \
> + 	done > $@
> + 
> +@@ -635,7 +636,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 \
> +-			$(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
> ++			$(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \
> + 		fi \
> + 	done > $@
> + 
> diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
> similarity index 85%
> rename from meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
> rename to meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
> index ccdc65ac6c..19d3a509ca 100644
> --- a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
> +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
> @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
>  
>  DEPENDS = "ell"
>  
> -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> +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 \
>            "
> -SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5"
> -S = "${WORKDIR}/git"
> +SRC_URI[sha256sum] = "b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a"
>  
>  inherit autotools manpages pkgconfig python3native systemd
>  
>
> 
>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [oe] [meta-oe][PATCH v2] iwd: Upgade to 1.13
  2021-04-07 23:16 ` [oe] " akuster
@ 2021-04-07 23:17   ` Khem Raj
  0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2021-04-07 23:17 UTC (permalink / raw)
  To: akuster808; +Cc: openembeded-devel

On Wed, Apr 7, 2021 at 4:16 PM akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 4/5/21 2:38 PM, Khem Raj wrote:
> > Fix out of tree builds
> > Switch to tarball fetch
> I am seeing this error on Ubuntu 20.x
>
> checking for ell >= 0.39... no
> configure: error: Embedded Linux library >= 0.39 is required
>
> core master and hardknott are at 0.38
>
> https://errors.yoctoproject.org/Errors/Details/575735/
may be nudge RP to merge it.

yeah I should have waited for Oe-core to land the ell 0.39 patch which
is in master-next :(
>
>
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > v2: Fix out of tree builds and switch to tarball fetcher
> >
> >  ...p_srcdir-instead-of-abs_srcdir-for-e.patch | 35 +++++++++++++++++++
> >  .../iwd/{iwd_1.12.bb => iwd_1.13.bb}          |  6 ++--
> >  2 files changed, 38 insertions(+), 3 deletions(-)
> >  create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch
> >  rename meta-oe/recipes-connectivity/iwd/{iwd_1.12.bb => iwd_1.13.bb} (85%)
> >
> > 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
> > new file mode 100644
> > index 0000000000..63d617f3e1
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch
> > @@ -0,0 +1,35 @@
> > +From 0532cddcec9c3abff1f3bc22d2fa50df03d55d17 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Mon, 5 Apr 2021 14:11:40 -0700
> > +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(-)
> > +
> > +--- a/Makefile.am
> > ++++ b/Makefile.am
> > +@@ -625,9 +625,10 @@ unit/tls-settings.8021x: unit/cert-ca.pe
> > + BUILT_SOURCES = $(ell_built_sources) src/builtin.h
> > +
> > + ell/shared: Makefile
> > ++    $(AM_V_at)$(MKDIR_P) ell
> > +     $(AM_V_GEN)for f in $(ell_shared) ; do \
> > +             if [ ! -f $$f ] ; then \
> > +-                    $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
> > ++                    $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \
> > +             fi \
> > +     done > $@
> > +
> > +@@ -635,7 +636,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 \
> > +-                    $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
> > ++                    $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \
> > +             fi \
> > +     done > $@
> > +
> > diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
> > similarity index 85%
> > rename from meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
> > rename to meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
> > index ccdc65ac6c..19d3a509ca 100644
> > --- a/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
> > +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
> > @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
> >
> >  DEPENDS = "ell"
> >
> > -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
> > +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 \
> >            "
> > -SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5"
> > -S = "${WORKDIR}/git"
> > +SRC_URI[sha256sum] = "b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a"
> >
> >  inherit autotools manpages pkgconfig python3native systemd
> >
> >
> > 
> >
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-04-07 23:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-05 21:38 [meta-oe][PATCH v2] iwd: Upgade to 1.13 Khem Raj
2021-04-07 23:16 ` [oe] " akuster
2021-04-07 23:17   ` Khem Raj

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.