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

Merge pull request #286 from marineam/version2

Browse Source 
minor build fixes
This commit is contained in:
Michael Marineau 2014-06-25 12:57:53 -07:00
commit fd88195d58
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_library/build_image_util.sh
View File

@ -89,10 +89,8 @@ generate_update() {
extract "${BUILD_DIR}/${image_name}" "USR-A" "${update}.bin"
delta_generator -private_key "${devkey}" \
-new_image "${update}.bin" -out_file "${update}.gz"
delta_generator -private_key "${devkey}" \
-in_file "${update}.gz" -out_metadata "${update}.meta"
upload_image -d "${update}.DIGESTS" "${update}".{bin,gz,meta,zip}
upload_image -d "${update}.DIGESTS" "${update}".{bin,gz,zip}
}
# Basic command to emerge binary packages into the target image.

23
image_set_group
View File

@ -95,11 +95,20 @@ mkdir -p "${ROOT_FS_DIR}"
info "Copying from ${FLAGS_from}"
cp "${SRC_IMAGE}" "${DST_IMAGE}"
cp "${FLAGS_from}/version.txt" "${BUILD_DIR}/version.txt"
# Copy all extra useful things, these do not need to be modified.
UPDATE_PREFIX="${COREOS_PRODUCTION_IMAGE_NAME%_image.bin}_update"
if [[ -e "${FLAGS_from}/${UPDATE_PREFIX}.bin" ]]; then
cp "${FLAGS_from}/${UPDATE_PREFIX}".{bin,gz,meta,zip} "${BUILD_DIR}/"
EXTRA_FILES=(
"version.txt"
"${UPDATE_PREFIX}.bin"
"${UPDATE_PREFIX}.zip"
"${COREOS_DEVELOPER_CONTAINER_NAME}"
)
for filename in "${EXTRA_FILES[@]}"; do
if [[ -e "${FLAGS_from}/${filename}" ]]; then
cp "${FLAGS_from}/${filename}" "${BUILD_DIR}/${filename}"
fi
done
"${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${FLAGS_disk_layout}" \
mount "${DST_IMAGE}" "${ROOT_FS_DIR}"
@ -115,11 +124,11 @@ cleanup_mounts "${ROOT_FS_DIR}"
trap - EXIT
upload_image "${DST_IMAGE}"
upload_image "${BUILD_DIR}/version.txt"
if [[ -e "${BUILD_DIR}/${UPDATE_PREFIX}.bin" ]]; then
upload_image -d "${BUILD_DIR}/${UPDATE_PREFIX}.DIGESTS" \
"${BUILD_DIR}/${UPDATE_PREFIX}".{bin,gz,meta,zip}
for filename in "${EXTRA_FILES[@]}"; do
if [[ -e "${BUILD_DIR}/${filename}" ]]; then
upload_image "${BUILD_DIR}/${filename}"
fi
done
set_build_symlinks "${FLAGS_group}-latest"