[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     8f952fad8ad5152d7877944c537f469f25d0a7af
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sat Jul  8 18:25:16 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 09:44:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f952fad

multibuild.eclass: Remove --reflink=auto from calls to cp

--reflink=auto has become the default behaviour in coreutils 9,
and it is not compatible with BSD userland.

Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/multibuild.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 33edb9312a86..d8a5862731bf 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -170,8 +170,7 @@ multibuild_copy_sources() {
 
        _multibuild_create_source_copy() {
                einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}"
-               # enable reflinking if possible to make this faster
-               cp -p -R --reflink=auto \
+               cp -p -R \
                        "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die
        }
 
@@ -190,8 +189,7 @@ multibuild_merge_root() {
        local src=${1}
        local dest=${2}
 
-       # enable reflinking if possible to make this faster
-       cp -a --reflink=auto "${src}"/. "${dest}"/ || die 
"${MULTIBUILD_VARIANT:-(unknown)}: merging image failed"
+       cp -a "${src}"/. "${dest}"/ || die "${MULTIBUILD_VARIANT:-(unknown)}: 
merging image failed"
        rm -rf "${src}" || die
 }