@@ -64,48 +64,56 @@ popd >/dev/null
6464upstream_build_id=" $( tr -d ' \n' < " ${UPSTREAM_DIR} /${buildid_file} " ) "
6565resolved_version=" $( tr -d ' \n' < " ${UPSTREAM_DIR} /VERSION.txt" ) "
6666resolved_uuid=" $( tr -d ' \n' < " ${UPSTREAM_DIR} /UUID.txt" ) "
67+ container_platform=" $( runtime_platform " ${arch} " ) "
68+ arch_tag=" $( sanitize_arch " ${arch} " ) "
6769
68- cat > " ${BUILD_DIR} /build.env" << ENV
69- ROOT_DIR=${ROOT_DIR}
70- BUILD_DIR=${BUILD_DIR}
71- DIST_DIR=${DIST_DIR}
72- UPSTREAM_DIR=${UPSTREAM_DIR}
73- SOURCE_CACHE_DIR=${SOURCE_CACHE_DIR}
74- SOURCE_TREE_DIR=${SOURCE_TREE_DIR}
75- PATCHED_REPO_DIR=${PATCHED_REPO_DIR}
76- OVERLAY_DIR=${OVERLAY_DIR}
77- PATCHES_DIR=${PATCHES_DIR}
78- HOOKS_DIR=${HOOKS_DIR}
79- DOCKER_DIR=${DOCKER_DIR}
80- SNIPER_SNAPSHOT=${snapshot}
81- SNIPER_SUITE=${suite}
82- SNIPER_VARIANT=${variant}
83- SNIPER_ARCH=${arch}
84- SNIPER_BASE_URL=${SNIPER_BASE_URL}
85- SNIPER_APT_URL=${SNIPER_APT_URL}
86- SNIPER_APT_DIST=${SNIPER_APT_DIST}
87- SNIPER_APT_COMPONENTS=${SNIPER_APT_COMPONENTS}
88- DEBIAN_MIRROR=${DEBIAN_MIRROR}
89- DEBIAN_SECURITY_MIRROR=${DEBIAN_SECURITY_MIRROR}
90- DEBIAN_RELEASE=${DEBIAN_RELEASE}
91- SNIPER_ARTIFACT_PREFIX=${artifact_prefix}
92- UPSTREAM_BASE_URL=${base_url}
93- UPSTREAM_BUILDID_FILE=${buildid_file}
94- UPSTREAM_OS_RELEASE_FILE=${os_release_file}
95- UPSTREAM_MANIFEST_FILE=${manifest_file}
96- UPSTREAM_BUILT_USING_FILE=${built_using_file}
97- UPSTREAM_SOURCE_REQUIRED_FILE=${source_required_file}
98- UPSTREAM_SYSROOT_DOCKERFILE=${sysroot_dockerfile}
99- UPSTREAM_SOURCES_INDEX=${sources_index}
100- UPSTREAM_BUILD_ID=${upstream_build_id}
101- UPSTREAM_VERSION=${resolved_version}
102- UPSTREAM_UUID=${resolved_uuid}
103- UMU_RUNTIME_PREFIX=${UMU_RUNTIME_PREFIX}
104- UMU_IMAGE_NAME=${UMU_IMAGE_NAME}
105- DEFAULT_CMD=${DEFAULT_CMD}
106- ENABLE_LEGACY_OVERLAY=${ENABLE_LEGACY_OVERLAY}
107- CONTAINER_PLATFORM=$( runtime_platform " ${arch} " )
108- ARCH_TAG=$( sanitize_arch " ${arch} " )
109- ENV
70+ write_env () {
71+ local key=" $1 "
72+ local value=" $2 "
73+ printf ' %s=%q\n' " $key " " $value "
74+ }
75+
76+ {
77+ write_env ROOT_DIR " ${ROOT_DIR} "
78+ write_env BUILD_DIR " ${BUILD_DIR} "
79+ write_env DIST_DIR " ${DIST_DIR} "
80+ write_env UPSTREAM_DIR " ${UPSTREAM_DIR} "
81+ write_env SOURCE_CACHE_DIR " ${SOURCE_CACHE_DIR} "
82+ write_env SOURCE_TREE_DIR " ${SOURCE_TREE_DIR} "
83+ write_env PATCHED_REPO_DIR " ${PATCHED_REPO_DIR} "
84+ write_env OVERLAY_DIR " ${OVERLAY_DIR} "
85+ write_env PATCHES_DIR " ${PATCHES_DIR} "
86+ write_env HOOKS_DIR " ${HOOKS_DIR} "
87+ write_env DOCKER_DIR " ${DOCKER_DIR} "
88+ write_env SNIPER_SNAPSHOT " ${snapshot} "
89+ write_env SNIPER_SUITE " ${suite} "
90+ write_env SNIPER_VARIANT " ${variant} "
91+ write_env SNIPER_ARCH " ${arch} "
92+ write_env SNIPER_BASE_URL " ${SNIPER_BASE_URL} "
93+ write_env SNIPER_APT_URL " ${SNIPER_APT_URL} "
94+ write_env SNIPER_APT_DIST " ${SNIPER_APT_DIST} "
95+ write_env SNIPER_APT_COMPONENTS " ${SNIPER_APT_COMPONENTS} "
96+ write_env DEBIAN_MIRROR " ${DEBIAN_MIRROR} "
97+ write_env DEBIAN_SECURITY_MIRROR " ${DEBIAN_SECURITY_MIRROR} "
98+ write_env DEBIAN_RELEASE " ${DEBIAN_RELEASE} "
99+ write_env SNIPER_ARTIFACT_PREFIX " ${artifact_prefix} "
100+ write_env UPSTREAM_BASE_URL " ${base_url} "
101+ write_env UPSTREAM_BUILDID_FILE " ${buildid_file} "
102+ write_env UPSTREAM_OS_RELEASE_FILE " ${os_release_file} "
103+ write_env UPSTREAM_MANIFEST_FILE " ${manifest_file} "
104+ write_env UPSTREAM_BUILT_USING_FILE " ${built_using_file} "
105+ write_env UPSTREAM_SOURCE_REQUIRED_FILE " ${source_required_file} "
106+ write_env UPSTREAM_SYSROOT_DOCKERFILE " ${sysroot_dockerfile} "
107+ write_env UPSTREAM_SOURCES_INDEX " ${sources_index} "
108+ write_env UPSTREAM_BUILD_ID " ${upstream_build_id} "
109+ write_env UPSTREAM_VERSION " ${resolved_version} "
110+ write_env UPSTREAM_UUID " ${resolved_uuid} "
111+ write_env UMU_RUNTIME_PREFIX " ${UMU_RUNTIME_PREFIX} "
112+ write_env UMU_IMAGE_NAME " ${UMU_IMAGE_NAME} "
113+ write_env DEFAULT_CMD " ${DEFAULT_CMD} "
114+ write_env ENABLE_LEGACY_OVERLAY " ${ENABLE_LEGACY_OVERLAY} "
115+ write_env CONTAINER_PLATFORM " ${container_platform} "
116+ write_env ARCH_TAG " ${arch_tag} "
117+ } > " ${BUILD_DIR} /build.env"
110118
111119log " Resolved upstream build ID: ${upstream_build_id} "
0 commit comments