diff --git a/changelog/changes/2024-04-02-remove-actool-and-acbuild.md b/changelog/changes/2024-04-02-remove-actool-and-acbuild.md new file mode 100644 index 0000000000..07e619e542 --- /dev/null +++ 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/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 deleted file mode 120000 index 64278d411f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.4.0.ebuild +++ /dev/null @@ -1 +0,0 @@ -acbuild-9999.ebuild \ No newline at end of file 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 deleted file mode 100644 index ca430b3f2b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (c) 2015 CoreOS, Inc. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CROS_WORKON_PROJECT="appc/acbuild" -CROS_WORKON_REPO="https://github.com" -CROS_WORKON_LOCALNAME="appc-acbuild" -COREOS_GO_PACKAGE="github.com/appc/acbuild" -COREOS_GO_GO111MODULE="off" -inherit coreos-go toolchain-funcs cros-workon - -if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm64" -else - CROS_WORKON_COMMIT="2d120a832bd4c3601ca307bf7dd1612a12b55d29" # v0.4.0 - KEYWORDS="amd64 arm64" -fi - -DESCRIPTION="A build tool for ACIs" -HOMEPAGE="https://github.com/appc/acbuild" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -RDEPEND="sys-apps/kmod - app-crypt/gnupg - sys-apps/systemd" - -src_compile(){ - if [[ "${PV}" == 9999 ]]; then - # set semver - local v - v=$(git describe --long --dirty) || die - v=${v#v} - v=${v/-/+} - GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version=${v}" - else - GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/lib.Version=${PV}" - fi - - go_build "${COREOS_GO_PACKAGE}/acbuild" -} - -src_install(){ - dobin "${WORKDIR}/gopath/bin/acbuild" -} - 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 deleted file mode 120000 index 394b35eae1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.8.11.ebuild +++ /dev/null @@ -1 +0,0 @@ -actool-9999.ebuild \ No newline at end of file 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 deleted file mode 100644 index 03ed2192cd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-9999.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015 CoreOS, Inc. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CROS_WORKON_PROJECT="appc/spec" -CROS_WORKON_REPO="https://github.com" -CROS_WORKON_LOCALNAME="appc-spec" -COREOS_GO_PACKAGE="github.com/appc/spec" -COREOS_GO_GO111MODULE="off" -inherit coreos-go cros-workon - -if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm64" -else - CROS_WORKON_COMMIT="cbe99b7160b1397bf89f9c8bb1418f69c9424049" # v0.8.11 - KEYWORDS="amd64 arm64" -fi - -DESCRIPTION="App Container builder and validator" -HOMEPAGE="https://github.com/appc/spec" -SRC_URI="" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -src_compile() { - go_build "${COREOS_GO_PACKAGE}/actool" -} - -src_install() { - dobin "${WORKDIR}/gopath/bin/actool" -} 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 deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - 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 index a91885d554..9a7bb239af 100644 --- 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/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 717429e807..3fa37ea36a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/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