From 42d4c790837bb200452f97287613deb3a9b077d0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 7 Aug 2023 07:12:20 +0000 Subject: [PATCH] eclass/multibuild: Sync with Gentoo It's from Gentoo commit 8f952fad8ad5152d7877944c537f469f25d0a7af. --- .../src/third_party/portage-stable/eclass/multibuild.eclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass b/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass index 33edb9312a..d8a5862731 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass +++ b/sdk_container/src/third_party/portage-stable/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 }