diff options
| author |   Sven Eden <sven.eden@prydeworx.com> | 2022-07-27 13:41:27 +0200 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2022-08-01 10:34:38 +0200 |
| commit | b19f0b8c64154a126e0cc38af89b4a58434c1c43 (patch) | |
| tree | ac1b5d2e2c4590b271876612631863c9b55ec1a0 | |
| parent | sci-misc/boinc: Apply the 7.20.2 updates to the live ebuild (diff) | |
| download | gentoo-b19f0b8c.tar.gz gentoo-b19f0b8c.tar.bz2 gentoo-b19f0b8c.zip | |
sci-misc/boinc: Simplify the init script
It is no longer neccessary to maintain CUDA/OpenCL symlinks.
[ flow: remove sed which became effectless ]
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Modified-by: Florian Schmaus <flow@gentoo.org>
| -rw-r--r-- | sci-misc/boinc/boinc-7.20.2-r2.ebuild | 1 | ||||
| -rw-r--r-- | sci-misc/boinc/boinc-9999.ebuild | 1 | ||||
| -rw-r--r-- | sci-misc/boinc/files/boinc.init.in | 49 |
3 files changed, 0 insertions, 51 deletions
diff --git a/sci-misc/boinc/boinc-7.20.2-r2.ebuild b/sci-misc/boinc/boinc-7.20.2-r2.ebuild index 4f714313eeff..2375df6ac7ea 100644 --- a/sci-misc/boinc/boinc-7.20.2-r2.ebuild +++ b/sci-misc/boinc/boinc-7.20.2-r2.ebuild @@ -161,7 +161,6 @@ src_install() { rm -r "${ED}"/etc || die "rm failed" find "${D}" -name '*.la' -delete || die "Removing .la files failed" - sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die newinitd ${PN}.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} } diff --git a/sci-misc/boinc/boinc-9999.ebuild b/sci-misc/boinc/boinc-9999.ebuild index b6be3bb05451..9689e98c8f56 100644 --- a/sci-misc/boinc/boinc-9999.ebuild +++ b/sci-misc/boinc/boinc-9999.ebuild @@ -164,7 +164,6 @@ src_install() { rm -r "${ED}"/etc || die "rm failed" find "${D}" -name '*.la' -delete || die "Removing .la files failed" - sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.init.in > ${PN}.init || die newinitd ${PN}.init ${PN} newconfd "${FILESDIR}"/${PN}.conf ${PN} } diff --git a/sci-misc/boinc/files/boinc.init.in b/sci-misc/boinc/files/boinc.init.in index 9ac9b11a930d..c95b49825fbe 100644 --- a/sci-misc/boinc/files/boinc.init.in +++ b/sci-misc/boinc/files/boinc.init.in @@ -41,53 +41,6 @@ create_work_directory() { return 0 } -fix_lib_symlinks() { - local src="$1" - local tgt="$2" - - # If the source does not exist, we can not do anything - if [ ! -f "${src}" ] ; then - return 1 - fi - - # Check whether the symlink is already there and in order - if [ -L "${tgt}" ] ; then - if [ -f "${tgt}" ] ; then - return 0 - fi - - # Remove broken symlink - if ! rm -f "${tgt}"; then - eerror "Removing '${tgt}' failed!" - return 1 - fi - fi - - # symlink the correct path - if ! ln -snf "${src}" "${tgt}"; then - eerror "Symlinking '${src}' to '${tgt}' failed!" - return 1 - fi - - return 0 -} - -cuda_check() { - local libsource="/opt/cuda/@libdir@/libcudart.so" - local libtarget="${RUNTIMEDIR}/libcudart.so" - - fix_lib_symlinks "${libsource}" "${libtarget}" || return 1 - return 0 -} - -opencl_check() { - local libsource="/usr/@libdir@/libOpenCL.so" - local libtarget="${RUNTIMEDIR}/libOpenCL.so" - - fix_lib_symlinks "${libsource}" "${libtarget}" || return 1 - return 0 -} - env_check() { # Make sure the configuration is sane : ${USER:="boinc"} @@ -120,8 +73,6 @@ env_check() { start_pre() { env_check || return 1 create_work_directory || return 1 - cuda_check || einfo "CUDA not supported" - opencl_check || einfo "OpenCL not supported" if [ ! -f "${RUNTIMEDIR}/lockfile" ]; then einfo "File \"${RUNTIMEDIR}/lockfile\" does not exist, assuming first run." |