From 262183c6a6974f8ef36f91549175927d27ad4f28 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 6 Oct 2022 23:19:20 +0200
Subject: accel-ppp: T4691: upgrade LUA dependency to version 5.4

---
 docker/Dockerfile                        | 16 +++++++++-------
 packages/linux-kernel/build-accel-ppp.sh |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fc7b3e5e..ee91e046 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -214,13 +214,6 @@ RUN apt-get update && apt-get install -y \
       pciutils \
       yasm
 
-# Packages needed for Accel-PPP
-RUN apt-get update && apt-get install -y \
-      liblua5.3-dev \
-      libssl1.1 \
-      libssl-dev \
-      libpcre3-dev
-
 # Packages needed for Wireguard
 RUN apt-get update && apt-get install -y \
       debhelper-compat \
@@ -624,6 +617,15 @@ RUN apt-get update && sudo apt-get install -y \
       runc \
       uidmap
 
+# 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
+RUN apt-get update && apt-get install -y \
+      liblua5.4-dev \
+      libssl1.1 \
+      libssl-dev \
+      libpcre3-dev
+
 #
 # fpm: a command-line program designed to help you build packages (e.g. deb)
 #
diff --git a/packages/linux-kernel/build-accel-ppp.sh b/packages/linux-kernel/build-accel-ppp.sh
index 45c3494e..423ce2d1 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.3 \
+    -DLUA=5.4 \
     -DMODULES_KDIR=${KERNEL_VERSION}${KERNEL_SUFFIX} \
     -DCPACK_TYPE=Debian11 ..
 make
-- 
cgit v1.2.3