From 892cd4cecd283d0bcd906bf2a9c019cd2f55c273 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Thu, 14 Mar 2024 12:06:46 -0400 Subject: [PATCH] [#7525] Remove dependency on "super" package. --- .github/workflows/build-irods-debian.yml | 2 +- .github/workflows/build-irods-ubuntu.yml | 2 +- .github/workflows/linter-irods-clang-tidy.yml | 1 - cmake/packaging.cmake | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-irods-debian.yml b/.github/workflows/build-irods-debian.yml index ca51df40a3..57b31a023d 100644 --- a/.github/workflows/build-irods-debian.yml +++ b/.github/workflows/build-irods-debian.yml @@ -14,7 +14,7 @@ jobs: - name: Install Prerequisites run: | apt-get update -qq - apt-get install -qq apt-transport-https ca-certificates gnupg wget curl g++ make python3-dev unixodbc libcurl4-gnutls-dev libbz2-dev zlib1g-dev libpam0g-dev libssl-dev libxml2-dev unixodbc-dev python3-psutil super odbc-postgresql libkrb5-dev python3-distro + apt-get install -qq apt-transport-https ca-certificates gnupg wget curl g++ make python3-dev unixodbc libcurl4-gnutls-dev libbz2-dev zlib1g-dev libpam0g-dev libssl-dev libxml2-dev unixodbc-dev python3-psutil odbc-postgresql libkrb5-dev python3-distro - name: Install iRODS Externals run: | wget -qO - https://unstable.irods.org/irods-unstable-signing-key.asc | apt-key add - diff --git a/.github/workflows/build-irods-ubuntu.yml b/.github/workflows/build-irods-ubuntu.yml index 37771333c3..bd7d77842f 100644 --- a/.github/workflows/build-irods-ubuntu.yml +++ b/.github/workflows/build-irods-ubuntu.yml @@ -15,7 +15,7 @@ jobs: run: | apt-get update -qq apt-get install -qq dnsutils apt-transport-https ca-certificates - apt-get install -qq wget curl g++ make python3-dev unixodbc libcurl4-gnutls-dev libbz2-dev zlib1g-dev libpam0g-dev libssl-dev libxml2-dev unixodbc-dev python3-psutil super odbc-postgresql libkrb5-dev python3-distro + apt-get install -qq wget curl g++ make python3-dev unixodbc libcurl4-gnutls-dev libbz2-dev zlib1g-dev libpam0g-dev libssl-dev libxml2-dev unixodbc-dev python3-psutil odbc-postgresql libkrb5-dev python3-distro - name: Install libstdc++6 run: | apt-get install -qq software-properties-common diff --git a/.github/workflows/linter-irods-clang-tidy.yml b/.github/workflows/linter-irods-clang-tidy.yml index 85dc015b4c..6a76238c7d 100644 --- a/.github/workflows/linter-irods-clang-tidy.yml +++ b/.github/workflows/linter-irods-clang-tidy.yml @@ -32,7 +32,6 @@ jobs: libxml2-dev \ unixodbc-dev \ python-psutil \ - super \ odbc-postgresql \ libkrb5-dev \ python3-distro diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index 6a8fe88ec2..478ada084b 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -180,7 +180,7 @@ endif() ## Postgres database plugin package ####################################### set(CPACK_DEBIAN_${IRODS_PACKAGE_COMPONENT_POSTGRES_NAME_UPPERCASE}_PACKAGE_NAME "irods-database-plugin-postgres") -set(CPACK_DEBIAN_${IRODS_PACKAGE_COMPONENT_POSTGRES_NAME_UPPERCASE}_PACKAGE_DEPENDS "${IRODS_PACKAGE_DEPENDENCIES_STRING}, irods-server (= ${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), unixodbc, libodbc1, odbcinst, odbc-postgresql, postgresql-client, super, libc6") +set(CPACK_DEBIAN_${IRODS_PACKAGE_COMPONENT_POSTGRES_NAME_UPPERCASE}_PACKAGE_DEPENDS "${IRODS_PACKAGE_DEPENDENCIES_STRING}, irods-server (= ${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), unixodbc, libodbc1, odbcinst, odbc-postgresql, postgresql-client, libc6") set(CPACK_DEBIAN_${IRODS_PACKAGE_COMPONENT_POSTGRES_NAME_UPPERCASE}_PACKAGE_PROVIDES "irods-database-plugin-postgres (= ${CPACK_DEBIAN_PACKAGE_VERSION})") set(CPACK_DEBIAN_${IRODS_PACKAGE_COMPONENT_POSTGRES_NAME_UPPERCASE}_PACKAGE_CONFLICTS "irods-database-plugin-mysql, irods-database-plugin-oracle") set(CPACK_DEBIAN_${IRODS_PACKAGE_COMPONENT_POSTGRES_NAME_UPPERCASE}_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/plugins/database/packaging/preinst;${CMAKE_CURRENT_SOURCE_DIR}/plugins/database/packaging/postinst;${CMAKE_CURRENT_SOURCE_DIR}/plugins/database/packaging/postrm;")