From 10db07cc20c4eb5f68ba2a7559139146ac4a8e22 Mon Sep 17 00:00:00 2001 From: Sasha Finkelstein Date: Sat, 16 Nov 2024 23:29:11 +0100 Subject: [PATCH 1/2] app-emulation/fex-rootfs-gentoo: Add 20241114 Signed-off-by: Sasha Finkelstein --- app-emulation/fex-rootfs-gentoo/Manifest | 2 + .../fex-rootfs-gentoo-20241114.ebuild | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 app-emulation/fex-rootfs-gentoo/fex-rootfs-gentoo-20241114.ebuild diff --git a/app-emulation/fex-rootfs-gentoo/Manifest b/app-emulation/fex-rootfs-gentoo/Manifest index efe02d33..097de275 100644 --- a/app-emulation/fex-rootfs-gentoo/Manifest +++ b/app-emulation/fex-rootfs-gentoo/Manifest @@ -1,2 +1,4 @@ DIST fex-rootfs-gentoo-20241012-root.sqfs 1610735616 BLAKE2B 8639424fce8168555f6e4705c5efac5aae0bc0173145f4a01fc0f7c01708daba31c2cb0263a5d20ecfbde3113db70fa7dec046bfb61f5b55a88a427590b22497 SHA512 a4014694864ef374b4093c58ad793c5c979a48767a375ab1d1831d5ca61521422b9c8577e82de4d38ef655ce8bd7bcd953864f1325038220aa797392638dbe90 DIST fex-rootfs-gentoo-20241012.tar.gz 7093 BLAKE2B f5825bc2bd2bad42199a6f8ef42024ffe86c692cf893add8f898cb3ab95578844fd7d701169de335f515e2d0cb5d9ac2cb87939a72d8fa4c80fd3dca8fe92d78 SHA512 2a3cdc10507b4d2fd9b4f1f31a316792241d85a29e41c9932cae5b438ea8bf918ce1f7de11b5281678ffd226f7342ff2450d951c3d2dc2e5bbab9a93f8fb4454 +DIST fex-rootfs-gentoo-20241114-root.sqfs 1446735872 BLAKE2B 00deefc908f134b87cd29036c4da989b1ba7675aca6de9127f690e17a5300cfdd24ae9d930b269f80be15ecf669d367486734310d24ff76944c83c4bac65c2a9 SHA512 48a8ca0abedf5d4cdac0e7de701f6bc2b772870761e5290e6ff54842dd96f9a26e78f15d0c4c276a489b8cdb65c5eea2a2a0ae50607edaa1e38062a78aa039b9 +DIST fex-rootfs-gentoo-20241114.tar.gz 6935 BLAKE2B 60170457cf38c3c9f2e11d2ee4df7298022848f012c2021e3ccb5be22541adae54782b57bc6c638a81c551eb8513af5e28bdf28611e4aabd0179f619e262a05f SHA512 27a3e5b5f81a4067c8e82760fd181fe1faa2f348c53c8073c0532e73cf79a93a144922d63ec5be4326d78a923a9f5fea3f0a2c8af8b40be0953a761add146db1 diff --git a/app-emulation/fex-rootfs-gentoo/fex-rootfs-gentoo-20241114.ebuild b/app-emulation/fex-rootfs-gentoo/fex-rootfs-gentoo-20241114.ebuild new file mode 100644 index 00000000..0a8fa251 --- /dev/null +++ b/app-emulation/fex-rootfs-gentoo/fex-rootfs-gentoo-20241114.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd linux-info + +DESCRIPTION="A x86 system image used for FEX" +HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/fex-rootfs" + +SRC_URI=" + https://github.com/WhatAmISupposedToPutHere/fex-rootfs/releases/download/${PV}/fex-rootfs.sqfs -> ${P}-root.sqfs + https://github.com/WhatAmISupposedToPutHere/fex-rootfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz +" + +S="${WORKDIR}/fex-rootfs-${PV}" + +LICENSE="metapackage MIT" +SLOT="0" +KEYWORDS="-* ~arm64" +RDEPEND=" + gnome-extra/zenity + sys-apps/xdg-desktop-portal + systemd? ( sys-apps/systemd ) +" +DEPEND="${RDEPEND}" +IUSE="systemd" + +pkg_pretend() { + CONFIG_CHECK="~SQUASHFS ~SQUASHFS_ZSTD" + check_extra_config + [[ "${MERGE_TYPE}" != "buildonly" && "$(systemd_is_booted)" == 0 ]] || return + ewarn "This package depends on systemd being the init system for correct operation" + ewarn "On non-systemd systems assembling all the mount points correctly is left" + ewarn "as an excercise for the user." +} + +src_install() { + local base="/usr/share/fex-emu-rootfs-layers/gentoo" + insinto "${base}/images/" + newins "${DISTDIR}/${P}-root.sqfs" 00-base.sqfs + keepdir "${base}/work/" + keepdir "${base}/writable/" + gen_dir="$(systemd_get_systemgeneratordir)" + exeinto "${gen_dir#"${EPREFIX}"}" + doexe systemd/fex-gentoo-rootfs-generator + systemd_dounit 'systemd/usr-share-fex\x2demu\x2drootfs\x2dlayers-gentoo-layers-00\x2dbase.mount' +} + +pkg_prerm() { + [[ "${MERGE_TYPE}" == "buildonly" || "$(systemd_is_booted)" == 0 ]] && return + systemctl daemon-reload + systemctl stop 'usr-share-fex\x2demu\x2drootfs\x2dlayers-gentoo-layers-00\x2dbase.mount' +} + +pkg_postinst() { + [[ "${MERGE_TYPE}" == "buildonly" || "$(systemd_is_booted)" == 0 ]] && return + systemctl daemon-reload + systemctl start 'usr-share-fex\x2demu-RootFS-Gentoo.mount' +} From 0ed4ad175ce4221cf9fca811e407217e9f7303a4 Mon Sep 17 00:00:00 2001 From: Sasha Finkelstein Date: Sat, 16 Nov 2024 23:30:32 +0100 Subject: [PATCH 2/2] app-emulation/fex-rootfs-mesa-asahi: Add 20241114 Signed-off-by: Sasha Finkelstein --- app-emulation/fex-rootfs-mesa-asahi/Manifest | 2 + .../fex-rootfs-mesa-asahi-20241114.ebuild | 59 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 app-emulation/fex-rootfs-mesa-asahi/fex-rootfs-mesa-asahi-20241114.ebuild diff --git a/app-emulation/fex-rootfs-mesa-asahi/Manifest b/app-emulation/fex-rootfs-mesa-asahi/Manifest index f1d59c41..e02dd629 100644 --- a/app-emulation/fex-rootfs-mesa-asahi/Manifest +++ b/app-emulation/fex-rootfs-mesa-asahi/Manifest @@ -1,2 +1,4 @@ DIST fex-rootfs-mesa-asahi-20241012.sqfs 16297984 BLAKE2B bfa235207c845e745a24744da43efc35e58f231ad035deb1d5eb88781a7e1c888256c18fb8494320a4d9b39ae53e9dc0c7dbae12df3bb691d7002c1edcba3d16 SHA512 664129b18c8e90abd05bd2fe50340f0bd579187d060fba73b65cbb1db4b429e69c35d9c1e8266310d02b190bed9eea10b32f77b9c5abd8b4e05b72d62a4027d6 DIST fex-rootfs-mesa-asahi-20241012.tar.gz 7093 BLAKE2B f5825bc2bd2bad42199a6f8ef42024ffe86c692cf893add8f898cb3ab95578844fd7d701169de335f515e2d0cb5d9ac2cb87939a72d8fa4c80fd3dca8fe92d78 SHA512 2a3cdc10507b4d2fd9b4f1f31a316792241d85a29e41c9932cae5b438ea8bf918ce1f7de11b5281678ffd226f7342ff2450d951c3d2dc2e5bbab9a93f8fb4454 +DIST fex-rootfs-mesa-asahi-20241114.sqfs 16347136 BLAKE2B 2d820c9679c4bbcdd83f83766e7b57f8e74a8d10167cabfe33a963c91c9d7d6acbe2e20bcb2f73f770489f6f3b541b096e96667c896479ceb70717edc12d3959 SHA512 fa3f23251c8820c41adfd692cadc07436706f0626158a5457804dcdc94d6b85649fea54594bb9552a4551ed4aa21221b561e86e70602ee296655ea026f227b1a +DIST fex-rootfs-mesa-asahi-20241114.tar.gz 6935 BLAKE2B 60170457cf38c3c9f2e11d2ee4df7298022848f012c2021e3ccb5be22541adae54782b57bc6c638a81c551eb8513af5e28bdf28611e4aabd0179f619e262a05f SHA512 27a3e5b5f81a4067c8e82760fd181fe1faa2f348c53c8073c0532e73cf79a93a144922d63ec5be4326d78a923a9f5fea3f0a2c8af8b40be0953a761add146db1 diff --git a/app-emulation/fex-rootfs-mesa-asahi/fex-rootfs-mesa-asahi-20241114.ebuild b/app-emulation/fex-rootfs-mesa-asahi/fex-rootfs-mesa-asahi-20241114.ebuild new file mode 100644 index 00000000..1f9f306a --- /dev/null +++ b/app-emulation/fex-rootfs-mesa-asahi/fex-rootfs-mesa-asahi-20241114.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd linux-info + +DESCRIPTION="FEX rootfs overlay containing asahi mesa" +HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/fex-rootfs" + +SRC_URI=" + https://github.com/WhatAmISupposedToPutHere/fex-rootfs/releases/download/mesa-${PV}/fex-mesa.sqfs -> ${P}.sqfs + https://github.com/WhatAmISupposedToPutHere/fex-rootfs/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz +" + +S="${WORKDIR}/fex-rootfs-${PV}" + +LICENSE="metapackage MIT" +SLOT="0" +KEYWORDS="-* ~arm64" +DEPEND=" + systemd? ( sys-apps/systemd ) +" +RDEPEND=" + ${DEPEND} + app-emulation/fex-rootfs-gentoo +" +IUSE="systemd" + +pkg_pretend() { + CONFIG_CHECK="~SQUASHFS ~SQUASHFS_ZSTD" + check_extra_config +} + +src_install() { + local base="/usr/share/fex-emu-rootfs-layers/gentoo" + insinto "${base}/images/" + newins "${DISTDIR}/${P}.sqfs" 30-mesa.sqfs + systemd_dounit 'systemd/usr-share-fex\x2demu\x2drootfs\x2dlayers-gentoo-layers-30\x2dmesa.mount' +} + +pkg_prerm() { + [[ "${MERGE_TYPE}" == "buildonly" || "$(systemd_is_booted)" == 0 ]] && return + systemctl daemon-reload + systemctl stop 'usr-share-fex\x2demu\x2drootfs\x2dlayers-gentoo-layers-30\x2dmesa.mount' +} + +pkg_postrm() { + [[ "$(systemd_is_booted)" == 0 ]] && return + rmdir "${EROOT}/usr/share/fex-emu-rootfs-layers/gentoo/layers/30-mesa/" 2>/dev/zero + systemctl daemon-reload + systemctl start 'usr-share-fex\x2demu-RootFS-Gentoo.mount' +} + +pkg_postinst() { + [[ "${MERGE_TYPE}" == "buildonly" || "$(systemd_is_booted)" == 0 ]] && return + systemctl daemon-reload + systemctl restart 'usr-share-fex\x2demu-RootFS-Gentoo.mount' +}