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

Merge pull request #3082 from dm0-/mirror

Browse Source 
app-emulation/containerd: Fix the 1.0.* manifest entries
This commit is contained in:
David Michael 2018-02-21 13:14:18 -05:00 committed by GitHub
commit 37a9734690
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.0.0.ebuild vendored
View File

@ -11,11 +11,13 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://${GITHUB_URI}.git" EGIT_REPO_URI="https://${GITHUB_URI}.git"
inherit git-r3 inherit git-r3
else else
EGIT_COMMIT="89623f28b87a6004d4b785663257362d1658a729" # v1.0.0 MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="89623f2"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
inherit vcs-snapshot inherit vcs-snapshot
MAKE_VERSION_ARGS="REVISION=${EGIT_COMMIT} VERSION=v${PV}" MAKE_VERSION_ARGS="REVISION=${CONTAINERD_COMMIT} VERSION=v${PV}"
fi fi
inherit coreos-go systemd inherit coreos-go systemd

6
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild vendored
View File

@ -11,7 +11,9 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://${GITHUB_URI}.git" EGIT_REPO_URI="https://${GITHUB_URI}.git"
inherit git-r3 inherit git-r3
else else
EGIT_COMMIT="9b55aab90508bd389d7654c4baf173a981477d55" # v1.0.1 MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="9b55aab"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
inherit vcs-snapshot inherit vcs-snapshot
@ -41,7 +43,7 @@ src_prepare() {
default default
if [[ ${PV} != *9999* ]]; then if [[ ${PV} != *9999* ]]; then
sed -i -e "s/git describe --match.*$/echo ${PV})/"\ sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-e "s/git rev-parse HEAD.*$/echo ${EGIT_COMMIT})/"\ -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
-e "s/-s -w//" \ -e "s/-s -w//" \
Makefile || die Makefile || die
fi fi