diff options
Diffstat (limited to 'sys-apps/systemd-utils')
| -rw-r--r-- | sys-apps/systemd-utils/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/metadata.xml | 2 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild (renamed from sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild) | 56 |
3 files changed, 44 insertions, 18 deletions
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index 53bf250f1b12..b0b487cad2ec 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -11,5 +11,5 @@ DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15 DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c EBUILD systemd-utils-253.11-r1.ebuild 12608 BLAKE2B aa3fc7468ada1b120d868cdbc94eeb22a5a4ec7ddbcca37d364cd996094021c82e8c98a2ff1e42f04cf57314ceb9a48b1edf7df3976de926fbfe208f422dd459 SHA512 51739b8478efb3bbf326b8681bb51adc2e150316fcae68984d68cbc05389e09c45da06cc77bb96ff2d43ad6c1951b91e05d41377e02684aa873d7c603e183d4d EBUILD systemd-utils-253.12-r1.ebuild 12616 BLAKE2B ba823f24fc2b19f5aa9ca1ff9df8521efe9847d5440cd3dfa35c912f5b8d32418cc13220e8e50422350f0dd1812f38a6c06c44d9e518aad3ebca9d17d4564029 SHA512 abb188db7c96f7a2afb022fb548106870f876fbeeac5cb415b2ef26fd34254ddad0568d6f74c1165dbb2549c5d144d7bfabef7aedf6ce120c1c1b339ccda4e16 -EBUILD systemd-utils-254.5-r1.ebuild 12535 BLAKE2B 1b0bc042a678b70c5e62001e84f6227696cba0123229a68b992f5fba0807345bb1ef6aac66e944ca797dadfb69fc95c872b3a28453a5ae0947f327a68f0cb234 SHA512 f622e19c0fe73c2775bd0eaa32c10eba0ee70c05bff1f9172640ac768a1680c701d3fa8f1b603aab1bf6ac09292a7710291c7b3abd21ab12e31b34fc3a377506 -MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4 +EBUILD systemd-utils-254.5-r2.ebuild 13076 BLAKE2B b3da8f4d0f6ce116618e6f7885b41bc0ef5724b1ec3d58b7fd080494a29bb101dddab4e0fc278a50ba340c1988055fe6a5ee352bc1aad33012226a1ee4d15dad SHA512 90b6f053e921aa6d80b19d484a5f5ac8f74325f1d4e2e08e379a1fb53456e7250b60e9969b6b3ca7e5ce26ac6215d419742e81f36decc6ebbb3d47b2f1f35e27 +MISC metadata.xml 821 BLAKE2B 6bef03e6675a5b12c8df50bdea38186cdd89d28451a8fbc2d1af1946c4c0978ae9e7a0153506a1c26c2e24b2f8569c168fc30c79e48f2b804666f2feaa728b13 SHA512 eb7e2dee51117fcd21417c37ab0283f2f10aff20d0fbe6762ee2bca2c7888e5a5835fe5195a1dcbf298d80105e3aa84f36f897088804b5f0a1ed38ad673f2603 diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml index a5585a7ca034..e2af023a5096 100644 --- a/sys-apps/systemd-utils/metadata.xml +++ b/sys-apps/systemd-utils/metadata.xml @@ -6,10 +6,12 @@ </maintainer> <use> <flag name="boot">Enable systemd-boot (UEFI boot manager)</flag> + <flag name="kernel-install">Enable kernel-install</flag> <flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag> <flag name="sysusers">Enable systemd-sysusers</flag> <flag name="tmpfiles">Enable systemd-tmpfiles</flag> <flag name="udev">Enable systemd-udev (userspace device manager)</flag> + <flag name="ukify">Enable systemd-ukify</flag> </use> <upstream> <remote-id type="github">systemd/systemd</remote-id> diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild index 12e727d7e3fa..d31c70d4444c 100644 --- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild @@ -28,9 +28,11 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t LICENSE="GPL-2 LGPL-2.1 MIT public-domain" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev" +IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify" REQUIRED_USE=" - || ( boot tmpfiles sysusers udev ) + || ( kernel-install tmpfiles sysusers udev ) + boot? ( kernel-install ) + ukify? ( boot ) ${PYTHON_REQUIRED_USE} " RESTRICT="!test? ( test )" @@ -61,8 +63,8 @@ DEPEND="${COMMON_DEPEND} PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]' RDEPEND="${COMMON_DEPEND} - boot? ( - !<sys-boot/systemd-boot-250 + boot? ( !<sys-boot/systemd-boot-250 ) + ukify? ( ${PYTHON_DEPS} $(python_gen_cond_dep "${PEFILE_DEPEND}") ) @@ -105,10 +107,8 @@ BDEPEND=" $(python_gen_cond_dep " dev-python/jinja[\${PYTHON_USEDEP}] dev-python/lxml[\${PYTHON_USEDEP}] - boot? ( - >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] - test? ( ${PEFILE_DEPEND} ) - ) + boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] ) + ukify? ( test? ( ${PEFILE_DEPEND} ) ) ") " @@ -159,11 +159,13 @@ multilib_src_configure() { -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" -Dsysvinit-path= $(meson_native_use_bool boot bootloader) + $(meson_native_use_bool kernel-install) $(meson_native_use_bool selinux) $(meson_native_use_bool sysusers) $(meson_use test tests) $(meson_native_use_bool tmpfiles) $(meson_use udev hwdb) + $(meson_native_use_bool ukify) # Link staticly with libsystemd-shared -Dlink-boot-shared=false @@ -282,14 +284,18 @@ multilib_src_compile() { if use boot; then targets+=( bootctl - kernel-install man/bootctl.1 - man/kernel-install.8 - 90-loaderentry.install src/boot/efi/linux$(efi_arch).efi.stub src/boot/efi/systemd-boot$(efi_arch).efi ) fi + if use kernel-install; then + targets+=( + kernel-install + 90-loaderentry.install + man/kernel-install.8 + ) + fi if use sysusers; then targets+=( systemd-sysusers.standalone @@ -359,6 +365,13 @@ multilib_src_compile() { ) fi fi + if use ukify; then + targets+=( + ukify + 60-ukify.install + man/ukify.1 + ) + fi fi if use udev; then targets+=( @@ -425,14 +438,19 @@ multilib_src_install() { if multilib_is_native_abi; then if use boot; then into /usr - dobin bootctl kernel-install - doman man/{bootctl.1,kernel-install.8} - # 90-loaderentry.install is generated from 90-loaderentry.install.in - exeinto usr/lib/kernel/install.d - doexe src/kernel-install/*.install + dobin bootctl + doman man/bootctl.1 insinto usr/lib/systemd/boot/efi doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi} fi + if use kernel-install; then + dobin kernel-install + doman man/kernel-install.8 + # copy the default set of plugins + cp "${S}/src/kernel-install/"*.install src/kernel-install || die + exeinto usr/lib/kernel/install.d + doexe src/kernel-install/*.install + fi if use sysusers; then into "${rootprefix:-/}" newbin systemd-sysusers{.standalone,} @@ -468,6 +486,11 @@ multilib_src_install() { doman man/libudev.3 doman man/udev_*.3 fi + if use ukify; then + exeinto "${rootprefix}"/lib/systemd/ + doexe ukify + doman man/ukify.1 + fi fi if use udev; then meson_install --no-rebuild --tags libudev @@ -524,6 +547,7 @@ multilib_src_install_all() { doins shell-completion/zsh/_udevadm fi + use ukify && python_fix_shebang "${ED}" use boot && secureboot_auto_sign } |