From ac1f14843a560b920b4c07360547cba4ff13268d Mon Sep 17 00:00:00 2001 From: Ronan Keryell Date: Tue, 2 Apr 2024 18:17:53 -0700 Subject: [PATCH] Fix CMake syntax bug which breaks package pre-removal Fix bugs introduced in commit 474773383ac75a0fa0045827877bfa210330b978 by https://github.com/Xilinx/XRT/pull/7835 Signed-off-by: Ronan Keryell --- src/CMake/config/prerm-azure.in | 2 +- src/CMake/config/prerm-container.in | 2 +- src/CMake/config/prerm.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CMake/config/prerm-azure.in b/src/CMake/config/prerm-azure.in index 82ba2105659..6034839d6df 100755 --- a/src/CMake/config/prerm-azure.in +++ b/src/CMake/config/prerm-azure.in @@ -30,7 +30,7 @@ # configuration of the components and hence we want to handle the configuration # in postinst script. -DIR=@@CMAKE_INSTALL_PREFIX@@/xrt +DIR=@CMAKE_INSTALL_PREFIX@/xrt #In case prerm is called after postinst on centos, make sure not to stop mpd awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^rhel|^centos" diff --git a/src/CMake/config/prerm-container.in b/src/CMake/config/prerm-container.in index c2685ac0025..2fec47e1328 100755 --- a/src/CMake/config/prerm-container.in +++ b/src/CMake/config/prerm-container.in @@ -38,7 +38,7 @@ if [ $? -eq 0 ] && [ $1 -ge 1 ]; then fi echo "Remove mpd plugin" -rm -rf @@CMAKE_INSTALL_PREFIX@@/xrt/lib/libmpd_plugin.so > /dev/null 2>&1 +rm -rf @CMAKE_INSTALL_PREFIX@/xrt/lib/libmpd_plugin.so > /dev/null 2>&1 systemctl disable mpd > /dev/null 2>&1 systemctl stop mpd > /dev/null 2>&1 diff --git a/src/CMake/config/prerm.in b/src/CMake/config/prerm.in index e582008970d..b38fce26175 100755 --- a/src/CMake/config/prerm.in +++ b/src/CMake/config/prerm.in @@ -57,7 +57,7 @@ rm -rf /etc/systemd/system/msd.service rm -rf /etc/systemd/system/mpd.service systemctl daemon-reload # Remove config file for MSD as well -@@CMAKE_INSTALL_PREFIX@@/xrt/bin/xbmgmt --legacy config --purge 2>&1 > /dev/null +@CMAKE_INSTALL_PREFIX@/xrt/bin/xbmgmt --legacy config --purge 2>&1 > /dev/null echo "Unloading old XRT Linux kernel modules" rmmod xocl @@ -82,7 +82,7 @@ echo "Cleaning up XMA..." rm -f /tmp/xma_shm_db echo "Cleaning up python..." -rm -f @@CMAKE_INSTALL_PREFIX@@/xrt/python/*.pyc -rm -f @@CMAKE_INSTALL_PREFIX@@/xrt/test/*.pyc +rm -f @CMAKE_INSTALL_PREFIX@/xrt/python/*.pyc +rm -f @CMAKE_INSTALL_PREFIX@/xrt/test/*.pyc exit 0