Adding support for RHEL9.* (#7258)

saumyag-xilinx · saumya garg · web-flow · commit 43cd0aa671e5 · 2023-01-09T23:03:14.000+05:30
Co-authored-by: saumya garg &lt;saumyag@xilinx.com&gt;
diff --git a/build/covbuild.sh b/build/covbuild.sh
@@ -20,7 +20,7 @@ set -e
 # Update to scan.coverity.com using the version and description per covbuild.sh output
 # Make sure to upload from a host with direct access to xrt.tgz (342M)
 
-OSDIST=`lsb_release -i |awk -F: '{print tolower($2)}' | tr -d ' \t'`
+OSDIST=`awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}'`
 BUILDDIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 CORE=`grep -c ^processor /proc/cpuinfo`
 CMAKE=cmake
diff --git a/build/cross_compile.sh b/build/cross_compile.sh
@@ -150,8 +150,8 @@ else
         OS_TARGET=${OS_TARGET^}
         VERSION=$VERSION_ID
     else
-        OS_TARGET=`cat ${SYSROOT}/etc/redhat-release | awk '{print $1}' | tr -d '"'`
-        VERSION=`cat ${SYSROOT}/etc/redhat-release | awk '{print $4}' | tr -d '"'`
+        OS_TARGET=`awk -F= '$1=="ID" {print $2}' ${SYSROOT}/etc/os-release | tr -d '"' | awk '{print tolower($1)}'`
+        VERSION=`awk -F= '$1=="VERSION_ID" {print $2}' ${SYSROOT}/etc/os-release | tr -d '"'`
     fi  
     echo "INFO: Cross Compiling XRT for $AARCH and Target System $OS_TARGET, Version:$VERSION"
 fi
diff --git a/build/dbg.sh b/build/dbg.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-OSDIST=`lsb_release -i |awk -F: '{print tolower($2)}' | tr -d ' \t'`
+OSDIST=`awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}'`
 BUILDDIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 CORE=`grep -c ^processor /proc/cpuinfo`
 CMAKE=cmake
diff --git a/build/debian/xrt-xocl-dkms.prerm b/build/debian/xrt-xocl-dkms.prerm
@@ -33,13 +33,13 @@ version_line=$(grep ^PACKAGE_VERSION= "$dkms_file")
 eval "$version_line"
 echo "Removing version $PACKAGE_VERSION"
 
-lsb_release -si | grep -Eq "^RedHat|^CentOS"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^rhel|^centos"
 if [ $? -eq 0 ] && [ $1 -ge 1 ]; then
     echo "Cleanup is skipped for package upgrade/downgrade/re-install on RHEL/CentOS"
     exit 0
 fi
 
-lsb_release -si | grep -Eq "^Ubuntu|^Debian"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^ubuntu|^debian"
 if [ $? -eq 0 ] && [ "$1" = "upgrade" ]; then
     echo "Unregistering old XRT Linux kernel module sources $PACKAGE_VERSION from dkms on Ubuntu/Debian"
     dkms remove -m xrt -v "$PACKAGE_VERSION" --all
diff --git a/src/CMake/config/prerm-aws.in b/src/CMake/config/prerm-aws.in
@@ -45,7 +45,7 @@ if [ $? -eq 1 ]; then
 fi
 
 #In case prerm is called after postinst on centos, make sure not to stop mpd
-lsb_release -si | grep -Eq "^RedHat|^CentOS"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^rhel|^centos"
 if [ $? -eq 0 ] && [ $1 -ge 1 ]; then
     echo "Cleanup is skipped for package upgrade/downgrade/re-install on RHEL/CentOS"
     exit 0
diff --git a/src/CMake/config/prerm-azure.in b/src/CMake/config/prerm-azure.in
@@ -33,7 +33,7 @@
 DIR=/opt/xilinx/xrt
 
 #In case prerm is called after postinst on centos, make sure not to stop mpd
-lsb_release -si | grep -Eq "^RedHat|^CentOS"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^rhel|^centos"
 if [ $? -eq 0 ] && [ $1 -ge 1 ]; then
     echo "Cleanup is skipped for package upgrade/downgrade/re-install on RHEL/CentOS"
     exit 0
diff --git a/src/CMake/config/prerm-container.in b/src/CMake/config/prerm-container.in
@@ -31,7 +31,7 @@
 # in postinst script.
 
 #In case prerm is called after postinst on centos, make sure not to stop mpd
-lsb_release -si | grep -Eq "^RedHat|^CentOS"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^rhel|^centos"
 if [ $? -eq 0 ] && [ $1 -ge 1 ]; then
     echo "Cleanup is skipped for package upgrade/downgrade/re-install on RHEL/CentOS"
     exit 0
diff --git a/src/CMake/config/prerm.in b/src/CMake/config/prerm.in
@@ -30,13 +30,13 @@
 # configuration of the components and hence we want to handle the configuration
 # in postinst script.
 
-lsb_release -si | grep -Eq "^RedHat|^CentOS"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^rhel|^centos"
 if [ $? -eq 0 ] && [ $1 -ge 1 ]; then
     echo "Cleanup is skipped for package upgrade/downgrade/re-install on RHEL/CentOS"
     exit 0
 fi
 
-lsb_release -si | grep -Eq "^Ubuntu|^Debian"
+awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}' | grep -Eq "^ubuntu|^debian"
 if [ $? -eq 0 ] && [ "$1" = "upgrade" ]; then
     echo "Unregistering old XRT Linux kernel module sources @XRT_VERSION_STRING@ from dkms on Ubuntu/Debian"
     dkms remove -m xrt -v @XRT_VERSION_STRING@ --all
diff --git a/src/CMake/cpackLin.cmake b/src/CMake/cpackLin.cmake
@@ -33,14 +33,15 @@ if (DEFINED CROSS_COMPILE)
   set(CPACK_REL_VER ${LINUX_VERSION})
 else()
   execute_process(
-      COMMAND lsb_release -r -s
+      COMMAND awk -F= "$1==\"VERSION_ID\" {print $2}" /etc/os-release
+      COMMAND tr -d "\""
       OUTPUT_VARIABLE CPACK_REL_VER
       OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 endif()
 
 SET(PACKAGE_KIND "TGZ")
-if (${LINUX_FLAVOR} MATCHES "^(Ubuntu|Debian)")
+if (${LINUX_FLAVOR} MATCHES "^(ubuntu|debian)")
   execute_process(
     COMMAND dpkg --print-architecture
     OUTPUT_VARIABLE CPACK_ARCH
@@ -66,7 +67,7 @@ if (${LINUX_FLAVOR} MATCHES "^(Ubuntu|Debian)")
   endif()
 
   SET(CPACK_DEBIAN_AWS_PACKAGE_DEPENDS "xrt (>= ${XRT_VERSION_MAJOR}.${XRT_VERSION_MINOR}.${XRT_VERSION_PATCH})")
-  SET(CPACK_DEBIAN_XRT_PACKAGE_DEPENDS "ocl-icd-libopencl1 (>= 2.2.0), lsb-release, dkms (>= 2.2.0), udev, python3")
+  SET(CPACK_DEBIAN_XRT_PACKAGE_DEPENDS "ocl-icd-libopencl1 (>= 2.2.0), dkms (>= 2.2.0), udev, python3")
 
   if (${XRT_DEV_COMPONENT} STREQUAL "xrt")
     # applications link with -luuid
@@ -95,7 +96,7 @@ if (${LINUX_FLAVOR} MATCHES "^(Ubuntu|Debian)")
     SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_XRT_PACKAGE_DEPENDS})
   endif()
 
-elseif (${LINUX_FLAVOR} MATCHES "^(RedHat|CentOS|Amazon|Fedora|SUSE)")
+elseif (${LINUX_FLAVOR} MATCHES "^(rhel|centos|amzn|fedora|sles)")
   execute_process(
     COMMAND uname -m
     OUTPUT_VARIABLE CPACK_ARCH
@@ -123,10 +124,10 @@ elseif (${LINUX_FLAVOR} MATCHES "^(RedHat|CentOS|Amazon|Fedora|SUSE)")
   SET(CPACK_RPM_CONTAINER_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/container/prerm")
   SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/local" "/usr/src" "/opt" "/etc/OpenCL" "/etc/OpenCL/vendors" "/usr/lib" "/usr/lib/pkgconfig" "/usr/lib64/pkgconfig" "/lib" "/lib/firmware")
   SET(CPACK_RPM_AWS_PACKAGE_REQUIRES "xrt >= ${XRT_VERSION_MAJOR}.${XRT_VERSION_MINOR}.${XRT_VERSION_PATCH}")
-  if (${LINUX_FLAVOR} MATCHES "^(SUSE)")
-    SET(CPACK_RPM_XRT_PACKAGE_REQUIRES "ocl-icd-devel >= 2.2, lsb-release, dkms >= 2.2.0, python3 >= 3.6")
+  if (${LINUX_FLAVOR} MATCHES "^(sles)")
+    SET(CPACK_RPM_XRT_PACKAGE_REQUIRES "ocl-icd-devel >= 2.2, dkms >= 2.2.0, python3 >= 3.6")
   else()
-    SET(CPACK_RPM_XRT_PACKAGE_REQUIRES "ocl-icd >= 2.2, redhat-lsb-core, dkms >= 2.5.0, python3 >= 3.6")
+    SET(CPACK_RPM_XRT_PACKAGE_REQUIRES "ocl-icd >= 2.2, dkms >= 2.5.0, python3 >= 3.6")
   endif()
 
   if (${XRT_DEV_COMPONENT} STREQUAL "xrt")
@@ -158,7 +159,7 @@ endif()
 # On Amazon Linux CPACK_REL_VER is just '2' and it is hard to
 # distinguish it as AL package, so adding CPACK_FLOVOR (eg: amzn) 
 # to package name
-if (${LINUX_FLAVOR} MATCHES "^Amazon")
+if (${LINUX_FLAVOR} MATCHES "^amzn")
   execute_process(
     COMMAND awk -F= "$1==\"ID\" {print $2}" /etc/os-release
     COMMAND tr -d "\""
diff --git a/src/CMake/nativeLnx.cmake b/src/CMake/nativeLnx.cmake
@@ -41,15 +41,19 @@ ELSE(GIT_FOUND)
 endif(GIT_FOUND)
 
 # --- LSB Release ---
-find_program(LSB_RELEASE lsb_release)
 find_program(UNAME uname)
 
-execute_process(COMMAND ${LSB_RELEASE} -is
+execute_process(
+  COMMAND awk -F= "$1==\"ID\" {print $2}" /etc/os-release
+  COMMAND tr -d "\""
+  COMMAND awk "{print tolower($1)}"
   OUTPUT_VARIABLE LINUX_FLAVOR
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-execute_process(COMMAND ${LSB_RELEASE} -rs
+execute_process(
+  COMMAND awk -F= "$1==\"VERSION_ID\" {print $2}" /etc/os-release
+  COMMAND tr -d "\""
   OUTPUT_VARIABLE LINUX_VERSION
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
diff --git a/src/CMake/pkgconfig.cmake b/src/CMake/pkgconfig.cmake
@@ -3,9 +3,9 @@
 #
 message("-- Preparing XRT pkg-config")
 
-if (${LINUX_FLAVOR} MATCHES "^(Ubuntu)")
+if (${LINUX_FLAVOR} MATCHES "^(ubuntu)")
   set(XRT_PKG_CONFIG_DIR "/usr/lib/pkgconfig")
-elseif (${LINUX_FLAVOR} MATCHES "^(RedHat|CentOS|Amazon|Fedora|SUSE)")
+elseif (${LINUX_FLAVOR} MATCHES "^(rhel|centos|amzn|fedora|sles)")
   set(XRT_PKG_CONFIG_DIR "/usr/lib64/pkgconfig")
 else ()
   set(XRT_PKG_CONFIG_DIR "/usr/share/pkgconfig")
diff --git a/src/python/pybind11/CMakeLists.txt b/src/python/pybind11/CMakeLists.txt
@@ -25,11 +25,11 @@ else()
 endif(CMAKE_VERSION VERSION_LESS "3.12")
 
 if (HAS_PYTHON)
-  if (${LINUX_FLAVOR} MATCHES "^(Ubuntu|Debian)")
+  if (${LINUX_FLAVOR} MATCHES "^(ubuntu|debian)")
     SET(PKGDIR "dist-packages")
-  elseif (${LINUX_FLAVOR} MATCHES "^(RedHat|CentOS|Amazon|Fedora|SUSE)")
+  elseif (${LINUX_FLAVOR} MATCHES "^(rhel|centos|amzn|fedora|sles)")
     SET(PKGDIR "site-packages")
-  endif(${LINUX_FLAVOR} MATCHES "^(Ubuntu|Debian)")
+  endif(${LINUX_FLAVOR} MATCHES "^(ubuntu|debian)")
 
   find_package(pybind11 2.6.0 REQUIRED PATHS "/usr/local/lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/${PKGDIR}/pybind11" "/usr/lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/${PKGDIR}/pybind11")
 endif(HAS_PYTHON)
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/lib/libxdma.c b/src/runtime_src/core/pcie/driver/linux/xocl/lib/libxdma.c
@@ -4344,7 +4344,7 @@ MODULE_AUTHOR("Xilinx, Inc.");
 MODULE_DESCRIPTION(DRV_MODULE_DESC);
 MODULE_VERSION(DRV_MODULE_VERSION);
 MODULE_LICENSE("GPL v2");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0) || defined(RHEL_9_0_GE)
 MODULE_IMPORT_NS(DMA_BUF);
 #endif
 
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.h b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.h
@@ -70,7 +70,7 @@
 #define XOCL_BO_ARE  (1 << 26)
 
 // Linux 5.18 uses iosys-map instead of dma-buf-map
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) || defined(RHEL_8_7_GE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) || defined(RHEL_8_7) || defined(RHEL_9_1_GE)
 	#define XOCL_MAP_TYPE iosys_map
 	#define XOCL_MAP_SET_VADDR iosys_map_set_vaddr
 	#define XOCL_MAP_IS_NULL iosys_map_is_null
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c
@@ -2012,6 +2012,6 @@ MODULE_VERSION(XRT_DRIVER_VERSION);
 MODULE_DESCRIPTION(XOCL_DRIVER_DESC);
 MODULE_AUTHOR("Lizhi Hou <lizhi.hou@xilinx.com>");
 MODULE_LICENSE("GPL v2");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)  || defined(RHEL_9_0_GE)
 MODULE_IMPORT_NS(DMA_BUF);
 #endif
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h
@@ -169,12 +169,18 @@
 #endif
 
 #if defined(RHEL_RELEASE_CODE)
+#if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 1)
+#define RHEL_9_1_GE
+#endif
+#if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 0)
+#define RHEL_9_0_GE
+#endif
+#if RHEL_RELEASE_CODE == RHEL_RELEASE_VERSION(8, 7)
+#define RHEL_8_7
+#endif
 #if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 5)
 #define RHEL_8_5_GE
 #endif
-#if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 7)
-#define RHEL_8_7_GE
-#endif
 #endif
 
 #if defined(RHEL_RELEASE_CODE)
diff --git a/src/runtime_src/tools/scripts/pkg_hw_platform.sh b/src/runtime_src/tools/scripts/pkg_hw_platform.sh
@@ -679,7 +679,7 @@ doxsabin()
 
 dodebdev()
 {
-    uRel=`lsb_release -r -s`
+    uRel=`awk -F= '$1=="VERSION_ID" {print $2}' /etc/os-release | tr -d '"'`
     dir=debbuild/$xsa-$version-dev_${uRel}
     pkg_dirname=debbuild/$xsa-dev-${version}-${revision}_${uRel}
     pkgdir=$opt_pkgdir/$pkg_dirname
@@ -730,7 +730,7 @@ EOF
 
 dodeb()
 {
-    uRel=`lsb_release -r -s`
+    uRel=`awk -F= '$1=="VERSION_ID" {print $2}' /etc/os-release | tr -d '"'`
     dir=debbuild/$xsa-${version}_${uRel}
     pkg_dirname=debbuild/$xsa-${version}-${revision}_${uRel}
     pkgdir=$opt_pkgdir/$pkg_dirname
diff --git a/src/runtime_src/tools/scripts/pkgapp.sh b/src/runtime_src/tools/scripts/pkgapp.sh
@@ -129,7 +129,7 @@ done < "$app_dep"
 
 dodeb()
 {
-    uRel=`lsb_release -r -s`
+    uRel=`awk -F= '$1=="VERSION_ID" {print $2}' /etc/os-release | tr -d '"'`
     dir=debbuild/$app_name-$app_ver_${uRel}
     mkdir -p $opt_pkgdir/$dir/DEBIAN
 cat <<EOF > $opt_pkgdir/$dir/DEBIAN/control
@@ -205,7 +205,7 @@ EOF
     echo "================================================================"
 }
 
-FLAVOR=`lsb_release -i |awk -F: '{print tolower($2)}' | tr -d ' \t'`
+FLAVOR=`awk -F= '$1=="ID" {print $2}' /etc/os-release | tr -d '"' | awk '{print tolower($1)}'`
 
 if [[ $FLAVOR == "centos" ]]; then
     dorpm
diff --git a/src/runtime_src/tools/scripts/pkgdsa.sh b/src/runtime_src/tools/scripts/pkgdsa.sh
@@ -704,7 +704,7 @@ dodsabin()
 
 dodebdev()
 {
-    uRel=`lsb_release -r -s`
+    uRel=`awk -F= '$1=="VERSION_ID" {print $2}' /etc/os-release | tr -d '"'`
     dir=debbuild/$dsa-$version-dev_${uRel}
     pkg_dirname=debbuild/$dsa-dev-${version}-${revision}_${uRel}
     pkgdir=$opt_pkgdir/$pkg_dirname
@@ -755,7 +755,7 @@ EOF
 
 dodeb()
 {
-    uRel=`lsb_release -r -s`
+    uRel=`awk -F= '$1=="VERSION_ID" {print $2}' /etc/os-release | tr -d '"'`
     dir=debbuild/$dsa-${version}_${uRel}
     pkg_dirname=debbuild/$dsa-${version}-${revision}_${uRel}
     pkgdir=$opt_pkgdir/$pkg_dirname
diff --git a/src/runtime_src/tools/scripts/setup.csh b/src/runtime_src/tools/scripts/setup.csh
@@ -32,8 +32,8 @@ if ( $xrt_dir !~ */opt/xilinx/xrt ) then
     exit 1
 endif
 
-set OSDIST=`lsb_release -i |awk -F: '{print tolower($2)}' | tr -d ' \t'`
-set OSREL=`lsb_release -r |awk -F: '{print tolower($2)}' |tr -d ' \t' | awk -F. '{print $1*100+$2}'`
+set OSDIST=`cat /etc/os-release | grep -i "^ID=" | awk -F= '{print $2}'`
+set OSREL=`cat /etc/os-release | grep -i "^VERSION_ID=" | awk -F= '{print $2}' | tr -d '".'`
 
 if ( "$OSDIST" =~ "ubuntu" ) then
     if ( $OSREL < 1604 ) then
@@ -42,7 +42,7 @@ if ( "$OSDIST" =~ "ubuntu" ) then
     endif
 endif
 
-if ( "$OSDIST" =~ centos  || "$OSDIST" =~ redhat* ) then
+if ( "$OSDIST" =~ centos  || "$OSDIST" =~ rhel* ) then
     if ( $OSREL < 704 ) then
         echo "ERROR: Centos or RHEL release version must be 7.4 or later"
         exit 1
diff --git a/src/runtime_src/tools/scripts/setup.sh b/src/runtime_src/tools/scripts/setup.sh
@@ -8,8 +8,8 @@
 # be sourced from that location
 
 # Check OS version requirement
-OSDIST=`lsb_release -i |awk -F: '{print tolower($2)}' | tr -d ' \t'`
-OSREL=`lsb_release -r |awk -F: '{print tolower($2)}' |tr -d ' \t' | awk -F. '{print $1*100+$2}'`
+OSDIST=`cat /etc/os-release | grep -i "^ID=" | awk -F= '{print $2}'`
+OSREL=`cat /etc/os-release | grep -i "^VERSION_ID=" | awk -F= '{print $2}' | tr -d '".'`
 
 if [[ $OSDIST == "ubuntu" ]]; then
     if (( $OSREL < 1604 )); then
@@ -18,7 +18,7 @@ if [[ $OSDIST == "ubuntu" ]]; then
     fi
 fi
 
-if [[ $OSDIST == "centos" ]] || [[ $OSDIST == "redhat"* ]]; then
+if [[ $OSDIST == "centos" ]] || [[ $OSDIST == "rhel"* ]]; then
     if (( $OSREL < 704 )); then
         echo "ERROR: Centos or RHEL release version must be 7.4 or later"
         return 1
diff --git a/src/runtime_src/tools/scripts/xrtdeps.sh b/src/runtime_src/tools/scripts/xrtdeps.sh
diff --git a/src/runtime_src/tools/xclbinutil/CMakeLists.txt b/src/runtime_src/tools/xclbinutil/CMakeLists.txt
diff --git a/tests/mcdm/build.sh b/tests/mcdm/build.sh
diff --git a/tests/unit_test/build.sh b/tests/unit_test/build.sh
diff --git a/tests/xrt/build/build.sh b/tests/xrt/build/build.sh
