From 1ccbcc4073ae24da32ce237384e030d483cb8cec Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 22 Sep 2017 17:19:49 -0700 Subject: [PATCH] app-emulation/docker: eapply engine patches Also split them into an array so we can decouple the files in patches/engine from those applied, e.g. to allow carrying patches for only specific ebuilds. --- .../app-emulation/docker/docker-9999.ebuild | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 176cc81773..a2f654e7b4 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -77,9 +77,9 @@ S="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}" PATCHES=( "${FILESDIR}/patches/allow-override-build-date.patch" ) -# Note: patches in the 'engine' subfolder are automatically applied to the -# engine component; because docker-ce has subfolders for each component, -# backporting specific component's patches has this extra complexity +ENGINE_PATCHES=( + "${FILESDIR}/patches/engine/revert-make-overlay-home-dir-private.patch" +) # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" @@ -215,10 +215,7 @@ src_unpack() { DOCKER_GITCOMMIT=$(git -C "${S}" rev-parse HEAD | head -c 7) DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct") fi - pushd "${S}"/components/engine || die - EPATCH_SOURCE="${FILESDIR}/patches/engine" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - popd || die + eapply -d"${S}"/components/engine "${ENGINE_PATCHES[@]}" } src_compile() {