Move wpa_supplicant to own port

Issue #4508.

repos/dde_linux/lib/mk/spec/x86/wpa_driver_nl80211.mk

@@ -10,7 +10,7 @@ LD_OPT += --version-script=$(LIB_DIR)/symbol.map
 SRC_CC += dummies.cc ioctl.cc
 SRC_CC += rfkill_genode.cc
 
-WS_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/app/wpa_supplicant
+WS_CONTRIB_DIR := $(call select_from_ports,wpa_supplicant)/src/app/wpa_supplicant
 
 # l2_packet
 SRC_C   += src/l2_packet/l2_packet_linux.c

repos/dde_linux/lib/mk/spec/x86/wpa_supplicant.mk

@@ -1,4 +1,4 @@
-WS_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/app/wpa_supplicant
+WS_CONTRIB_DIR := $(call select_from_ports,wpa_supplicant)/src/app/wpa_supplicant
 WS_DIR         := $(REP_DIR)/src/lib/wpa_supplicant
 
 LIBS += libc libcrypto libssl wpa_driver_nl80211

repos/dde_linux/ports/dde_linux.hash

@@ -1 +1 @@
-e65e2ae521cd13ad8471bbd09e72e69af5d13ba3
+9cb34790ab695fee44e6d559d7a0d8f919e22f6e

repos/dde_linux/ports/dde_linux.port

@@ -1,7 +1,7 @@
 LICENSE     := GPLv2
 VERSION     := 2
 DOWNLOADS   := intel_fb.archive lxip.archive \
-               fec.archive wpa_supplicant.git \
+               fec.archive \
                usb_host.archive dwc_otg_host.git usb_hid.archive \
                usb_modem.archive usb_net.archive
 
@@ -97,17 +97,9 @@ DIR(fec)     := $(SRC_DIR_FEC)
 TAR_OPT(fec) := --strip-components=1  --files-from - < <(sed 's/-x.x.x/-$(VERSION_FEC)/g'     $(REP_DIR)/fec.list)
 HASH_INPUT   += $(REP_DIR)/fec.list
 
-#
-# wpa_supplicant sources
-#
-URL(wpa_supplicant) := git://w1.fi/srv/git/hostap.git
-REV(wpa_supplicant) := 25bd4e7beb582509596fe60cb3591e1299f3121b
-DIR(wpa_supplicant) := src/app/wpa_supplicant
-
 #
 # Patches
 #
-PATCHES := $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/wpa*.patch)))
 PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/lxip*.patch)))
 PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/intel*.patch)))
 PATCHES += $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/usb_host*.patch)))
@@ -127,9 +119,6 @@ PATCH_OPT(patches/lxip_request_sock.patch) := $(LXIP_OPT)
 PATCH_OPT(patches/lxip_sk_wq.patch)        := $(LXIP_OPT)
 PATCH_OPT(patches/lxip_skbuff_cast.patch)  := $(LXIP_OPT)
 
-# WPA supplicant
-PATCH_OPT(patches/wpa_supplicant.patch) := -p1 -d ${DIR(wpa_supplicant)}
-
 # USB HOST
 USB_HOST_OPT = -p1 -d$(SRC_DIR_USB_HOST)
 PATCH_OPT(patches/usb_host_mem.patch)               := $(USB_HOST_OPT)

repos/dde_linux/ports/wpa_supplicant.hash

@@ -0,0 +1 @@
+99cb873478b28fde24664d6a587ee5df166cd516

repos/dde_linux/ports/wpa_supplicant.port

@@ -0,0 +1,20 @@
+LICENSE     := BSD-3-Clause
+VERSION     := git
+DOWNLOADS   := wpa_supplicant.git
+
+#
+# wpa_supplicant sources
+#
+URL(wpa_supplicant) := git://w1.fi/srv/git/hostap.git
+REV(wpa_supplicant) := 25bd4e7beb582509596fe60cb3591e1299f3121b
+DIR(wpa_supplicant) := src/app/wpa_supplicant
+
+#
+# Patches
+#
+PATCHES := $(addprefix patches/,$(notdir $(wildcard $(REP_DIR)/patches/wpa*.patch)))
+
+# WPA supplicant
+PATCH_OPT(patches/wpa_supplicant.patch) := -p1 -d ${DIR(wpa_supplicant)}
+
+# vi: set ft=make :

repos/pc/recipes/src/pc_wifi_drv/content.mk

@@ -20,8 +20,8 @@ MIRROR_FROM_OS_DIR  := src/lib/genode_c_api/uplink.cc
 #
 
 DDE_LINUX_REP_DIR  := $(GENODE_DIR)/repos/dde_linux
-DDE_LINUX_PORT_DIR := $(call port_dir,$(DDE_LINUX_REP_DIR)/ports/dde_linux)
 
+WS_PORT_DIR    := $(call port_dir,$(DDE_LINUX_REP_DIR)/ports/wpa_supplicant)
 LIBNL_PORT_DIR := $(call port_dir,$(DDE_LINUX_REP_DIR)/ports/libnl)
 
 DDE_LINUX_LIB_MK := \
@@ -37,11 +37,11 @@ MIRROR_FROM_DDE_LINUX_DIR := $(DDE_LINUX_LIB_MK) \
                              $(shell cd $(DDE_LINUX_REP_DIR); find src/lib/wpa_driver_nl80211 -type f) \
                              $(shell cd $(DDE_LINUX_REP_DIR); find src/lib/wpa_supplicant -type f)
 
-MIRROR_FROM_DDE_LINUX_PORT_DIR := $(shell cd $(DDE_LINUX_PORT_DIR); find src/app/wpa_supplicant -type f)
+MIRROR_FROM_WS_PORT_DIR    := $(shell cd $(WS_PORT_DIR); find src/app/wpa_supplicant -type f)
-MIRROR_FROM_LIBNL_PORT_DIR     := $(shell cd $(LIBNL_PORT_DIR); find src/lib/libnl -type f)
+MIRROR_FROM_LIBNL_PORT_DIR := $(shell cd $(LIBNL_PORT_DIR); find src/lib/libnl -type f)
 
 content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_OS_DIR) $(MIRROR_FROM_DDE_LINUX_DIR) \
-         $(MIRROR_FROM_DDE_LINUX_PORT_DIR) $(MIRROR_FROM_LIBNL_PORT_DIR) cleanup-wpa
+         $(MIRROR_FROM_WS_PORT_DIR) $(MIRROR_FROM_LIBNL_PORT_DIR) cleanup-wpa
 
 $(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
@@ -54,15 +54,15 @@ $(MIRROR_FROM_DDE_LINUX_DIR):
 	mkdir -p $(dir $@)
 	cp -r $(GENODE_DIR)/repos/dde_linux/$@ $@
 
-$(MIRROR_FROM_DDE_LINUX_PORT_DIR):
+$(MIRROR_FROM_WS_PORT_DIR):
 	mkdir -p $(dir $@)
-	cp -r $(DDE_LINUX_PORT_DIR)/$@ $@
+	cp -r $(WS_PORT_DIR)/$@ $@
 
 $(MIRROR_FROM_LIBNL_PORT_DIR):
 	mkdir -p $(dir $@)
 	cp -r $(LIBNL_PORT_DIR)/$@ $@
 
-cleanup-wpa: $(MIRROR_FROM_DDE_LINUX_PORT_DIR)
+cleanup-wpa: $(MIRROR_FROM_WS_PORT_DIR)
 	@for dir in .git doc eap_example hs20 mac80211_hwsim radius_example \
 		hostapd tests wlantest wpadebug wpaspy; do \
 		rm -rf src/app/wpa_supplicant/$$dir; done