public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
Date: Mon, 24 Jan 2022 16:08:38 +0000 (UTC)	[thread overview]
Message-ID: <1643040377.5a614c66095fee76fc55e9fdea5b58e9bd39ef02.sam@gentoo> (raw)

commit:     5a614c66095fee76fc55e9fdea5b58e9bd39ef02
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 16:06:17 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 16:06:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a614c66

sys-apps/util-linux: remove duplicate patch

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

 .../util-linux-2.37.3-ioctl_ns-test-hang.patch     | 37 ----------------------
 sys-apps/util-linux/util-linux-2.37.3.ebuild       |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch b/sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch
deleted file mode 100644
index 73dc0b40a049..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37.3-ioctl_ns-test-hang.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/karelzak/util-linux/commit/597ccb7bf564f65bb059bfe420224cab0fba46ac.patch
-
-From 597ccb7bf564f65bb059bfe420224cab0fba46ac Mon Sep 17 00:00:00 2001
-From: Chris Hofstaedtler <zeha@debian.org>
-Date: Fri, 20 Aug 2021 10:30:50 +0000
-Subject: [PATCH] tests: Skip lsns/ioctl_ns test if unshare fails
-
-Some parts of the Debian build infrastructure uses unshare to run the
-package build, and that appears to cause a "nested" unshare in the
-lsns/ioctl_ns test to fail. Unfortunately the tests then hang at this
-point.
-
-Try running unshare before the actual test, and skip the test if unshare
-already fails.
-
-[kzak@redhat.com: - add --fork to the test
-                  - don't write to stdout/err]
-
-Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- tests/ts/lsns/ioctl_ns | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns
-index ef6360607..fa626bfda 100755
---- a/tests/ts/lsns/ioctl_ns
-+++ b/tests/ts/lsns/ioctl_ns
-@@ -34,6 +34,8 @@ ts_check_prog "mkfifo"
- ts_check_prog "touch"
- ts_check_prog "uniq"
- 
-+$TS_CMD_UNSHARE --user --pid --mount-proc --fork true &> /dev/null || ts_skip "no namespace support"
-+
- ts_cd "$TS_OUTDIR"
- 
- # The parent process receives namespaces ids via FIFO_DATA from bash

diff --git a/sys-apps/util-linux/util-linux-2.37.3.ebuild b/sys-apps/util-linux/util-linux-2.37.3.ebuild
index 29ca2387ed7a..931702b50a7f 100644
--- a/sys-apps/util-linux/util-linux-2.37.3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.3.ebuild
@@ -86,7 +86,7 @@ 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
+	"${FILESDIR}"/${PN}-2.37.2-ioctl_ns-test-hang.patch # upstream test hang patch
 )
 
 src_prepare() {


             reply	other threads:[~2022-01-24 16:08 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-24 16:08 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-20 17:34 [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/ Mike Gilbert
2024-05-09 23:48 Sam James
2024-03-28 16:44 Sam James
2024-03-18 13:43 Sam James
2023-12-29  1:03 Sam James
2023-11-15 10:39 Sam James
2023-08-03 19:03 Sam James
2023-06-29  6:18 Sam James
2023-05-23  3:14 Sam James
2023-05-19 22:29 Mike Gilbert
2023-02-11 22:13 Mike Gilbert
2021-12-20  4:57 Sam James
2021-09-03 20:57 Sam James
2020-11-20 20:32 Lars Wendler
2020-04-29 16:29 Mike Gilbert
2019-11-19 10:37 Lars Wendler
2019-05-26  9:52 Lars Wendler
2019-05-18 13:06 Lars Wendler
2019-03-24 19:45 Joshua Kinard
2018-11-11  1:50 Thomas Deutschmann
2018-09-26 13:35 Lars Wendler
2018-03-07  9:28 Lars Wendler
2018-03-07  9:28 Lars Wendler
2017-02-26  0:18 Matt Thode
2016-04-02  4:11 Mike Frysinger
2016-03-07 22:26 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1643040377.5a614c66095fee76fc55e9fdea5b58e9bd39ef02.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox