From 6e61837391b8cdcef0ada607c9af5bd50a790372 Mon Sep 17 00:00:00 2001 From: Martin Kennedy Date: Sun, 7 Apr 2019 22:14:01 -0400 Subject: [PATCH 1/2] Actually run `pwd` into a variable, instead of just quoting 'pwd' This fixes a bug in DKMS compilation introduced in commit 3fcba157. --- dkms-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dkms-install.sh b/dkms-install.sh index d2f06d1..c7c500e 100755 --- a/dkms-install.sh +++ b/dkms-install.sh @@ -7,7 +7,7 @@ else echo "About to run dkms install steps..." fi -DRV_DIR='pwd' +DRV_DIR="$(pwd)" DRV_NAME=rtl8812au DRV_VERSION=5.3.4 From b85108f07405929bac665103a013cf6cd85a2744 Mon Sep 17 00:00:00 2001 From: Martin Kennedy Date: Sun, 7 Apr 2019 22:32:42 -0400 Subject: [PATCH 2/2] Correct an if statement in the DKMS installer script This was introduced in commit 3b3346a. This does assume the Makefile is in the driver directory. --- dkms-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dkms-install.sh b/dkms-install.sh index c7c500e..547a6f4 100755 --- a/dkms-install.sh +++ b/dkms-install.sh @@ -20,7 +20,7 @@ RESULT=$? echo "Finished running dkms install steps." -if defined(CONFIG_DISABLE_IPV6) +if grep -q -e "^CONFIG_DISABLE_IPV6 = y$" "$DRV_DIR/Makefile" ; then if echo "net.ipv6.conf.all.disable_ipv6 = 1 net.ipv6.conf.default.disable_ipv6 = 1 net.ipv6.conf.lo.disable_ipv6 = 1" >> /etc/sysctl.conf; then @@ -29,6 +29,6 @@ if defined(CONFIG_DISABLE_IPV6) else echo "Could not disable IPv6" fi -endif +fi exit $RESULT