From 1c2cf9329d5d3bf0fbbea64b414dc0e0f3a09d6e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 22 Dec 2025 16:57:54 +0000 Subject: [PATCH] app-admin/locksmith: Migrate versioned ebuild away from git eclass Signed-off-by: James Le Cuirot --- .../app-admin/locksmith/Manifest | 1 + .../app-admin/locksmith/locksmith-9999.ebuild | 30 +++++++++---------- .../app-admin/locksmith/metadata.xml | 3 ++ 3 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest new file mode 100644 index 0000000000..1a1849aabe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/Manifest @@ -0,0 +1 @@ +DIST locksmith-a1cb1f901971165827d68188e9f60752c0e33c10.tar.gz 239087 BLAKE2B f37e5cfcdad269f10b5c6f6f37365719f3a86cbe70ecf1c207e0e88129671b5d122170299eed5829a0b18ff1edd3d3e3f452efca207e819d646a4538c1820706 SHA512 79fe435d3efdaca7fec442701338b9dcc50b261e65d9628a3a0b69001f6bfadf4b4bf85f52d6025d4c3b04283b870423f23318bd275030032a34f5d9a82d1389 diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild index 24425d69f0..f5c187c09d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild @@ -1,35 +1,35 @@ # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -EGIT_REPO_URI="https://github.com/flatcar/locksmith.git" -COREOS_GO_PACKAGE="github.com/flatcar/locksmith" -inherit git-r3 systemd coreos-go +EAPI=8 -if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm64" +COREOS_GO_PACKAGE="github.com/flatcar/locksmith" +inherit systemd coreos-go + +DESCRIPTION="Reboot manager for the Flatcar update engine" +HOMEPAGE="https://github.com/flatcar/locksmith" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/flatcar/locksmith.git" + inherit git-r3 else - EGIT_COMMIT="ee644fc60a32af5fbc4e83c64fcc7ca0eadb9e3f" # flatcar-master + EGIT_VERSION="a1cb1f901971165827d68188e9f60752c0e33c10" # flatcar-master + SRC_URI="https://github.com/flatcar/locksmith/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz" + S="${WORKDIR}/${PN}-${EGIT_VERSION}" KEYWORDS="amd64 arm64" fi -DESCRIPTION="locksmith" -HOMEPAGE="https://github.com/flatcar/locksmith" -SRC_URI="" - LICENSE="Apache-2.0" SLOT="0" -IUSE="" src_compile() { COREOS_GO_MOD=vendor go_build "${COREOS_GO_PACKAGE}/locksmithctl" } src_install() { - dobin ${GOBIN}/locksmithctl - dodir /usr/lib/locksmith + dobin "${GOBIN}"/locksmithctl dosym ../../../bin/locksmithctl /usr/lib/locksmith/locksmithd - systemd_dounit "${S}"/systemd/locksmithd.service + systemd_dounit systemd/locksmithd.service systemd_enable_service multi-user.target locksmithd.service } diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/metadata.xml index 097975e3ad..4ec74b75f2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/metadata.xml @@ -1,4 +1,7 @@ + + flatcar/locksmith +