6 files changed, 82 insertions, 2 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 544ff5c28e69..bc63e21b7129 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 1f4bf5a22856..7f2ca5983e8c 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,5 +8,5 @@ DIST linux-firmware-20240909.tar.xz 383099276 BLAKE2B 3769ca5501db43a6d1ca54ac11
 EBUILD linux-firmware-20240709-r2.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240811-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240909-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
-EBUILD linux-firmware-99999999.ebuild 11516 BLAKE2B 63bd0c84fe8e9a33e310175a419f2f09553d43819e3bf3dedd01e86ea71b5596f93d3f0764bf76861c50870cf967888e9a45943e88cc4232f099d6b683097149 SHA512 53f61a8213080e3cbde17244ca4dc20fa5ce9feece9a4f4967671443eb0ac09c3921a37a4ba66334aa0166438a7d01940abe41bbed358c5e60d2334071d6627b
+EBUILD linux-firmware-99999999.ebuild 11572 BLAKE2B 810a799dbe48d366903beb55969db04f3f555606d6698504f495cd169be6ece8ce3760214f9de6ce78c3ade6326c774928f621983a855103c2f989e0c779d828 SHA512 d3fd2abc6bb60f8499f0e23dd62acaf8999d31f464e0826fb97818ad1a82b5f3d890a641ee3932d69f3e79f6ec3dc33e867b1cc2cf486b11f236722c15323fb8
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index a177433c8846..7f691121d842 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -287,6 +287,7 @@ src_prepare() {
 src_install() {
 
 	local FW_OPTIONS=( "-v" )
+	git config --global --add safe.directory "${S}" || die
 
 	if use compress-xz; then
 		FW_OPTIONS+=( "--xz" )
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 9e8280a5e38b..224d3cc1c263 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -3,10 +3,12 @@ DIST ugrd-1.17.0.tar.gz 69517 BLAKE2B 2acadac8ab3830791146522ccfff6f8c5e98eff4ce
 DIST ugrd-1.20.0.tar.gz 64541 BLAKE2B d85241e6c0822d3df0d65cc07cb17014b4d66554476caf4d37ebc77943c57ef3004e1e01b4eb504974b2ab9d1a03015812e8b0cb19ebf03667a9f6c7a1bded03 SHA512 88f137fa5fc4cb61418cda03c0c58ff7632c1e61b7688ad9e8cce538842d817e973c1d2293b8bb92b9697a29511cb535059ca060793ba6353d95d5ddad417f3a
 DIST ugrd-1.22.0.tar.gz 65955 BLAKE2B 0573364964ce8d874ff126e87e003aeb90d3f6460ecaca7aaf5f231fe9069dca9239c0ee9e68157eebaab8651401df0c22695d5a81e2984dbfb89b4a38f5a0aa SHA512 78598f0b0d81a9528b84fd829269b7ce0588830bf95ce5e6455c02053e38a25dd9eecb664057ea6bfed653590c39f73dd3f4a4235e056d27c9c100b166a29996
 DIST ugrd-1.24.2.tar.gz 68762 BLAKE2B 2def2144381f66ac79d5c2246f49cacdde3aafd3ee7909cc9bfbfbb31dc554d501b240854452f51e4fd8e66d2af20c7380ee2552eb546f6728d56d59f9a2e9a1 SHA512 d5c756950212509d5a94c8f82b27da2cefdf6b7328f2871a9a56231e8e15d0fde1aea1850066935bdc5c143172fb3b2b09fb9fb131c3f52813d5b609541136d5
+DIST ugrd-1.25.0.tar.gz 70221 BLAKE2B 7f3403dd4c5b6131c61c92679d447df6ef49e6dc6d7f17cef67b90d5d2c06087417fc0700a42be41e73749b127e11df807a93c14e91a50827e6043214ca6990c SHA512 6e4b74ee6d4cf38f76063cb5a15a2b853422a6a9ee25887830dbc158e61b1ea2a25dd36522d3e8642eb05ba875baa03ce18db1d66407f0ea55a4261cdd6df5da
 EBUILD ugrd-1.13.0.ebuild 1462 BLAKE2B 52d73a0564a64c31a1fa9cb02377f6735e883ee3f7c68f1fbdf404ebedf12faad5641e815cd09b9797e52378a462a56036d7a3106d5c35f9c15f1fe074712fd8 SHA512 6568990c8bf6f20fc49f8ae8d1080cfff04593b8255b361efe18e0e5a09fe8eeb1160cdbff2b1b2276f12860f5b3e0a7dd08302cc2d6f073f2759d72a35467b0
 EBUILD ugrd-1.17.0.ebuild 1462 BLAKE2B c57694a328f9ee661569bac819216461fa9545f3ff00f2514994f8bc7ca0b5137dcda1d4e8ddf880fddb2fb7a515fa3c49dd62b99aa82349c46e57529d951ea0 SHA512 c7216215e70de33ee35007c89a717ac9c175e47c18bdfd70663a62b25f3e9bf79297679c05a030b8be913387498c6101d3a60da56f748345c467d8c4fa7dd1d6
 EBUILD ugrd-1.20.0.ebuild 1989 BLAKE2B bd566233e7efc496d327595ab36e1010401f1529f11c638e9ea560be6b9458ed2b6bfc241adc25a4214741c399f8f50bfd4bd61b2526316cdccfbec89333937e SHA512 9440fcda80d0198338c659da3f5168a98ea0dd580d748726c70ca46253d72662cf89df99d36ab6262d7e57ec69927a6b8d11d88a625f528f789cf66f07663b4e
 EBUILD ugrd-1.22.0.ebuild 1991 BLAKE2B 0db47c00e898694c37b7f0ae4d626b81d941d8014d88187b02652ce137dccf4cdc51ebac7999ff2da70e63b2e714b89c0d464727dbfe6055a92ab5e881adac1d SHA512 a856a599f75758fd6afb9d3027aeb351d572601c553b631ad778fd8dde642a81f6fa24496eba16f7c7f83f9d433a41f44e2aa2937b6bfb657e1f599ef06b4154
 EBUILD ugrd-1.24.2.ebuild 2041 BLAKE2B c457d8cc9c84ac3d6ea3765a72dc267a2db827a87b79af91643c97c4bb56c4305649074c26666d700a240e37b4b899be6227a663eb427fd95609e6693defe705 SHA512 73d8d2720cc762c5cd81173f37066d68869a45f0034ef89f1cd189ce04460dae4d81e798f34f88bd362aa11d7d7f8b56160e1d7c971eb0beae07d8d92984b579
-EBUILD ugrd-9999.ebuild 1981 BLAKE2B 0b5cde4d6cc50754fd9bd76c8d11062c6a2c040f55c075ba408d46ba84573d389cd886964668d33391e24ea2185460db9c9d3948b8b4ec26dfb5b2e2910fce28 SHA512 5bbd8d1559b89c3b54ed28affafba75a9777f3da867b8aac3657845ccf5bc715d2bb8ac083e5045ea4ac3a6cc6537c4f73ae0d8529bc986e406cd72c8977cf71
+EBUILD ugrd-1.25.0.ebuild 2100 BLAKE2B a2c38544c309497094cdce787b120afd9c1f84affe6618d25344c14672caa6fe32b42190bb83f7b41ec054300bf037410b5a750952cd909dec261ea2af8e3cc2 SHA512 47ffca4f779070dc389c2f9e0052d4b0639945898edf9472d6cd9ea92b4b1a85daf8ad67bc21659362413ae2ced770add057dd0d55edc61999c5cab28722c7ae
+EBUILD ugrd-9999.ebuild 2040 BLAKE2B c05630b0a2d0028e44326a11f26070fc2544576f8a6ffe7628613d866d2175c6b14aa154034c27800a80f060aca277a07c0ce441e39729ac6aeb3ebe6c162d49 SHA512 c91d8023b14d3a4f7ab24d652c939e8022a9b61c746fc58a413513377c9d1729c65fdc90360d7a6d7c6917847221ce9e39da0020f602157f4b88cee01ec9bd2c
 MISC metadata.xml 459 BLAKE2B 4b2afaf098699bd77c60b089a853528c9f8c054623c8c317ec99090572dc5d2e686150303fa69b739f0e654e35e6fe2f43f71df8920cfdb83b17393a67425c22 SHA512 78b8572050924ef651f833821bc1b15ce6e989311a30f0970d966fae78287263f14d67db59b4fc93dd0d8d1c07b89b9b05c42f325b61337f497589b769fdf103
diff --git a/sys-kernel/ugrd/ugrd-1.25.0.ebuild b/sys-kernel/ugrd/ugrd-1.25.0.ebuild
new file mode 100644
index 000000000000..e20626ffd48f
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.25.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+inherit distutils-r1 optfeature shell-completion
+
+DESCRIPTION="Python based initramfs generator with TOML defintions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	app-misc/pax-utils
+	>=dev-python/zenlib-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pycpio-1.4.0[${PYTHON_USEDEP}]
+	sys-apps/pciutils
+"
+
+BDEPEND="
+	test? (
+		amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
+		arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] )
+	)
+"
+
+python_install_all() {
+	# Call the distutils-r1_python_install_all function
+	distutils-r1_python_install_all
+	# Install the example config into /etc/ugrd/config.toml
+	# Do not overwrite an existing config
+	insinto /etc/ugrd
+	newins examples/example.toml config.toml
+
+	# Install the kernel preinst.d hook
+	exeinto /usr/lib/kernel/preinst.d
+	doexe hooks/installkernel/52-ugrd.install
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/kernel-install/52-ugrd.install
+
+	dobashcomp completion/ugrd  # Install bash autocomplete script
+	dozshcomp completion/_ugrd  # Install zsh autocomplete script
+}
+
+pkg_postinst() {
+	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
+	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
+	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
+}
+
+distutils_enable_tests unittest
+
+src_test() {
+	if [[ ! -w '/dev/kvm' ]]; then
+		ewarn "Skipping tests: Cannot write to /dev/kvm."
+		return 1
+	fi
+	if [[ ! -r "$(command -v mount)" ]]; then
+		ewarn "Cannot read the mount binary, tests may fail until"
+		ewarn "util-linux is re-emerged without the sfperms feature."
+	fi
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	eunittest tests/
+}
diff --git a/sys-kernel/ugrd/ugrd-9999.ebuild b/sys-kernel/ugrd/ugrd-9999.ebuild
index 12d394fa29fe..a1497e8e00c7 100644
--- a/sys-kernel/ugrd/ugrd-9999.ebuild
+++ b/sys-kernel/ugrd/ugrd-9999.ebuild
@@ -52,6 +52,7 @@ pkg_postinst() {
 	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
 	optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm]
 	optfeature "ugrd.fs.mdraid support" sys-fs/mdadm
+	optfeature "ugrd.base.plymouth support" sys-boot/plymouth
 }
 
 distutils_enable_tests unittest