mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: eapply engine patches

Browse Source 
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.
This commit is contained in:
Euan Kemp 2017-09-22 17:19:49 -07:00
parent e3d0b5edb2
commit 1ccbcc4073
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -77,9 +77,9 @@ S="${WORKDIR}/${P}/src/${COREOS_GO_PACKAGE}"
PATCHES=( PATCHES=(
"${FILESDIR}/patches/allow-override-build-date.patch" "${FILESDIR}/patches/allow-override-build-date.patch"
) )
# Note: patches in the 'engine' subfolder are automatically applied to the ENGINE_PATCHES=(
# engine component; because docker-ce has subfolders for each component, "${FILESDIR}/patches/engine/revert-make-overlay-home-dir-private.patch"
# backporting specific component's patches has this extra complexity )
# see "contrib/check-config.sh" from upstream's sources # see "contrib/check-config.sh" from upstream's sources
CONFIG_CHECK=" CONFIG_CHECK="
@ -215,10 +215,7 @@ src_unpack() {
DOCKER_GITCOMMIT=$(git -C "${S}" rev-parse HEAD | head -c 7) DOCKER_GITCOMMIT=$(git -C "${S}" rev-parse HEAD | head -c 7)
DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct") DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct")
fi fi
pushd "${S}"/components/engine || die eapply -d"${S}"/components/engine "${ENGINE_PATCHES[@]}"
EPATCH_SOURCE="${FILESDIR}/patches/engine" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
popd || die
} }
src_compile() { src_compile() {