From b3b10c143920f74c570e04c29d87efd54f9dbd89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Mon, 13 Nov 2017 17:02:50 +0100 Subject: [PATCH] dde_linux: create wifi recipe --- repos/dde_linux/lib/mk/wifi_include.mk | 4 +- repos/dde_linux/recipes/pkg/wifi/README | 2 + repos/dde_linux/recipes/pkg/wifi/archives | 5 +++ repos/dde_linux/recipes/pkg/wifi/hash | 1 + .../recipes/raw/wifi_firmware/content.mk | 15 +++++++ .../dde_linux/recipes/raw/wifi_firmware/hash | 1 + .../dde_linux/recipes/src/wifi_drv/content.mk | 44 +++++++++++++++++++ repos/dde_linux/recipes/src/wifi_drv/hash | 1 + .../dde_linux/recipes/src/wifi_drv/used_apis | 12 +++++ repos/dde_linux/src/drivers/wifi/target.mk | 2 +- .../lib/wpa_driver_nl80211/include/net/if.h | 2 +- .../wpa_driver_nl80211/include/net/if_arp.h | 2 +- .../include/netpacket/packet.h | 2 +- 13 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 repos/dde_linux/recipes/pkg/wifi/README create mode 100644 repos/dde_linux/recipes/pkg/wifi/archives create mode 100644 repos/dde_linux/recipes/pkg/wifi/hash create mode 100644 repos/dde_linux/recipes/raw/wifi_firmware/content.mk create mode 100644 repos/dde_linux/recipes/raw/wifi_firmware/hash create mode 100644 repos/dde_linux/recipes/src/wifi_drv/content.mk create mode 100644 repos/dde_linux/recipes/src/wifi_drv/hash create mode 100644 repos/dde_linux/recipes/src/wifi_drv/used_apis mode change 120000 => 100644 repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h mode change 120000 => 100644 repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h mode change 120000 => 100644 repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h diff --git a/repos/dde_linux/lib/mk/wifi_include.mk b/repos/dde_linux/lib/mk/wifi_include.mk index d1b616be3..864b1be41 100644 --- a/repos/dde_linux/lib/mk/wifi_include.mk +++ b/repos/dde_linux/lib/mk/wifi_include.mk @@ -7,7 +7,9 @@ LX_EMUL_H := $(REP_DIR)/src/lib/wifi/include/lx_emul.h # Determine the header files included by the contrib code. For each # of these header files we create a symlink to 'lx_emul.h'. # -GEN_INCLUDES := $(shell grep -rIh "^\#include .*\/" $(WIFI_CONTRIB_DIR) |\ +SCAN_DIRS := $(addprefix $(WIFI_CONTRIB_DIR)/include/, asm-generic crypto linux net trace uapi) \ + $(addprefix $(WIFI_CONTRIB_DIR)/, crypto drivers lib net) +GEN_INCLUDES := $(shell grep -rIh "^\#include .*\/" $(SCAN_DIRS) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" |\ sort | uniq) # diff --git a/repos/dde_linux/recipes/pkg/wifi/README b/repos/dde_linux/recipes/pkg/wifi/README new file mode 100644 index 000000000..2186801aa --- /dev/null +++ b/repos/dde_linux/recipes/pkg/wifi/README @@ -0,0 +1,2 @@ + + Package for bundling wifi_drv and wifi_firmware diff --git a/repos/dde_linux/recipes/pkg/wifi/archives b/repos/dde_linux/recipes/pkg/wifi/archives new file mode 100644 index 000000000..e28d3eb87 --- /dev/null +++ b/repos/dde_linux/recipes/pkg/wifi/archives @@ -0,0 +1,5 @@ +_/src/wifi_drv +_/src/libcrypto +_/src/libssl +_/src/vfs_jitterentropy +_/raw/wifi_firmware diff --git a/repos/dde_linux/recipes/pkg/wifi/hash b/repos/dde_linux/recipes/pkg/wifi/hash new file mode 100644 index 000000000..fa5da94e4 --- /dev/null +++ b/repos/dde_linux/recipes/pkg/wifi/hash @@ -0,0 +1 @@ +2017-11-14 4e7bd5d760094aab93b079a4fc3529a113d16645 diff --git a/repos/dde_linux/recipes/raw/wifi_firmware/content.mk b/repos/dde_linux/recipes/raw/wifi_firmware/content.mk new file mode 100644 index 000000000..270f5b817 --- /dev/null +++ b/repos/dde_linux/recipes/raw/wifi_firmware/content.mk @@ -0,0 +1,15 @@ +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux) + +content: ucode_files LICENSE.iwlwifi + + +.PHONY: ucode_files +ucode_files: + cp $(PORT_DIR)/firmware/*.ucode . + +LICENSE.iwlwifi: + for i in $(PORT_DIR)/firmware/LICENSE.*; do \ + echo "$${i##*/}:" >> $@; \ + cat $$i >> $@; \ + echo >> $@; \ + done diff --git a/repos/dde_linux/recipes/raw/wifi_firmware/hash b/repos/dde_linux/recipes/raw/wifi_firmware/hash new file mode 100644 index 000000000..db24017cf --- /dev/null +++ b/repos/dde_linux/recipes/raw/wifi_firmware/hash @@ -0,0 +1 @@ +2017-11-14-h 125e2160d4c780dbbcb24faccfabe45c8bb792ff diff --git a/repos/dde_linux/recipes/src/wifi_drv/content.mk b/repos/dde_linux/recipes/src/wifi_drv/content.mk new file mode 100644 index 000000000..f099a960b --- /dev/null +++ b/repos/dde_linux/recipes/src/wifi_drv/content.mk @@ -0,0 +1,44 @@ +LIB_MK := $(addprefix lib/mk/,libnl.inc libnl_include.mk iwl_firmware.mk wifi.inc \ + wifi_include.mk) \ + $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/libnl.mk) \ + $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk) \ + $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/wifi.mk) \ + $(addprefix lib/mk/spec/x86/,wpa_driver_nl80211.mk wpa_supplicant.mk) + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux) + +MIRROR_FROM_REP_DIR := $(LIB_MK) \ + lib/import/import-wifi_include.mk \ + lib/import/import-libnl_include.mk \ + lib/import/import-libnl.mk \ + include/wifi src/include src/lx_kit \ + $(shell cd $(REP_DIR); find src/drivers/wifi -type f) \ + $(shell cd $(REP_DIR); find src/lib/libnl -type f) \ + $(shell cd $(REP_DIR); find src/lib/wifi -type f) \ + $(shell cd $(REP_DIR); find src/lib/wpa_driver_nl80211 -type f) \ + $(shell cd $(REP_DIR); find src/lib/wpa_supplicant -type f) + +MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/lib/libnl -type f) \ + $(shell cd $(PORT_DIR); find src/lib/wifi -type f) \ + $(shell cd $(PORT_DIR); find src/app/wpa_supplicant -type f) +MIRROR_FROM_PORT_DIR := $(filter-out $(MIRROR_FROM_REP_DIR),$(MIRROR_FROM_PORT_DIR)) + +content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $@ + +content: LICENSE +LICENSE: + ( echo "Linux is subject to GNU General Public License version 2, see:"; \ + echo "https://www.kernel.org/pub/linux/kernel/COPYING"; \ + echo; \ + echo "Libnl is subject to GNU LESSER GENERAL PUBLIC LICENSE Verson 2.1, see:"; \ + echo " src/lib/libnl/COPYING"; \ + echo; \ + echo "Wpa_supplicant is subject to 3-clause BSD license, see:"; \ + echo " src/app/wpa_supplicant/COPYING"; ) > $@ diff --git a/repos/dde_linux/recipes/src/wifi_drv/hash b/repos/dde_linux/recipes/src/wifi_drv/hash new file mode 100644 index 000000000..c88641a1c --- /dev/null +++ b/repos/dde_linux/recipes/src/wifi_drv/hash @@ -0,0 +1 @@ +2017-11-14 59fb14482e1e4e2dc57b0a0b3b7614007b1be9da diff --git a/repos/dde_linux/recipes/src/wifi_drv/used_apis b/repos/dde_linux/recipes/src/wifi_drv/used_apis new file mode 100644 index 000000000..307d4cfbe --- /dev/null +++ b/repos/dde_linux/recipes/src/wifi_drv/used_apis @@ -0,0 +1,12 @@ +base +os +libc +libcrypto +libssl +file_system +file_system_session +nic_session +platform_session +report_session +timer_session +vfs diff --git a/repos/dde_linux/src/drivers/wifi/target.mk b/repos/dde_linux/src/drivers/wifi/target.mk index f7f2c0ac3..387b1eaef 100644 --- a/repos/dde_linux/src/drivers/wifi/target.mk +++ b/repos/dde_linux/src/drivers/wifi/target.mk @@ -2,7 +2,7 @@ REQUIRES = x86 TARGET = wifi_drv SRC_CC = main.cc -LIBS = wifi iwl_firmware wpa_supplicant +LIBS = base wifi iwl_firmware wpa_supplicant # needed for firmware.h INC_DIR += $(REP_DIR)/src/lib/wifi/include diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h deleted file mode 120000 index e89924164..000000000 --- a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h +++ /dev/null @@ -1 +0,0 @@ -../lx_user_emul.h \ No newline at end of file diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h new file mode 100644 index 000000000..f415268a4 --- /dev/null +++ b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if.h @@ -0,0 +1 @@ +#include diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h deleted file mode 120000 index e89924164..000000000 --- a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h +++ /dev/null @@ -1 +0,0 @@ -../lx_user_emul.h \ No newline at end of file diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h new file mode 100644 index 000000000..f415268a4 --- /dev/null +++ b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/net/if_arp.h @@ -0,0 +1 @@ +#include diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h deleted file mode 120000 index e89924164..000000000 --- a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h +++ /dev/null @@ -1 +0,0 @@ -../lx_user_emul.h \ No newline at end of file diff --git a/repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h new file mode 100644 index 000000000..f415268a4 --- /dev/null +++ b/repos/dde_linux/src/lib/wpa_driver_nl80211/include/netpacket/packet.h @@ -0,0 +1 @@ +#include