diff options
| author | Khem Raj <raj.khem@gmail.com> | 2021-04-08 12:26:51 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-04-08 12:27:08 -0700 |
| commit | 5d8dfa1ad4ac5d32536a10c9e299a3dd17296fc9 (patch) | |
| tree | 0733a91d51b6f2bbd69012a59c37bbc8c0acb33e | |
| parent | 97f59fb2063dae01c72e1e3a690edf5dfe645571 (diff) | |
| download | meta-openembedded-5d8dfa1ad4ac5d32536a10c9e299a3dd17296fc9.tar.gz | |
Revert "iwd: Upgade to 1.13"
This reverts commit 87932984c3e4aa8dc03238d0997a3ee09e0f38b1.
| -rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd_1.12.bb (renamed from meta-oe/recipes-connectivity/iwd/iwd_1.13.bb) | 6 |
2 files changed, 3 insertions, 38 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 deleted file mode 100644 index 63d617f3e1..0000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 0532cddcec9c3abff1f3bc22d2fa50df03d55d17 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 5 Apr 2021 14:11:40 -0700 | ||
| 4 | Subject: [PATCH] build: Use abs_top_srcdir instead of abs_srcdir for ell sources | ||
| 5 | |||
| 6 | this makes it build when build dir is outside of sources dir | ||
| 7 | |||
| 8 | Upstream-Status: Submitted [https://lists.01.org/hyperkitty/list/iwd@lists.01.org/message/SYX6Z7SUQHU7UWM6ECZTTJ6SPODIS6KB/] | ||
| 9 | --- | ||
| 10 | Makefile.am | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | --- a/Makefile.am | ||
| 14 | +++ b/Makefile.am | ||
| 15 | @@ -625,9 +625,10 @@ unit/tls-settings.8021x: unit/cert-ca.pe | ||
| 16 | BUILT_SOURCES = $(ell_built_sources) src/builtin.h | ||
| 17 | |||
| 18 | ell/shared: Makefile | ||
| 19 | + $(AM_V_at)$(MKDIR_P) ell | ||
| 20 | $(AM_V_GEN)for f in $(ell_shared) ; do \ | ||
| 21 | if [ ! -f $$f ] ; then \ | ||
| 22 | - $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ | ||
| 23 | + $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ | ||
| 24 | fi \ | ||
| 25 | done > $@ | ||
| 26 | |||
| 27 | @@ -635,7 +636,7 @@ ell/internal: Makefile | ||
| 28 | $(AM_V_at)$(MKDIR_P) ell | ||
| 29 | $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ | ||
| 30 | if [ ! -f $$f ] ; then \ | ||
| 31 | - $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ | ||
| 32 | + $(LN_S) -t ell -f $(abs_top_srcdir)/ell/$$f ; \ | ||
| 33 | fi \ | ||
| 34 | done > $@ | ||
| 35 | |||
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb index 19d3a509ca..ccdc65ac6c 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.13.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb | |||
| @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" | |||
| 5 | 5 | ||
| 6 | DEPENDS = "ell" | 6 | DEPENDS = "ell" |
| 7 | 7 | ||
| 8 | SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ | 8 | SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ |
| 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ | ||
| 10 | " | 9 | " |
| 11 | SRC_URI[sha256sum] = "b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a" | 10 | SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5" |
| 11 | S = "${WORKDIR}/git" | ||
| 12 | 12 | ||
| 13 | inherit autotools manpages pkgconfig python3native systemd | 13 | inherit autotools manpages pkgconfig python3native systemd |
| 14 | 14 | ||
