[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/

[Andreas K. Hüttel]

commit:     a4593555b7ba91d839773bc4fdc311e98a2913f1
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 18:03:26 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 18:05:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4593555

sys-kernel/dracut: Add LFS define to CFLAGS since we clobber the default

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-kernel/dracut/{dracut-9999.ebuild => dracut-103-r3.ebuild} | 9 +++++++--
 sys-kernel/dracut/dracut-9999.ebuild                           | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sys-kernel/dracut/dracut-9999.ebuild 
b/sys-kernel/dracut/dracut-103-r3.ebuild
similarity index 92%
copy from sys-kernel/dracut/dracut-9999.ebuild
copy to sys-kernel/dracut/dracut-103-r3.ebuild
index 72d9297b5011..2555dbe7a866 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-103-r3.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 ~ia64 ~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}"
@@ -66,6 +66,8 @@ PATCHES=(
        "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
        # Gentoo specific acct-user and acct-group conf adjustments
        "${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
 )
 
 src_configure() {
@@ -76,6 +78,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/dracut-9999.ebuild 
b/sys-kernel/dracut/dracut-9999.ebuild
index 72d9297b5011..87712e61b461 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -3,7 +3,7 @@
 
 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
@@ -76,6 +76,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[@]}"