[DHCP relay]: Fix bug which could cause incorrect interface name asso…

…ciation (#1233)

* [DHCP relay]: Fix bug which could cause incorrect interface name association

* Add patches to series file and apply using stgit

* Update .gitignore in order to ignore downloaded and generated files

* Reorganize src/ subdirectories alphabetically in .gitignore

.gitignore

@@ -12,28 +12,31 @@ target/
 # Subdirectories in src
 src/hiredis/*
 !src/hiredis/Makefile
+src/igb/*
+!src/igb/Makefile
 src/initramfs-tools/*
 !src/initramfs-tools/Makefile
-src/redis/*
-!src/redis/Makefile
+src/isc-dhcp/*
+!src/isc-dhcp/Makefile
+!src/isc-dhcp/patch/
 src/libnl3/*
 !src/libnl3/Makefile
 src/libteam/*
 !src/libteam/Makefile
-src/snmpd/*
-!src/snmpd/Makefile
-src/thrift/*
-!src/thrift/Makefile
-src/sonic-device-data/src/device/
-src/sonic-device-data/src/debian/
-src/igb/*
-!src/igb/Makefile
 src/mpdecimal/*
 !src/mpdecimal/Makefile
 src/python3/*
 !src/python3/Makefile
+src/redis/*
+!src/redis/Makefile
+src/snmpd/*
+!src/snmpd/Makefile
+src/sonic-device-data/src/device/
+src/sonic-device-data/src/debian/
 src/supervisor/*
 !src/supervisor/Makefile
+src/thrift/*
+!src/thrift/Makefile
 
 # Autogenerated Dockerfiles
 dockers/docker-base/Dockerfile

src/isc-dhcp/Makefile

@@ -12,14 +12,17 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Clone isc-dhcp repo
 	git clone https://anonscm.debian.org/cgit/pkg-dhcp/isc-dhcp.git
 	pushd ./isc-dhcp
-	git checkout -f debian/$(ISC_DHCP_VERSION)
-	popd
 
-	# Apply patch
-	patch -p1 < isc-dhcp-$(ISC_DHCP_VERSION)_dhcrelay-custom-circuit_id-remote_id-and-bridge-iface-support.patch
+	# 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
+	git reset --hard debian/$(ISC_DHCP_VERSION)
+
+	# Apply patches
+	stg init
+	stg import -s ../patch/series
 
 	# Build source and Debian packages
-	pushd ./isc-dhcp
 	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
 	popd