Skip to content

Commit 1513f3a

Browse files
committed
Remove ACI image building bits
The ACI OEM container image was used with rkt for GCE. For long time this has been migrated to systemd-nspawn and now systemd-sysext. Remove the unused build library code.
1 parent 6d01140 commit 1513f3a

File tree

4 files changed

+0
-233
lines changed

4 files changed

+0
-233
lines changed

build_library/oem_aci_util.sh

Lines changed: 0 additions & 124 deletions
This file was deleted.

build_library/vm_image_util.sh

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -507,36 +507,6 @@ install_oem_package() {
507507
sudo rm -rf "${oem_tmp}"
508508
}
509509

510-
# Write the OEM ACI file into the OEM partition.
511-
install_oem_aci() {
512-
local oem_aci=$(_get_vm_opt OEM_ACI)
513-
local aci_dir="${FLAGS_to}/oem-${oem_aci}-aci"
514-
local aci_path="${aci_dir}/flatcar-oem-${oem_aci}.aci"
515-
local binpkgflags=(--nogetbinpkg)
516-
517-
[ -n "${oem_aci}" ] || return 0
518-
519-
[ "${FLAGS_getbinpkg}" = "${FLAGS_TRUE}" ] &&
520-
binpkgflags=(--getbinpkg --getbinpkgver="${FLAGS_getbinpkgver}")
521-
522-
# Build an OEM ACI if necessary, supplying build environment flags.
523-
[ -e "${aci_path}" ] &&
524-
info "ACI ${aci_path} exists; reusing it" ||
525-
"${SCRIPT_ROOT}/build_oem_aci" \
526-
--board="${BOARD}" \
527-
--build_dir="${aci_dir}" \
528-
"${binpkgflags[@]}" \
529-
"${oem_aci}"
530-
531-
info "Installing ${oem_aci} OEM ACI"
532-
sudo install -Dpm 0644 \
533-
"${aci_path}" \
534-
"${VM_TMP_ROOT}/oem/flatcar-oem-${oem_aci}.aci" ||
535-
die "Could not install ${oem_aci} OEM ACI"
536-
# Remove aci_dir if building ACI and installing it succeeded
537-
rm -rf "${aci_dir}"
538-
}
539-
540510
# Write the OEM sysext file into the OEM partition.
541511
install_oem_sysext() {
542512
local oem_sysext=$(_get_vm_opt OEM_SYSEXT)

build_oem_aci

Lines changed: 0 additions & 78 deletions
This file was deleted.

image_to_vm.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ setup_disk_image "${FLAGS_disk_layout}"
117117

118118
# Optionally install any OEM packages
119119
install_oem_package
120-
install_oem_aci
121120
install_oem_sysext
122121
run_fs_hook
123122

0 commit comments

Comments
 (0)