aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Gilroy <michael.gilroy24@gmail.com>2017-06-12 22:32:48 +0000
committerMichael Gilroy <michael.gilroy24@gmail.com>2017-06-12 22:32:48 +0000
commit0d6b4610a8b99dfb6195abd4941ae16cb61312ae (patch)
tree60103bf540812b979ee7678d376cf7dcbac633c3
parentmade mpi-select framework (diff)
downloadgentoo-mpi-0d6b4610a8b99dfb6195abd4941ae16cb61312ae.tar.gz
gentoo-mpi-0d6b4610a8b99dfb6195abd4941ae16cb61312ae.tar.bz2
gentoo-mpi-0d6b4610a8b99dfb6195abd4941ae16cb61312ae.zip
non-rsync approach written for testing
-rw-r--r--eclass/mpi-providers.eclass38
1 files changed, 10 insertions, 28 deletions
diff --git a/eclass/mpi-providers.eclass b/eclass/mpi-providers.eclass
index 904fc60..5a1ca66 100644
--- a/eclass/mpi-providers.eclass
+++ b/eclass/mpi-providers.eclass
@@ -22,35 +22,17 @@ mpi-providers_safe_mv() {
## MOVE EVERYTHING BUT DOCS TO /usr/lib/mpi/${PN}-${PVR}
## MOVE REMAINING CONTENTS FROM /etc/* TO /etc/${PN}-${PVR}
- local TMP="${T}"/"${PN}"
-
- # move anything remaining in /etc to /etc/${PN}-${PVR}
- mkdir -p "${TMP}"/etc
- mkdir -p "${ED}"/etc/"${PN}"-"${PVR}"
- rsync --remove-source-files -a "${ED}"/etc/* \
- "${TMP}"/etc/. || die "rsync failed"
- rsync --remove-source-files -a "${TMP}"/etc/* \
- "${ED}"/etc/"${PN}"-"${PVR}" || die "rsync failed"
-
- # move /usr/share/doc to temporary docs directory
- mkdir -p "${T}"/"${PN}"/DOCS
- local DOCS="${ED}"/usr/share/doc
- rsync --remove-source-files -a "${DOCS}"/* \
- "${TMP}"/DOCS/. || die "rsync failed"
- rsync --remove-source-files -a "${ED}"/* \
- "${TMP}"/. || die "rsync failed"
+ local mpi_root="${ED}/usr/$(get_libdir)/mpi/${PN}-${PVR}"
- # move docs from tmp, everything else to /usr/lib/mpi/${PN}-${PVR}
- mkdir -p "${ED}"/usr/$(get_libdir)/mpi/"${PN}"-"${PVR}"
- local MPI_DIR="${ED}"/usr/$(get_libdir)/mpi/"${PN}"-"${PVR}"
- mkdir -p "${DOCS}"
- rsync --remove-source-files -a "${TMP}"/DOCS/* \
- "${DOCS}"/. || die "rsync failed"
- rsync --remove-source-files -a "${TMP}"/* \
- "${MPI_DIR}"/. || die "rsync failed"
-
- # clean up
- rm -rf "${TMP}"
+ mv "${ED}" "${T}/install"
+ mkdir -p "${mpi_root}"
+ mv "${T}/install" "${mpi_root}"
+
+ mv "${mpi_root}/usr/share/doc" "${ED}"
+
+ cd "${mpi_root}/etc"
+ find -O3 -mindepth 1 -maxdepth 1 ! -path "./${PF}*" -execdir cp -a -t "${PF}" '{}' \+
+
}
# @ECLASS-FUNCTION: mpi-providers_sysconfdir