Merge branch 'Xilinx:master' into master

Author: ManojTakasi

.github/workflows/xrt_ci.yml

@@ -8,7 +8,10 @@ env:
 on:
   pull_request_target:
     types: [opened, edited, synchronize]
-  
+
+concurrency:  
+  group: ${{ github.event.pull_request.head.repo.full_name }}-${{ github.event.pull_request.head.ref }}
+  cancel-in-progress: true 
 
 jobs:    
   build:    

CMakeLists.txt

@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.5.0)
 
 if (NOT WIN32)
   if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "/opt/xilinx" CACHE PATH "..." FORCE)
     message("-- Install prefix is default initialized to ${CMAKE_INSTALL_PREFIX}")
   endif()
 else()

build/build.sh

@@ -67,6 +67,7 @@ usage()
     echo "[-driver]                   Include building driver code"
     echo "[-checkpatch]               Run checkpatch.pl on driver code"
     echo "[-verbose]                  Turn on verbosity when compiling"
+    echo "[-install_prefix <path>]    set CMAKE_INSTALL_PREFIX to path"
     echo "[-ertbsp <dir>]             Path to directory with pre-downloaded BSP files for building ERT (default: download BSP files during build time)"
     echo "[-ertfw <dir>]              Path to directory with pre-built ert firmware (default: build the firmware)"
     echo ""
@@ -104,6 +105,7 @@ static_boost=""
 ertbsp=""
 ertfw=""
 werror=1
+xrt_install_prefix="/opt/xilinx"
 cmake_flags="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
 
 while [ $# -gt 0 ]; do
@@ -211,6 +213,11 @@ while [ $# -gt 0 ]; do
             verbose="VERBOSE=1"
             shift
             ;;
+        -install_prefix)
+            shift
+            xrt_install_prefix=$1
+            shift
+            ;;
         -with-static-boost)
             shift
             static_boost=$1
@@ -232,6 +239,9 @@ edge_dir=${EDGE_DIR:-Edge}
 # Disable with '-disable-werror' option.
 cmake_flags+=" -DXRT_ENABLE_WERROR=$werror"
 
+# set CMAKE_INSTALL_PREFIX
+cmake_flags+=" -DCMAKE_INSTALL_PREFIX=$xrt_install_prefix -DXRT_INSTALL_PREFIX=$xrt_install_prefix"
+
 here=$PWD
 cd $BUILDDIR
 

build/run.sh

@@ -98,7 +98,7 @@ if [ "X$em" != "X" ] ; then
 fi
 
 if [ "X$xrt" == "X" ] ; then
- xrt=$XRTBUILD/$rel/opt/xilinx/xrt
+ xrt=$XRTBUILD/$rel$/opt/xilinx/xrt
 fi
 
 if [[ "X$xrt" != "X" && -d "$xrt" ]] ; then

src/CMake/config/postinst-aws.in

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2019-2021 Xilinx, Inc. All rights reserved.
 
-nm /opt/xilinx/xrt/lib/libaws_mpd_plugin.so |grep 'fpga_mgmt' > /dev/null 2>&1
+nm @CMAKE_INSTALL_PREFIX@/xrt/lib/libaws_mpd_plugin.so |grep 'fpga_mgmt' > /dev/null 2>&1
 if [ $? -eq 1 ]; then
     if [ -n "`dkms status -m xrt-aws -v @XRT_VERSION_STRING@`" ]; then
         echo "Unloading old XRT Linux kernel modules"
@@ -39,10 +39,10 @@ if [ $? -eq 1 ]; then
     fi
 fi
 
-#create sym link to /opt/xilinx/xrt/lib/libmpd_plugin and restart mpd service
+#create sym link to @CMAKE_INSTALL_PREFIX@/xrt/lib/libmpd_plugin and restart mpd service
 echo "Install aws mpd plugin"
-rm -rf /opt/xilinx/xrt/lib/libmpd_plugin.so > /dev/null 2>&1
-ln -s /opt/xilinx/xrt/lib/libaws_mpd_plugin.so /opt/xilinx/xrt/lib/libmpd_plugin.so
+rm -rf @CMAKE_INSTALL_PREFIX@/xrt/lib/libmpd_plugin.so > /dev/null 2>&1
+ln -s @CMAKE_INSTALL_PREFIX@/xrt/lib/libaws_mpd_plugin.so @CMAKE_INSTALL_PREFIX@/xrt/lib/libmpd_plugin.so
 #make sure mpd automatically gets starts across reboot if plugin is installed
 systemctl enable mpd
 echo "Restart mpd service"

src/CMake/config/postinst-azure.in

@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2019-2021 Xilinx, Inc. All rights reserved.
 
-DIR=/opt/xilinx/xrt/
-#create sym link to /opt/xilinx/xrt/lib/libmpd_plugin and restart mpd service
+DIR=@CMAKE_INSTALL_PREFIX@/xrt/
+#create sym link to @CMAKE_INSTALL_PREFIX@/xrt/lib/libmpd_plugin and restart mpd service
 echo "Install azure mpd plugin"
 rm -rf $DIR/lib/libmpd_plugin.so > /dev/null 2>&1
 ln -s $DIR/lib/libazure_mpd_plugin.so $DIR/lib/libmpd_plugin.so

src/CMake/config/postinst-container.in

@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2019-2021 Xilinx, Inc. All rights reserved.
 
-#create sym link to /opt/xilinx/xrt/lib/libmpd_plugin and restart mpd service
+#create sym link to @XRT_INSTALL_PREFIX@/xrt/lib/libmpd_plugin and restart mpd service
 #stop msd service anyway
 systemctl stop msd > /dev/null 2>&1
 echo "Install container mpd plugin"
-rm -rf /opt/xilinx/xrt/lib/libmpd_plugin.so > /dev/null 2>&1
-ln -s /opt/xilinx/xrt/lib/libcontainer_mpd_plugin.so /opt/xilinx/xrt/lib/libmpd_plugin.so
+rm -rf @XRT_INSTALL_PREFIX@/xrt/lib/libmpd_plugin.so > /dev/null 2>&1
+ln -s @XRT_INSTALL_PREFIX@/xrt/lib/libcontainer_mpd_plugin.so @XRT_INSTALL_PREFIX@/xrt/lib/libmpd_plugin.so
 #make sure mpd automatically gets starts across reboot if plugin is installed
 systemctl enable mpd
 echo "Restart mpd service"

src/CMake/config/postinst.in

@@ -41,7 +41,7 @@ rmmodules()
     depmod -A
 }
 
-installdir=/opt/xilinx/xrt
+installdir=@CMAKE_INSTALL_PREFIX@/xrt
 systemddir=/etc/systemd/system
 
 msd_active=`systemctl is-active msd`

src/CMake/config/prerm-aws.in

@@ -30,18 +30,18 @@
 # configuration of the components and hence we want to handle the configuration
 # in postinst script.
 
-nm /opt/xilinx/xrt/lib/libaws_mpd_plugin.so |grep 'fpga_mgmt' > /dev/null 2>&1
+nm @XRT_INSTALL_PREFIX@/xrt/lib/libaws_mpd_plugin.so |grep 'fpga_mgmt' > /dev/null 2>&1
 if [ $? -eq 1 ]; then
     echo "Unloading old AWS Linux kernel modules"
-    modprobe -r awsmgmt
+    modprobe -r @CMAKE_INSTALL_PREFIX@
 
     echo "Unregistering AWS Linux kernel module sources @XRT_VERSION_STRING@ from dkms"
     dkms remove -m xrt-aws -v @XRT_VERSION_STRING@ --all
-    find /lib/modules -type f -name awsmgmt.ko -delete
-    find /lib/modules -type f -name awsmgmt.ko.kz -delete
+    find /lib/modules -type f -name @CMAKE_INSTALL_PREFIX@.ko -delete
+    find /lib/modules -type f -name @CMAKE_INSTALL_PREFIX@.ko.kz -delete
     depmod -A
 
-    rm -f /etc/udev/rules.d/10-awsmgmt.rules
+    rm -f /etc/udev/rules.d/10-@CMAKE_INSTALL_PREFIX@.rules
 fi
 
 #In case prerm is called after postinst on centos, make sure not to stop mpd
@@ -52,7 +52,7 @@ if [ $? -eq 0 ] && [ $1 -ge 1 ]; then
 fi
 
 echo "Remove mpd plugin"
-rm -rf /opt/xilinx/xrt/lib/libmpd_plugin.so > /dev/null 2>&1
+rm -rf @XRT_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
 

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=/opt/xilinx/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"