commit:     debbe4d189d5f760788968f38a20602c48aa55e5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 03:26:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 05:24:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debbe4d1
sys-apps/util-linux: fix build with linux-headers-5.14 (disable raw)

raw has been removed from the Linux kernel.

Closes: https://bugs.gentoo.org/811702
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{util-linux-9999.ebuild => util-linux-2.37.2-r1.ebuild}        | 7 ++++++-
 sys-apps/util-linux/util-linux-9999.ebuild                         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild 
b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
similarity index 98%
copy from sys-apps/util-linux/util-linux-9999.ebuild
copy to sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
index d6191386e83..f452fde8716 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
@@ -86,6 +86,11 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972
+       "${FILESDIR}"/${P}-ioctl_ns-test-hang.patch # upstream test hang patch
+)
+
 src_prepare() {
        default
 
@@ -190,12 +195,12 @@ multilib_src_configure() {
                        --disable-newgrp
                        --disable-nologin
                        --disable-pylibmount
+                       --disable-raw
                        --disable-vipw
                        --enable-agetty
                        --enable-bash-completion
                        --enable-line
                        --enable-partx
-                       --enable-raw
                        --enable-rename
                        --enable-rfkill
                        --enable-schedutils

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild 
b/sys-apps/util-linux/util-linux-9999.ebuild
index d6191386e83..5a776d6abd3 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -190,12 +190,12 @@ multilib_src_configure() {
                        --disable-newgrp
                        --disable-nologin
                        --disable-pylibmount
+                       --disable-raw
                        --disable-vipw
                        --enable-agetty
                        --enable-bash-completion
                        --enable-line
                        --enable-partx
-                       --enable-raw
                        --enable-rename
                        --enable-rfkill
                        --enable-schedutils

Reply via email to