flatcar · pothos · Apr 3, 2024 · Apr 2, 2024 · Apr 3, 2024
diff --git a/build_library/oem_aci_util.sh b/build_library/oem_aci_util.sh
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
@@ -507,36 +507,6 @@ install_oem_package() {
     sudo rm -rf "${oem_tmp}"
 }
 
-# Write the OEM ACI file into the OEM partition.
-install_oem_aci() {
-    local oem_aci=$(_get_vm_opt OEM_ACI)
-    local aci_dir="${FLAGS_to}/oem-${oem_aci}-aci"
-    local aci_path="${aci_dir}/flatcar-oem-${oem_aci}.aci"
-    local binpkgflags=(--nogetbinpkg)
-
-    [ -n "${oem_aci}" ] || return 0
-
-    [ "${FLAGS_getbinpkg}" = "${FLAGS_TRUE}" ] &&
-    binpkgflags=(--getbinpkg --getbinpkgver="${FLAGS_getbinpkgver}")
-
-    # Build an OEM ACI if necessary, supplying build environment flags.
-    [ -e "${aci_path}" ] &&
-    info "ACI ${aci_path} exists; reusing it" ||
-    "${SCRIPT_ROOT}/build_oem_aci" \
-        --board="${BOARD}" \
-        --build_dir="${aci_dir}" \
-        "${binpkgflags[@]}" \
-        "${oem_aci}"
-
-    info "Installing ${oem_aci} OEM ACI"
-    sudo install -Dpm 0644 \
-        "${aci_path}" \
-        "${VM_TMP_ROOT}/oem/flatcar-oem-${oem_aci}.aci" ||
-    die "Could not install ${oem_aci} OEM ACI"
-    # Remove aci_dir if building ACI and installing it succeeded
-    rm -rf "${aci_dir}"
-}
-
 # Write the OEM sysext file into the OEM partition.
 install_oem_sysext() {
     local oem_sysext=$(_get_vm_opt OEM_SYSEXT)

diff --git a/build_oem_aci b/build_oem_aci
diff --git a/changelog/changes/2024-04-02-remove-actool-and-acbuild.md b/changelog/changes/2024-04-02-remove-actool-and-acbuild.md
@@ -0,0 +1 @@
+- Removed `actool` from the image and `acbuild` from the SDK as these tools are deprecated and not used ([scripts#1817](https://github.com/flatcar/scripts/pull/1817))
diff --git a/image_to_vm.sh b/image_to_vm.sh
@@ -117,7 +117,6 @@ setup_disk_image "${FLAGS_disk_layout}"
 
 # Optionally install any OEM packages
 install_oem_package
-install_oem_aci
 install_oem_sysext
 run_fs_hook
 

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.4.0.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.8.11.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.8.11.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/metadata.xml
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -106,7 +106,6 @@ RDEPEND="${RDEPEND}
 	app-crypt/go-tspi
 	app-crypt/tpmpolicy
 	app-editors/vim
-	app-emulation/actool
 	app-containers/cri-tools
 	app-misc/ca-certificates
 	app-misc/jq

diff --git a/...ontainer/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/...ontainer/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -19,8 +19,6 @@ DEPEND="
 	app-arch/pbzip2
 	app-crypt/efitools
 	app-crypt/sbsigntools
-	app-emulation/acbuild
-	app-emulation/actool
 	app-emulation/open-vmdk
 	app-eselect/eselect-python
 	app-misc/jq
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Removed `actool` from the image and `acbuild` from the SDK as these tools are deprecated and not used ([scripts#1817](https://github.com/flatcar/scripts/pull/1817))