From 1636942166d7ef5b1603a1229b3864fb45f187d6 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 30 Oct 2024 15:37:33 -0700
Subject: [PATCH 1/3] Link ncurses6 to ncurses 5 on Ubuntu 24.04 for Vivado

---
 bin/wally-package-install.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index 725d3b2011..ce79dc5755 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -123,5 +123,14 @@ else
     eval "$UPDATE_COMMAND"
     # Install packages listed above using appropriate package manager
     sudo $PACKAGE_MANAGER install -y "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}" "${VIVADO_PACKAGES[@]}"
+
+    # Post install steps
+    # Vivado looks for ncurses5 libraries, but Ubuntu 24.04 only has ncurses6
+    # Create symbolic links to the ncurses6 libraries to fool Vivado
+    if (( UBUNTU_VERSION >= 24 )); then
+        ln -vsf /lib/x86_64-linux-gnu/libncurses.so.6 /lib/x86_64-linux-gnu/libncurses.so.5
+        ln -vsf /lib/x86_64-linux-gnu/libtinfo.so.6 /lib/x86_64-linux-gnu/libntinfo.so.5
+    fi
+
     echo -e "${SUCCESS_COLOR}Packages successfully installed.${ENDC}"
 fi

From e8bcbb42ac405cfa6ab8c7b510dcfc00ad898dbf Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 30 Oct 2024 15:39:01 -0700
Subject: [PATCH 2/3] Add sudo

---
 bin/wally-package-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index ce79dc5755..1fc003189b 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -128,8 +128,8 @@ else
     # Vivado looks for ncurses5 libraries, but Ubuntu 24.04 only has ncurses6
     # Create symbolic links to the ncurses6 libraries to fool Vivado
     if (( UBUNTU_VERSION >= 24 )); then
-        ln -vsf /lib/x86_64-linux-gnu/libncurses.so.6 /lib/x86_64-linux-gnu/libncurses.so.5
-        ln -vsf /lib/x86_64-linux-gnu/libtinfo.so.6 /lib/x86_64-linux-gnu/libntinfo.so.5
+        sudo ln -vsf /lib/x86_64-linux-gnu/libncurses.so.6 /lib/x86_64-linux-gnu/libncurses.so.5
+        sudo ln -vsf /lib/x86_64-linux-gnu/libtinfo.so.6 /lib/x86_64-linux-gnu/libntinfo.so.5
     fi
 
     echo -e "${SUCCESS_COLOR}Packages successfully installed.${ENDC}"

From 51800ad4d1e3429e3df67792f020c9e6a9301348 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Wed, 30 Oct 2024 15:40:38 -0700
Subject: [PATCH 3/3] Fix installation workflow check paths

---
 .github/workflows/install.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index b87f4f116b..b065cd924f 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -18,7 +18,7 @@ on:
     paths:
       - 'bin/wally-tool-chain-install.sh'
       - 'bin/wally-distro-check.sh'
-      - 'wally-package-install.sh'
+      - 'bin/wally-package-install.sh'
   schedule:
     - cron: "0 7 * * 3" # Run at 12:00 AM Pacific Time on Wednesdays