summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-05-14 10:14:50 +0800
committerKhem Raj <raj.khem@gmail.com>2021-05-14 07:26:46 -0700
commitfec704f62ce8cbe88402d40d966d3cac949c5551 (patch)
tree7ccee5854f3ac6705c6be2177e73737940905cbf
parent4cd13e9108eede8229a381671e5f41a707377836 (diff)
downloadmeta-openembedded-fec704f62ce8cbe88402d40d966d3cac949c5551.tar.gz
iwd: upgrade 1.13 -> 1.14
Refresh the following patch: 0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch20
-rw-r--r--meta-oe/recipes-connectivity/iwd/iwd_1.14.bb (renamed from meta-oe/recipes-connectivity/iwd/iwd_1.13.bb)2
2 files changed, 12 insertions, 10 deletions
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 63d617f3e1..9ed73104ee 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,6 +1,6 @@
1From 0532cddcec9c3abff1f3bc22d2fa50df03d55d17 Mon Sep 17 00:00:00 2001 1From b0b51d762f45ff9d320b96bd0acb89313148a446 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Zang Ruochen <zangrc.fnst@fujitsu.com>
3Date: Mon, 5 Apr 2021 14:11:40 -0700 3Date: Wed, 12 May 2021 14:28:24 +0900
4Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources 4Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources
5 5
6this makes it build when build dir is outside of sources dir 6this makes it build when build dir is outside of sources dir
@@ -10,13 +10,12 @@ Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.or
10 Makefile.am | 4 ++-- 10 Makefile.am | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
12 12
13diff --git a/Makefile.am b/Makefile.am
14index 68035e4..e3f7990 100644
13--- a/Makefile.am 15--- a/Makefile.am
14+++ b/Makefile.am 16+++ b/Makefile.am
15@@ -625,9 +625,10 @@ unit/tls-settings.8021x: unit/cert-ca.pe 17@@ -628,7 +628,7 @@ ell/shared: Makefile
16 BUILT_SOURCES = $(ell_built_sources) src/builtin.h 18 $(AM_V_at)$(MKDIR_P) ell
17
18 ell/shared: Makefile
19+ $(AM_V_at)$(MKDIR_P) ell
20 $(AM_V_GEN)for f in $(ell_shared) ; do \ 19 $(AM_V_GEN)for f in $(ell_shared) ; do \
21 if [ ! -f $$f ] ; then \ 20 if [ ! -f $$f ] ; then \
22- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ 21- $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
@@ -24,7 +23,7 @@ Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.or
24 fi \ 23 fi \
25 done > $@ 24 done > $@
26 25
27@@ -635,7 +636,7 @@ ell/internal: Makefile 26@@ -636,7 +636,7 @@ ell/internal: Makefile
28 $(AM_V_at)$(MKDIR_P) ell 27 $(AM_V_at)$(MKDIR_P) ell
29 $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ 28 $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \
30 if [ ! -f $$f ] ; then \ 29 if [ ! -f $$f ] ; then \
@@ -33,3 +32,6 @@ Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.or
33 fi \ 32 fi \
34 done > $@ 33 done > $@
35 34
35--
362.25.1
37
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb
index 19d3a509ca..dbcc319dcc 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb
@@ -8,7 +8,7 @@ DEPENDS = "ell"
8SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ 8SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \
9 file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ 9 file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \
10 " 10 "
11SRC_URI[sha256sum] = "b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a" 11SRC_URI[sha256sum] = "21be6ad59ba666ba1e50e01889d647472b9b2f96f4941123db036fd33c257f0b"
12 12
13inherit autotools manpages pkgconfig python3native systemd 13inherit autotools manpages pkgconfig python3native systemd
14 14