DAHDI Linux: Update patch for missing vpmadt032 object file.

For now, the workaround previously in the script has been pulled out
into a formal Kbuild patch, so apply that instead.

See:
asterisk/dahdi-linux#78
asterisk/dahdi-linux#79

PHREAKSCRIPT-61 #close

Author: InterLinked1

phreaknet.sh

@@ -1956,7 +1956,8 @@ install_dahdi() {
 	git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/32.patch" # PR 32: xpp: Fix 32-bit builds
 
 	# Not yet merged
-	git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/77.diff"
+	git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/77.diff" # EXTRA_CFLAGS removal
+	git_custom_patch "https://patch-diff.githubusercontent.com/raw/asterisk/dahdi-linux/pull/79.diff" # vpmadt032 binary blob
 
 	# Fix or skip compilation of the XPP driver for 32-bit
 	# OS_ARCH=$( uname -m )
@@ -2022,40 +2023,6 @@ install_dahdi() {
 
 	# if KSRC/KVERS env vars are set, they will automatically propagate to children
 	$AST_MAKE $DAHDI_CFLAGS
-	if [ $? -ne 0 ]; then
-		if [ -f drivers/dahdi/vpmadt032_loader/vpmadt032_x86_64.o_shipped ]; then
-			# If this is PHREAKSCRIPT-61, apply temporary workaround for newer kernels failing with:
-			# No rule to make target 'vpmadt032_loader/vpmadt032_x86_64.o', needed by 'dahdi_vpmadt032_loader.o'.
-			#
-			# On newer kernels, there seems to be some kind of issue (not sure with what, exactly)
-			# where vpmadt032_x86_64.o doesn't exist. On older kernels, it's generated by a COPY:
-			# COPY    /usr/src/dahdi-linux-3.4.0/drivers/dahdi/vpmadt032_loader/vpmadt032_x86_64.o
-			#
-			# This is likely an issue somewhere in the DAHDI Linux build system, possibly drivers/dahdi/Kbuild...
-			# But until this issue is fixed, just manually copy the file at this point so compilation can continue.
-			ARCH=$( uname -m )
-			# This logic is from drivers/dahdi/Kbuild
-			if [ "$ARCH" = "i386" ]; then
-				MY_DAHDI_ARCH=x86_32
-			else
-				if [ "$ARCH" = "x86_64" ]; then
-					MY_DAHDI_ARCH=x86_64
-				else
-					grep "CONFIG_X86_32=y" /boot/config-$(uname -r)
-					if [ $? -eq 0 ]; then
-						MY_DAHDI_ARCH=x86_32
-					else
-						MY_DAHDI_ARCH=x86_64
-					fi
-				fi
-			fi
-			printf "Detected DAHDI_ARCH: '%s'\n" "$MY_DAHDI_ARCH"
-			echoerr "Manually performing COPY for 'vpmadt032_${MY_DAHDI_ARCH}.o'"
-			printf "COPY %s %s\n" drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o_shipped drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o
-			cp -n drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o_shipped drivers/dahdi/vpmadt032_loader/vpmadt032_${MY_DAHDI_ARCH}.o
-		fi
-		$AST_MAKE $DAHDI_CFLAGS
-	fi
 	if [ $? -ne 0 ]; then
 		die "DAHDI Linux compilation failed, aborting install"
 	fi