Add sonic_wpa_supplicant as submodule

Signed-off-by: Ze Gan <ganze718@gmail.com>
sonic-net · Dec 24, 2020 · 7169af2 · 7169af2
1 parent 7b969de
commit 7169af2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -85,3 +85,6 @@
 [submodule "src/sonic-mgmt-common"]
 	path = src/sonic-mgmt-common
 	url = https://github.com/Azure/sonic-mgmt-common.git
+[submodule "src/wpasupplicant/sonic-wpa-supplicant"]
+	path = src/wpasupplicant/sonic-wpa-supplicant
+	url = https://github.com/Azure/sonic-wpa-supplicant
diff --git a/rules/wpasupplicant.mk b/rules/wpasupplicant.mk
@@ -1,7 +1,6 @@
 # wpa package
 
-# WPASUPPLICANT_VERSION = hostap_2_9
-WPASUPPLICANT_VERSION = 2.9.0-12
+WPASUPPLICANT_VERSION = 2.9.0-14
 
 export WPASUPPLICANT_VERSION
 

diff --git a/src/wpasupplicant/Makefile b/src/wpasupplicant/Makefile
@@ -6,19 +6,8 @@ MAIN_TARGET = wpasupplicant_$(WPASUPPLICANT_VERSION)_$(CONFIGURED_ARCH).deb
 DERIVED_TARGETS = wpasupplicant-dbgsym_$(WPASUPPLICANT_VERSION)_$(CONFIGURED_ARCH).deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# Remove any stale files
-	rm -rf ./wpa
-
 	# Clone wpa repo
-	git clone https://github.com/Azure/sonic-wpa-supplicant.git
-	pushd ./sonic-wpa-supplicant/wpa_supplicant
-	# Reset HEAD to the commit of the proper tag
-	# NOTE: Using "git checkout <tag_name>" here detaches our HEAD,
-	# which stg doesn't like, so we use this method instead
-	# NOTE: For some reason, tags in the Debian monit repo are prefixed with "1%"
 	pushd ./sonic-wpa-supplicant
-	# git checkout wpa/$(WPASUPPLICANT_VERSION)
-	# Build source and Debian packages
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
 	popd
 

diff --git a/src/wpasupplicant/sonic-wpa-supplicant b/src/wpasupplicant/sonic-wpa-supplicant