diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-13 03:02:43 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-13 03:02:43 +0000 |
| commit | 4dc2f97ed84159736ecfb5dea5485e83b27810d1 (patch) | |
| tree | a2dacff6c971827db40747ce252c01aad9eea6d2 /sys-kernel/dracut | |
| parent | 51be8f45b17e3da3ac48eca6b16b703bb58fda76 (diff) | |
gentoo auto-resync : 13:11:2024 - 03:02:42
Diffstat (limited to 'sys-kernel/dracut')
| -rw-r--r-- | sys-kernel/dracut/Manifest | 4 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-9999.ebuild | 37 | ||||
| -rw-r--r-- | sys-kernel/dracut/metadata.xml | 7 |
3 files changed, 33 insertions, 15 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 6eaeb0a826b4..185d1fab4169 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -16,5 +16,5 @@ EBUILD dracut-060_pre20240104-r4.ebuild 4582 BLAKE2B 2e90c9669b95ccbdc38a3bedd13 EBUILD dracut-103-r2.ebuild 4693 BLAKE2B 739ea0296e64867ea756d0062e20b6a475e8a70e76b0f306930d35ab42857c83936e90463e01cde10bf255c439442b3309b12dba826f0fe6ce9b9faa909c386e SHA512 5d75977e66c881f067ce86ef52adc3acfe563f17d7bd1ef3887b6c23b9dcbd727b550f1dc4f1cd5352dcd7663d0b863625a4163e1cf2fd5727b42daeb450655e EBUILD dracut-103-r4.ebuild 6183 BLAKE2B d95d7f9b5f2f3c6abba94f647cc18c7bc2c752e16a348d78115008fac8251b3e4abca295e965045d15cbadaeb855f5a9bbf7d8ac8502ea151ab2df96b31049f5 SHA512 abaf01ca4ca3f5cae79a4c36ada95dc085ab9806ac03231561a77629e83b003b3540153ef93e39f0b57da605737193519e6a03abf238774a8913545997d7fa96 EBUILD dracut-105-r3.ebuild 6794 BLAKE2B 44d022baa8c4a06a0ce64ba2e1c79ee207574cd5af8183109276418b286e677e6c5ae0fd64e965985385314e5719abe80490d24a61b86d66ad497abd20627103 SHA512 eba341246301114ad86f73054e6cea7761c1311ea85f05a7203f3dfb703c0e38b4dd74c42e576d067f102ed39012f6165b02203e183c1b10418e48463443cccd -EBUILD dracut-9999.ebuild 6476 BLAKE2B b7565285640c0612764419fe2c2db79191db1a07854b8c7ff30afff2f16df9c16bad171873cc360fa5c4ff3ab8ec497b5826cd87ce944c1037a11d4dd73ca73c SHA512 64b9008a3ed8066dd11c8d81a72ed1c3e65bcb66fa8f4824504c8c30804ac9e5dc8dc5ff2108536fb1e46e7b5e8db250a6283bc9107a589930872a177708a36d -MISC metadata.xml 572 BLAKE2B a1f308c046673cc7acfc4c74cb78b8fd24527241eec46193004ac64fdd17f325eab761b19fdd5428071f4db6e7c1cc27ccaedd89a2724adc6226dd7e96f3714f SHA512 651ea5de77053dbb2b172e3f2a8d8e2d57957bfb726ef78801091f9f1c7c03fde9fe086cd28e94e2e6102b9a2e99f32cb84a6150b4f6b2b6a9cadae3856bad29 +EBUILD dracut-9999.ebuild 6820 BLAKE2B 4435daa30e94641d9630fc45b1726aadaf96d3c337fb8b57c3ce620d4a46ed179f9491b0e311ea3ae9fcc1490eba1eba844bc1fc62343386b417fa507f9e2207 SHA512 5669a0c8ceba5792b1e41a5a13fcc63e8f409d573e2fee38f1527d9fe40cec798c3618dafa7aa3c67be286cee7f4630bb20c936b98ef7d17a13470bb6f65a433 +MISC metadata.xml 649 BLAKE2B 0b6afdf3bfb6dd4f90fdac5e1dbd2e65224bceed9d59c09ba0fad14153af2e338ba2f8873a58f6423795c07ab1b9a5661a43ad0690682162bfef6f19f344440c SHA512 fec50b992b00ebc91c0662c32861a58d94c643155f082b14141cad0c5a2ce2c615d858adac26b20ce03d0fdeb48dcb5e63fa830856b3105e1ab67fdd3fa835f7 diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index ac29cf44513b..40da9319cb51 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 +CARGO_OPTIONAL=1 -inherit flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs +inherit cargo flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -21,7 +22,7 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki" LICENSE="GPL-2" SLOT="0" -IUSE="selinux test" +IUSE="+dracut-cpio selinux test" RESTRICT="test" PROPERTIES="test? ( test_privileged test_network )" @@ -59,6 +60,7 @@ BDEPEND=" >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig + dracut-cpio? ( ${RUST_DEPEND} ) test? ( net-nds/rpcbind net-fs/nfs-utils @@ -101,12 +103,17 @@ PATCHES=( "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch ) +pkg_setup() { + use dracut-cpio && rust_pkg_setup +} + src_configure() { local myconf=( --prefix="${EPREFIX}/usr" --sysconfdir="${EPREFIX}/etc" --bashcompletiondir="$(get_bashcompdir)" --systemdsystemunitdir="$(systemd_get_systemunitdir)" + --disable-dracut-cpio ) # this emulates what the build system would be doing without us @@ -115,6 +122,19 @@ src_configure() { tc-export CC PKG_CONFIG edo ./configure "${myconf[@]}" + if use dracut-cpio; then + cargo_gen_config + cargo_src_configure + fi +} + +src_compile() { + default + if use dracut-cpio; then + pushd src/dracut-cpio >/dev/null || die + cargo_src_compile + popd >/dev/null || die + fi } src_test() { @@ -140,17 +160,12 @@ src_install() { AUTHORS NEWS.md README.md - docs/HACKING.md - docs/README.cross - docs/README.kernel - docs/RELEASE.md - docs/SECURITY.md ) - default - - docinto html - dodoc dracut.html + if use dracut-cpio; then + exeinto /usr/lib/dracut + doexe "src/dracut-cpio/$(cargo_target_dir)/dracut-cpio" + fi } pkg_preinst() { diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml index 2fcbcf06bc84..f1071d29e6e2 100644 --- a/sys-kernel/dracut/metadata.xml +++ b/sys-kernel/dracut/metadata.xml @@ -10,9 +10,12 @@ <name>Mike Gilbert</name> </maintainer> <maintainer type="person"> - <email>andrewammerlaan@gentoo.org</email> - <name>Andrew Ammerlaan</name> + <email>nowa@gentoo.org</email> + <name>Nowa Ammerlaan</name> </maintainer> + <use> + <flag name="dracut-cpio">Build the enhanced 'dracut-cpio' program</flag> + </use> <upstream> <remote-id type="github">dracut-ng/dracut-ng</remote-id> </upstream> |