summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-10-08 20:20:38 +0200
committerChristian Poessinger <christian@poessinger.com>2022-10-08 20:20:38 +0200
commit7540a635eb786fb573f4672a0ce5f9d5662ff3b2 (patch)
tree7487769c58ee550858539e7a7d1ed7be8b0d8d7b
parent8bcce0ab6a21948b020e90c9d2fd21429d08915c (diff)
downloadvyos-build-7540a635eb786fb573f4672a0ce5f9d5662ff3b2.tar.gz
vyos-build-7540a635eb786fb573f4672a0ce5f9d5662ff3b2.zip
Revert: "accel-ppp: T4691: upgrade LUA dependency to version 5.4"
This reverts commit 262183c as Accel PPP has issues starting up.
-rw-r--r--docker/Dockerfile4
-rwxr-xr-xpackages/linux-kernel/build-accel-ppp.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 76190333..14613a87 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -622,9 +622,9 @@ RUN apt-get update && sudo apt-get install -y \
# Packages needed for Accel-PPP
# XXX: please note that this must be installed after nftable dependencies - otherwise
-# APT will remove liblua5.4-dev which breaks the Accel-PPP build
+# APT will remove liblua5.3-dev which breaks the Accel-PPP build
RUN apt-get update && apt-get install -y \
- liblua5.4-dev \
+ liblua5.3-dev \
libssl1.1 \
libssl-dev \
libpcre3-dev
diff --git a/packages/linux-kernel/build-accel-ppp.sh b/packages/linux-kernel/build-accel-ppp.sh
index 423ce2d1..45c3494e 100755
--- a/packages/linux-kernel/build-accel-ppp.sh
+++ b/packages/linux-kernel/build-accel-ppp.sh
@@ -22,7 +22,7 @@ cmake -DBUILD_IPOE_DRIVER=TRUE \
-DBUILD_VLAN_MON_DRIVER=TRUE \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKDIR=${KERNEL_DIR} \
- -DLUA=5.4 \
+ -DLUA=5.3 \
-DMODULES_KDIR=${KERNEL_VERSION}${KERNEL_SUFFIX} \
-DCPACK_TYPE=Debian11 ..
make