diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 53a7aab..30d6e0c 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,7 +1,8 @@ AUX crypt-ssh-luks.patch 4281 BLAKE2B 0588c4791c279a89be00da1fcdf4dcb38a88cac199fd0f34c0849e50262f86d7c6f194755a439fbf17abbd8b5ffd30833de27daf0d1e32001199b64e92ae73c1 SHA512 3c1274ae5449e31bade2d466080d66a5324d1d3e6539e67adf2fb47cda69cea9dc8962765dd8c539f6f23b27a36a331de771ccc401b0818692b3fd932ead764b AUX dracut-103-acct-user-group-gentoo.patch 915 BLAKE2B 75747b3775d04dd777d2a0f61116bbb83784b1a58656655ee6b441e79d1dc8e35a940dfbb0d4018ff27ba80c0581949d98326ebbc6804348004546a2ee1285ed SHA512 e6b4115a6121289a4ec814ddf4e4394f64096b298c3ab6393e197b19235ff494258478d8d74b9dfc570b122cc2122375b24c088a037b0ebf2ac5d9f6a54dcb67 +AUX dracut-103-always-install-libsystemd.patch 853 BLAKE2B d101e87231f09c376181a3b97d371dce218168d36d234f00e9aef526e03d7b1cfaea7bb7a275d3428649c4934b69c78ef645af027d7be90eb48af0dd4c64104a SHA512 413e9d95c613d0f6e21c89922b157af2e126ca581fbee070cd219e33915d38c288bc84a774103ce713a2e78d1453fcaecb07975d8b2df200bf0ce4cb33f2ee4e AUX dracut-103-systemd-udev-256-kmod.patch 1616 BLAKE2B f1c15c4cd57d947f92f286c1fd9a4b045837017e965aa9b2707a15dea4426b0c349ad65e53f0b6a6e4dc7ddc999773a1af161cac2eac724d047a8d3109a8aeaa SHA512 359dfc2ee79d7647676c2b343f1b4bc23f11bc296c6b6c9be1525f87965be1ee8d4105f25dc6dc39dcdbca7a0d229a704a11416e7757739159493c6dc930f182 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277 -EBUILD dracut-103-r2.ebuild 4735 BLAKE2B 7c4521a5eb8a1c38f9c0aa9bf1d8c797e9172c0da65d6748ef9541d99af0429eef09e8e212c4691077e0f76af189cffe5b87e127a4bc07a3d94c7e446153d063 SHA512 c376469d1fb552e9fdc40a963b4f2533b8c32aeaf5534f0c317c767dda5cd8c7590a2dde033f08815942407edde7f5747f6ba0673b56cf33f11a87430ac9cc32 +EBUILD dracut-103-r4.ebuild 4942 BLAKE2B 8a4a27c437e25a135f0567388b2d35392be53d70c7d9bec92ad1ffd785b941fe934aa83beff593a37e71ee4b9e994ade7ba68f7baa554dfb6ab2e340b30313ae SHA512 76c8c66ff3f69828e20f98cafd5da5dd21617bd5db523a72ff2fc11c1a23f61f15dd872eb67cf5330ec90c912287a7f05e7a6c4428c56f9bee7e9e6fef4e57c2 MISC metadata.xml 479 BLAKE2B 76b6d6da8d9ee65fac81f1a30999f3a095a9cbd8c91fbee63edaad61c0a429d5ba43f18979e10cd73ba6a87d89213397a9ee6621f61168c1bd461bb866c4f02b SHA512 e4b9f639c157b0104058c0e124be1d3d1f01e836e7182f0c8ec6852133ed36a52b5cfe0ec83142f185ad3f9b20192c719b83e2ee405b874420bb4e09ec01a38b diff --git a/sys-kernel/dracut/dracut-103-r2.ebuild b/sys-kernel/dracut/dracut-103-r4.ebuild similarity index 92% rename from sys-kernel/dracut/dracut-103-r2.ebuild rename to sys-kernel/dracut/dracut-103-r4.ebuild index 4299ede..c7132e1 100644 --- a/sys-kernel/dracut/dracut-103-r2.ebuild +++ b/sys-kernel/dracut/dracut-103-r4.ebuild @@ -3,14 +3,14 @@ EAPI=8 -inherit bash-completion-r1 edo optfeature systemd toolchain-funcs +inherit flag-o-matic bash-completion-r1 edo optfeature systemd toolchain-funcs if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng" else if [[ "${PV}" != *_rc* ]]; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" fi SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-ng-${PV}" @@ -68,6 +68,8 @@ PATCHES=( "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch # https://github.com/dracut-ng/dracut-ng/pull/507 "${FILESDIR}"/${PN}-103-systemd-udev-256-kmod.patch + # libsystemd-core is sometimes missing + "${FILESDIR}"/${PN}-103-always-install-libsystemd.patch "${FILESDIR}"/crypt-ssh-luks.patch ) @@ -79,6 +81,9 @@ src_configure() { --systemdsystemunitdir="$(systemd_get_systemunitdir)" ) + # this emulates what the build system would be doing without us + append-cflags -D_FILE_OFFSET_BITS=64 + tc-export CC PKG_CONFIG edo ./configure "${myconf[@]}" diff --git a/sys-kernel/dracut/files/dracut-103-always-install-libsystemd.patch b/sys-kernel/dracut/files/dracut-103-always-install-libsystemd.patch new file mode 100644 index 0000000..f2533e1 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-103-always-install-libsystemd.patch @@ -0,0 +1,21 @@ +From 921792f201e954de461d3b551e01b5369d666db8 Mon Sep 17 00:00:00 2001 +From: Antonio Alvarez Feijoo +Date: Tue, 10 Sep 2024 15:51:46 +0200 +Subject: [PATCH] feat(systemd): always install libsystemd libraries + +--- + modules.d/00systemd/module-setup.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh +index 498cd7edd..fb8a8200b 100755 +--- a/modules.d/00systemd/module-setup.sh ++++ b/modules.d/00systemd/module-setup.sh +@@ -156,5 +156,6 @@ EOF + _arch=${DRACUT_ARCH:-$(uname -m)} + inst_libdir_file \ + {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \ +- {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" ++ {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" \ ++ {"tls/$_arch/",tls/,"$_arch/",}"systemd/libsystemd*.so" + }