diff --git a/projects/rocdecode/.jenkins/common.groovy b/projects/rocdecode/.jenkins/common.groovy index 986e1c73c5..2d3a36556f 100644 --- a/projects/rocdecode/.jenkins/common.groovy +++ b/projects/rocdecode/.jenkins/common.groovy @@ -51,14 +51,16 @@ def runPackageCommand(platform, project) { def packageHelper = platform.makePackage(platform.jenkinsLabel, "${project.paths.project_build_prefix}/build/release") - String packageType = "" - String packageInfo = "" + String packageType = '' + String packageInfo = '' + String packageDetail = '' String osType = '' String packageRunTime = '' if (platform.jenkinsLabel.contains('centos') || platform.jenkinsLabel.contains('rhel') || platform.jenkinsLabel.contains('sles')) { packageType = 'rpm' packageInfo = 'rpm -qlp' + packageDetail = 'rpm -qi' packageRunTime = 'rocdecode-*' if (platform.jenkinsLabel.contains('sles')) { @@ -75,6 +77,7 @@ def runPackageCommand(platform, project) { { packageType = 'deb' packageInfo = 'dpkg -c' + packageDetail = 'dpkg -I' packageRunTime = 'rocdecode_*' if (platform.jenkinsLabel.contains('ubuntu20')) { @@ -96,6 +99,8 @@ def runPackageCommand(platform, project) { mv ${packageRunTime}.${packageType} package/${osType}-rocdecode.${packageType} mv Testing/Temporary/LastTest.log package/${osType}-LastTest.log mv Testing/Temporary/LastTestsFailed.log package/${osType}-LastTestsFailed.log + ${packageDetail} package/${osType}-rocdecode-dev.${packageType} + ${packageDetail} package/${osType}-rocdecode.${packageType} ${packageInfo} package/${osType}-rocdecode-dev.${packageType} ${packageInfo} package/${osType}-rocdecode.${packageType} """ diff --git a/projects/rocdecode/CMakeLists.txt b/projects/rocdecode/CMakeLists.txt index d0b5f6e2ef..22efba4c3f 100644 --- a/projects/rocdecode/CMakeLists.txt +++ b/projects/rocdecode/CMakeLists.txt @@ -187,6 +187,10 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND) # Set the dependent packages set(rocDecode_DEBIAN_PACKAGE_LIST "libva-dev, libdrm-dev") set(rocDecode_RPM_PACKAGE_LIST "libva-devel, libdrm-devel") + # Set the dev dependent packages + set(rocDecode_DEBIAN_DEV_PACKAGE_LIST "ffmpeg, libavcodec-dev, libavformat-dev, libswscale-dev") + # TBD - RPM packages need Fusion Packages + #set(rocDecode_RPM_DEV_PACKAGE_LIST "ffmpeg, libavcodec-devel, libavformat-devel, libswscale-devel") # '%{?dist}' breaks manual builds on debian systems due to empty Provides execute_process( @@ -209,7 +213,8 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND) set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS "rocm-core, ${rocDecode_DEBIAN_PACKAGE_LIST}") set(CPACK_DEBIAN_DEV_PACKAGE_NAME "${PROJECT_NAME}-dev") - set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${PROJECT_NAME}, rocm-core, ${rocDecode_DEBIAN_PACKAGE_LIST}") + set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS + "rocm-core, ${PROJECT_NAME}, ${rocDecode_DEBIAN_PACKAGE_LIST}, ${rocDecode_DEBIAN_DEV_PACKAGE_LIST}") # Debian package - specific variable for ASAN set(CPACK_DEBIAN_ASAN_PACKAGE_NAME "${PROJECT_NAME}-asan" ) set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${PROJECT_NAME}, rocm-core-asan, ${rocDecode_DEBIAN_PACKAGE_LIST}" ) @@ -218,7 +223,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND) set(CPACK_RPM_RUNTIME_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_RPM_RUNTIME_PACKAGE_REQUIRES "rocm-core, ${rocDecode_RPM_PACKAGE_LIST}") set(CPACK_RPM_DEV_PACKAGE_NAME "${PROJECT_NAME}-devel") - set(CPACK_RPM_DEV_PACKAGE_REQUIRES "${PROJECT_NAME}, rocm-core, ${rocDecode_RPM_PACKAGE_LIST}") + set(CPACK_RPM_DEV_PACKAGE_REQUIRES "rocm-core, ${PROJECT_NAME}, ${rocDecode_RPM_PACKAGE_LIST}") set(CPACK_RPM_RUNTIME_PACKAGE_PROVIDES "${PROJECT_NAME}") set(CPACK_RPM_RUNTIME_PACKAGE_OBSOLETES "${PROJECT_NAME}") set(CPACK_RPM_DEV_PACKAGE_PROVIDES "${PROJECT_NAME}-dev") @@ -262,11 +267,13 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND) endif() if(EXISTS ${RPMBUILD_EXE}) list(APPEND CPACK_GENERATOR "RPM") - message("-- ${White}AMD ROCm rocDecode -- CPACK_RPM_RUNTIME_PACKAGE_REQUIRES: ${CPACK_RPM_RUNTIME_PACKAGE_REQUIRES}${ColourReset}") + message("-- ${White}AMD ROCm rocDecode RunTime Package -- ${CPACK_RPM_DEV_PACKAGE_REQUIRES}${ColourReset}") + message("-- ${White}AMD ROCm rocDecode Dev Package -- ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}${ColourReset}") endif() if(EXISTS ${DPKG_EXE}) list(APPEND CPACK_GENERATOR "DEB") - message("-- ${White}AMD ROCm rocDecode -- CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS: ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS}${ColourReset}") + message("-- ${White}AMD ROCm rocDecode RunTime Package -- ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS}${ColourReset}") + message("-- ${White}AMD ROCm rocDecode Dev Package -- ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}${ColourReset}") endif() include(CPack)