Skip to content

Commit 5da8537

Browse files
committed
T7935: Rewrite accel-ppp-ng script to use vpp-dev binaries
Rewrite accel-ppp-ng script to use vpp-dev binaries instead of building the whole VPP from sources
1 parent 5e292f5 commit 5da8537

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

scripts/package-build/linux-kernel/build-accel-ppp-ng.sh

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,11 @@
33
ARCH_TRIPLET=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
44
CWD=$(pwd)
55
KERNEL_VAR_FILE=${CWD}/kernel-vars
6-
VPP_INCLUDE_PATH="${CWD}/../vpp/vpp/src/vpp-api:${CWD}/../vpp/vpp/src:${CWD}/../vpp/vpp/build-root/build-vpp-native/vpp/CMakeFiles/vpp-api"
7-
VPP_LIBRARY_PATH="${CWD}/../vpp/vpp/build-root/build-vpp-native/vpp/CMakeFiles/debian/libvppinfra/usr/lib/${ARCH_TRIPLET}:${CWD}/../vpp/vpp/build-root/install-vpp-native/vpp/lib/${ARCH_TRIPLET}"
8-
VPP_LIB_CHECK_PATH="${CWD}/../vpp/vpp/build-root/build-vpp-native/vpp/CMakeFiles/debian/libvppinfra/usr/lib/${ARCH_TRIPLET}"
96

107
ACCEL_SRC=${CWD}/accel-ppp-ng
118

12-
# Build VPP as we need VPP libraries
13-
cd ../vpp/
14-
./build.py
15-
cd ${CWD}
16-
17-
if [ ! -d ${VPP_LIB_CHECK_PATH} ]; then
18-
echo "VPP source libraries not found"
19-
exit 1
20-
fi
9+
sudo apt-get update
10+
sudo apt-get install -y vpp-dev
2111

2212
if [ ! -d ${ACCEL_SRC} ]; then
2313
echo "Accel-PPP source not found"
@@ -56,7 +46,7 @@ cmake -DBUILD_IPOE_DRIVER=TRUE \
5646
-DMODULES_KDIR=${KERNEL_VERSION}${KERNEL_SUFFIX} \
5747
-DHAVE_VPP=1 \
5848
-DCPACK_TYPE=Debian12 ..
59-
CPATH="${VPP_INCLUDE_PATH}" LIBRARY_PATH="${VPP_LIBRARY_PATH}" make
49+
make
6050

6151
# Sign generated Kernel modules
6252
${CWD}/sign-modules.sh .

0 commit comments

Comments
 (0)