diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-05-26 17:18:11 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-05-26 17:18:11 +0200 |
| commit | 787b4aaac8505fbada61256b40fdb7b5ea150bf4 (patch) | |
| tree | 26b83a57b66e790071d8ea93826205dfc392de52 /scripts | |
| parent | 34e840e4c022033342e39cbc627888f2b4fcef69 (diff) | |
| download | vyos-build-787b4aaac8505fbada61256b40fdb7b5ea150bf4.tar.gz vyos-build-787b4aaac8505fbada61256b40fdb7b5ea150bf4.zip | |
Packages/modules: install accel-ppp and wireguard modules into right location
... previously the modules have been installed into /lib/modules/4.14.45 and not
4.14.45-amd64-vyos.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-packages | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build-packages b/scripts/build-packages index a4516fe4..fb577f3a 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -259,7 +259,7 @@ pkg_special.append( add_package('vyos-kernel', branch='linux-vyos-4.19.y', custo # # WireGuard Kernel Module # -wireguard_build_cmd = "echo 'src/wireguard.ko /lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\") > debian/wireguard-modules.install && " \ +wireguard_build_cmd = "echo 'src/wireguard.ko /lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")-amd64-vyos/extra > debian/wireguard-modules.install && " \ "KERNELDIR=" + repo_root + "/packages/vyos-kernel dpkg-buildpackage -b -us -uc -tc -j" + str(os.cpu_count()) pkg_special.append( add_package('vyos-wireguard', custombuild_cmd=wireguard_build_cmd) ) @@ -268,8 +268,8 @@ pkg_special.append( add_package('vyos-wireguard', custombuild_cmd=wireguard_buil # # Accell-PPP Package and Kernel Module # -accel_ppp_build_cmd = "echo 'lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")'/extra/*.ko' > debian/vyos-accel-ppp-ipoe-kmod.install && " \ - "sed -i 's#[0-9].[0-9][0-9].[0-9]*-amd64-vyos#'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")'#g' debian/rules && " \ +accel_ppp_build_cmd = "echo 'lib/modules/'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")-amd64-vyos/extra/*.ko > debian/vyos-accel-ppp-ipoe-kmod.install && " \ + "sed -i 's#[0-9].[0-9][0-9].[0-9]*-amd64-vyos#'$(cat " + repo_root + "/data/defaults.json | jq '.kernel_version' | tr -d \\\")'-amd64-vyos#g' debian/rules && " \ "KERNELDIR=" + repo_root + "/packages/vyos-kernel dpkg-buildpackage -b -us -uc -tc -j" + str(os.cpu_count()) pkg_special.append( add_package('vyos-accel-ppp', custombuild_cmd=accel_ppp_build_cmd) ) |