From 618dfc49baeda19f0d0cb4f35199e0259c3e3df2 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 16 Jul 2024 17:23:35 +0100 Subject: [PATCH] sys-apps/baselayout: Don't fetch non-live version from git Use a regular tarball from GitHub. baselayout is a special case because Catalyst initially installs it with --nodeps. We currently use stage 4 as a seed, which includes git, so this is fine right now, but we would like to switch to using stage 3 instead. You also might use a cross-compiled stage 3 as a seed when porting the SDK to a new architecture. Signed-off-by: James Le Cuirot --- .../third_party/coreos-overlay/sys-apps/baselayout/Manifest | 1 + .../sys-apps/baselayout/baselayout-9999.ebuild | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest new file mode 100644 index 00000000000..3cef69bee57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest @@ -0,0 +1 @@ +DIST flatcar-baselayout-937a45faef0f7fa88d3d2c3f7ba60a7f3e2e82f7.tar.gz 34560 BLAKE2B f4204cdabb87cc1618d7adcc0f3b0103686d60d1073c7539ffb1e4c0c264308b42cac1a2aaab0153c9762935d1cbf81c0e061a1aaeb53980d6ff278a6d26290b SHA512 9ca214c698fcd144c7dabcbda2226af7d2126b5d104ceb1eab7234a41326cc6a469ebaf2528709234d59019c84e277925e66309f4cb62b17f48be8834f6b611a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index ae7fca39652..a3e34421f1b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -5,18 +5,20 @@ EAPI=7 EGIT_REPO_URI="https://github.com/flatcar/baselayout.git" if [[ "${PV}" == 9999 ]]; then + inherit git-r3 KEYWORDS="~amd64 ~arm ~arm64 ~x86" else EGIT_COMMIT="937a45faef0f7fa88d3d2c3f7ba60a7f3e2e82f7" # flatcar-master + SRC_URI="https://github.com/flatcar/baselayout/archive/${EGIT_COMMIT}.tar.gz -> flatcar-${PN}-${EGIT_COMMIT}.tar.gz" + S="${WORKDIR}/${PN}-${EGIT_COMMIT}" KEYWORDS="amd64 arm arm64 x86" fi TMPFILES_OPTIONAL=1 -inherit git-r3 multilib systemd tmpfiles +inherit multilib systemd tmpfiles DESCRIPTION="Filesystem baselayout for CoreOS" HOMEPAGE="http://www.coreos.com/" -SRC_URI="" LICENSE="GPL-2" SLOT="0"