diff options
-rw-r--r-- | meta/recipes-connectivity/iw/iw/separate-objdir.patch | 24 | ||||
-rw-r--r-- | meta/recipes-connectivity/iw/iw_5.4.bb (renamed from meta/recipes-connectivity/iw/iw_5.3.bb) | 4 |
2 files changed, 18 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch index eb01a5a14e..179fd90124 100644 --- a/meta/recipes-connectivity/iw/iw/separate-objdir.patch +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch | |||
@@ -1,3 +1,6 @@ | |||
1 | From ff9f0a631c99fb6e2677c02bf572a5e69c70f5cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Changhyeok Bae <changhyeok.bae@gmail.com> | ||
3 | Date: Mon, 27 Jan 2020 22:48:03 +0100 | ||
1 | Subject: [PATCH] Support separation of SRCDIR and OBJDIR | 4 | Subject: [PATCH] Support separation of SRCDIR and OBJDIR |
2 | 5 | ||
3 | Typical use of VPATH to locate the sources. | 6 | Typical use of VPATH to locate the sources. |
@@ -11,12 +14,12 @@ Signed-off-by: Maxin B. John <maxin.john@intel.com> | |||
11 | 1 file changed, 6 insertions(+), 2 deletions(-) | 14 | 1 file changed, 6 insertions(+), 2 deletions(-) |
12 | 15 | ||
13 | diff --git a/Makefile b/Makefile | 16 | diff --git a/Makefile b/Makefile |
14 | index 33aaf6a..9030796 100644 | 17 | index 90f2251..714cdb9 100644 |
15 | --- a/Makefile | 18 | --- a/Makefile |
16 | +++ b/Makefile | 19 | +++ b/Makefile |
17 | @@ -1,5 +1,9 @@ | 20 | @@ -1,5 +1,9 @@ |
18 | MAKEFLAGS += --no-print-directory | 21 | MAKEFLAGS += --no-print-directory |
19 | 22 | ||
20 | +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) | 23 | +SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST))) |
21 | +OBJDIR ?= $(PWD) | 24 | +OBJDIR ?= $(PWD) |
22 | +VPATH = $(SRCDIR) | 25 | +VPATH = $(SRCDIR) |
@@ -24,19 +27,24 @@ index 33aaf6a..9030796 100644 | |||
24 | PREFIX ?= /usr | 27 | PREFIX ?= /usr |
25 | SBINDIR ?= $(PREFIX)/sbin | 28 | SBINDIR ?= $(PREFIX)/sbin |
26 | MANDIR ?= $(PREFIX)/share/man | 29 | MANDIR ?= $(PREFIX)/share/man |
27 | @@ -103,11 +107,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS)) | 30 | @@ -92,7 +96,7 @@ all: $(ALL) |
28 | version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ | 31 | version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \ |
29 | $(wildcard .git/index .git/refs/tags) | 32 | $(wildcard .git/index .git/refs/tags) |
30 | @$(NQ) ' GEN ' $@ | 33 | @$(NQ) ' GEN ' $@ |
31 | - $(Q)./version.sh $@ | 34 | - $(Q)./version.sh $@ |
32 | + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ | 35 | + $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@ |
33 | 36 | ||
34 | %.o: %.c iw.h nl80211.h | 37 | nl80211-commands.inc: nl80211.h |
38 | @$(NQ) ' GEN ' $@ | ||
39 | @@ -100,7 +104,7 @@ nl80211-commands.inc: nl80211.h | ||
40 | |||
41 | %.o: %.c iw.h nl80211.h nl80211-commands.inc | ||
35 | @$(NQ) ' CC ' $@ | 42 | @$(NQ) ' CC ' $@ |
36 | - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | 43 | - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
37 | + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | 44 | + $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
38 | 45 | ||
39 | ifeq ($(IW_ANDROID_BUILD),) | 46 | ifeq ($(IW_ANDROID_BUILD),) |
40 | iw: $(OBJS) | 47 | iw: $(OBJS) |
41 | -- | 48 | -- |
42 | 2.20.1 (Apple Git-117) | 49 | 2.23.0 |
50 | |||
diff --git a/meta/recipes-connectivity/iw/iw_5.3.bb b/meta/recipes-connectivity/iw/iw_5.4.bb index f7f13f5a30..9f58e49709 100644 --- a/meta/recipes-connectivity/iw/iw_5.3.bb +++ b/meta/recipes-connectivity/iw/iw_5.4.bb | |||
@@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ | |||
14 | file://separate-objdir.patch \ | 14 | file://separate-objdir.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31" | 17 | SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6" |
18 | SRC_URI[sha256sum] = "175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a" | 18 | SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c" |
19 | 19 | ||
20 | inherit pkgconfig | 20 | inherit pkgconfig |
21 | 21 | ||