From 644a88fffd04e838aca8c708ddea0630b3daf95a Mon Sep 17 00:00:00 2001
From: Luigi Cruz <luigifcruz@gmail.com>
Date: Tue, 4 Aug 2020 19:11:41 -0300
Subject: [PATCH] Fix GR Python & PortAudio

---
 builder/stage4/05-pisdr-uhd/00-run.sh           | 1 +
 builder/stage4/06-pisdr-gnuradio/00-packages-nr | 3 ++-
 builder/stage4/06-pisdr-gnuradio/00-run.sh      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/builder/stage4/05-pisdr-uhd/00-run.sh b/builder/stage4/05-pisdr-uhd/00-run.sh
index e0b4488..35b73f5 100755
--- a/builder/stage4/05-pisdr-uhd/00-run.sh
+++ b/builder/stage4/05-pisdr-uhd/00-run.sh
@@ -9,6 +9,7 @@ if [ ! -d "uhd" ]; then
 fi
 
 cd uhd/host
+git checkout UHD-3.15.LTS
 mkdir -p build
 cd build
 cmake -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a15 -Wno-psabi" \
diff --git a/builder/stage4/06-pisdr-gnuradio/00-packages-nr b/builder/stage4/06-pisdr-gnuradio/00-packages-nr
index 828f084..b854773 100644
--- a/builder/stage4/06-pisdr-gnuradio/00-packages-nr
+++ b/builder/stage4/06-pisdr-gnuradio/00-packages-nr
@@ -10,7 +10,8 @@ libqwt-dev
 libsdl1.2-dev
 libusb-1.0-0-dev
 libasound2-dev
-libportaudio-dev
+portaudio19-dev
+libportaudio2
 pulseaudio
 libjack-dev
 libgmp-dev
diff --git a/builder/stage4/06-pisdr-gnuradio/00-run.sh b/builder/stage4/06-pisdr-gnuradio/00-run.sh
index 477b408..845e45d 100755
--- a/builder/stage4/06-pisdr-gnuradio/00-run.sh
+++ b/builder/stage4/06-pisdr-gnuradio/00-run.sh
@@ -13,7 +13,7 @@ git checkout maint-3.8
 git submodule update --init --recursive
 mkdir -p build
 cd build
-echo 'export PYTHONPATH=/usr/local/lib/python3/dist-packages:$PYTHONPATH' >> ~/.bashrc
+echo 'export PYTHONPATH=/usr/local/lib/python3/dist-packages:$PYTHONPATH' >> /home/${FIRST_USER_NAME}/.bashrc
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 ..
 ninja install
 ldconfig