aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-12-29 22:30:41 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2019-12-29 22:30:41 +0100
commit09af354e48e6693b3d47664c8279e74a5361161e (patch)
treeee4edd65e4b1e897b11c4ed7d3450acf95f553ab
parentNovember update (diff)
downloadandroid-wireguard-module-builder-09af354e48e6693b3d47664c8279e74a5361161e.tar.xz
android-wireguard-module-builder-09af354e48e6693b3d47664c8279e74a5361161e.zip
repo: use new wireguard-linux-compat repo for building
-rw-r--r--files/shim.make4
-rw-r--r--files/wireguard.xml2
-rw-r--r--kernels/bonito/do.bash2
-rw-r--r--kernels/crosshatch/do.bash2
-rw-r--r--kernels/marlin/do.bash2
5 files changed, 6 insertions, 6 deletions
diff --git a/files/shim.make b/files/shim.make
index 44d7997..ba09bb8 100644
--- a/files/shim.make
+++ b/files/shim.make
@@ -1,7 +1,7 @@
modules:
- @$(MAKE) -C $(KERNEL_SRC) M=$$(readlink -f ../WireGuard/src) modules
+ @$(MAKE) -C $(KERNEL_SRC) M=$$(readlink -f ../wireguard-linux-compat/src) modules
modules_install:
- @$(MAKE) -C $(KERNEL_SRC) M=$$(readlink -f ../WireGuard/src) modules_install
+ @$(MAKE) -C $(KERNEL_SRC) M=$$(readlink -f ../wireguard-linux-compat/src) modules_install
.PHONY: modules modules_install
diff --git a/files/wireguard.xml b/files/wireguard.xml
index 897429d..6a0bc72 100644
--- a/files/wireguard.xml
+++ b/files/wireguard.xml
@@ -1,4 +1,4 @@
<manifest>
<remote name="zx2c4" fetch="https://git.zx2c4.com/" />
- <project remote="zx2c4" name="WireGuard" path="WireGuard" revision="master" />
+ <project remote="zx2c4" name="wireguard-linux-compat" path="wireguard-linux-compat" revision="master" />
</manifest>
diff --git a/kernels/bonito/do.bash b/kernels/bonito/do.bash
index 0bbc21a..80597d1 100644
--- a/kernels/bonito/do.bash
+++ b/kernels/bonito/do.bash
@@ -1,6 +1,6 @@
#!/bin/bash
set -ex
echo 'EXT_MODULES="${EXT_MODULES} wireguard"' >> private/msm-google/build.config.common
-echo 'ccflags-y += -Wno-unused-variable' >> WireGuard/src/Kbuild
+echo 'ccflags-y += -Wno-unused-variable' >> wireguard-linux-compat/src/Kbuild
./build/build.sh
readlink -f out/android-msm-pixel-4.9/dist/wireguard.ko >&7
diff --git a/kernels/crosshatch/do.bash b/kernels/crosshatch/do.bash
index 0bbc21a..80597d1 100644
--- a/kernels/crosshatch/do.bash
+++ b/kernels/crosshatch/do.bash
@@ -1,6 +1,6 @@
#!/bin/bash
set -ex
echo 'EXT_MODULES="${EXT_MODULES} wireguard"' >> private/msm-google/build.config.common
-echo 'ccflags-y += -Wno-unused-variable' >> WireGuard/src/Kbuild
+echo 'ccflags-y += -Wno-unused-variable' >> wireguard-linux-compat/src/Kbuild
./build/build.sh
readlink -f out/android-msm-pixel-4.9/dist/wireguard.ko >&7
diff --git a/kernels/marlin/do.bash b/kernels/marlin/do.bash
index e9b4526..c53b155 100644
--- a/kernels/marlin/do.bash
+++ b/kernels/marlin/do.bash
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex
BASE="$(readlink -f "$(dirname "$(readlink -f "$0")")")"
-patch -d WireGuard -p1 < "$BASE/tvec_base_deferrable-hack.patch"
+patch -d wireguard-linux-compat -p1 < "$BASE/tvec_base_deferrable-hack.patch"
echo 'EXT_MODULES="${EXT_MODULES} wireguard"' >> private/msm-google/build.config
./build/build.sh
readlink -f out/android-msm-marlin-3.18/dist/wireguard.ko >&7