From 16b5449e3d46042a7bb8a29cae0305f6e3e7432f Mon Sep 17 00:00:00 2001 From: Matheus Eduardo Garbelini Date: Tue, 7 Sep 2021 12:13:53 +0800 Subject: [PATCH] tiny fix --- CMakeLists.txt | 2 +- dissectors/build.sh | 6 ++++-- requirements.sh | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f96100..cfc3ecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.10) project( esp32_bluetooth_classic_sniffer diff --git a/dissectors/build.sh b/dissectors/build.sh index 98280ea..a51f7a6 100755 --- a/dissectors/build.sh +++ b/dissectors/build.sh @@ -2,6 +2,7 @@ PLUGIN_VERSION=2.0.0 WIRESHARK_INCLUDES=$(pkg-config wireshark --cflags-only-I) +WIRESHARK_PLUGINS_FOLDER="/home/$USER/.local/lib/wireshark/plugins/3.4/epan/" mkdir -p build @@ -38,5 +39,6 @@ clang -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DHAVE_PLUGINS -DPLUGIN echo "Building h4bcm.so" clang --std=gnu11 -fPIC -w -O3 -shared -o h4bcm.so build/packet-btbrlmp.c.o build/packet-h4bcm.c.o build/plugin.c.o -lwireshark -lwiretap -lwsutil -echo "Copying h4bcm.so to /usr/local/lib/wireshark/plugins/3.4/epan/" -sudo cp h4bcm.so /usr/local/lib/wireshark/plugins/3.4/epan/ +mkdir -p $WIRESHARK_PLUGINS_FOLDER +echo "Copying h4bcm.so to $WIRESHARK_PLUGINS_FOLDER" +sudo cp h4bcm.so $WIRESHARK_PLUGINS_FOLDER diff --git a/requirements.sh b/requirements.sh index dde8cbd..ede5bc6 100755 --- a/requirements.sh +++ b/requirements.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -echo -e "\nInstalling cmake, clang and software-properties-common" -sudo apt install cmake clang software-properties-common -y +echo -e "\nInstalling cmake, clang, zstd and software-properties-common" +sudo apt install cmake clang zstd software-properties-common -y echo -e "\n\nInstalling latest stable wireshark"