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

Merge pull request #2025 from mischief/rkt-1.9.0-pxe

Browse Source 
app-emulation/rkt: check that ebuild and rkt CoreOS PXE versions match
This commit is contained in:
Nick Owens 2016-06-23 15:01:22 -07:00 committed by GitHub
commit a8bed9875d
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.9.0.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.9.0-r1.ebuild vendored
View File

12
sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild vendored
View File

@ -21,7 +21,7 @@ else
CROS_WORKON_COMMIT="d6874f787c60b3b4593e58030a2a20b55cc763e2" # v1.9.0 CROS_WORKON_COMMIT="d6874f787c60b3b4593e58030a2a20b55cc763e2" # v1.9.0
fi fi
PXE_VERSION="1032.0.0" PXE_VERSION="1068.0.0"
PXE_SYSTEMD_VERSION="v229" PXE_SYSTEMD_VERSION="v229"
PXE_URI="https://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" PXE_URI="https://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
@ -71,6 +71,16 @@ function add_stage1() {
fi fi
} }
src_prepare() {
# ensure we use a CoreOS PXE image version that matches rkt's expectations.
local rkt_coreos_version
rkt_coreos_version=$(awk '/^CCN_IMG_RELEASE/ { print $3 }' stage1/usr_from_coreos/coreos-common.mk)
if [ "${rkt_coreos_version}" != "${PXE_VERSION}" ]; then
die "CoreOS versions in ebuild and rkt build scripts are mismatched expecting ${rkt_stage1_coreos}!"
fi
}
src_configure() { src_configure() {
local myeconfargs=() local myeconfargs=()