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/coreutils/
Date: Tue, 12 Apr 2022 06:58:43 +0000 (UTC)	[thread overview]
Message-ID: <1649746553.eb4e0914066925d32a5311ac09a1965f637da9c1.sam@gentoo> (raw)

commit:     eb4e0914066925d32a5311ac09a1965f637da9c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 06:42:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 06:55:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4e0914

sys-apps/coreutils: test fixes & rebase patchset

- Skip known-failing-under-sandbox tests/dd/no-allocate.sh test
- Rebase patches (... and apply them in the snapshot as a result)
- Run test suite in parallel

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

 sys-apps/coreutils/Manifest                               |  1 +
 ...p20220409.ebuild => coreutils-9.0_p20220409-r1.ebuild} | 15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index fd48060a5f87..90c9d7047758 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -2,5 +2,6 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
 DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30
+DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
 DIST coreutils-9.0_p20220409.tar.xz 5689096 BLAKE2B d9b037947362f6823339fc234051886370eb9d2cbb19b15006e6a5e44db80d259159ffe6255c42565f02a2dcb79499af9f57c3ed5c21fd1ece1589da8109cd74 SHA512 7f8fda5d3e65768f9b0aa5da7bbc84ac1e24a8e87a840bb9a013dd8875346b5e9ccc3613de95478c87b859dd2a454651768852cbd67e1466ec3f6d7fef4fe938
 DIST coreutils-9.0_p20220409.tar.xz.sig 833 BLAKE2B 8de0a283394dfc80b5cde5a051190af3c9fe5344881db3d2eacb2b3ae7a0cd037513a610dc564d37a055af8a2d823cdc7d6a0999bcc3a0c688d53570d792fe46 SHA512 72c491ec43d3deed3d291bdae13fb54a6b1ec2d37233f4a115075a60a19ec5b522a414b2e1768e3f21e66152a031777c8bd435624fd0171eb9257de20b3d11dc

diff --git a/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild b/sys-apps/coreutils/coreutils-9.0_p20220409-r1.ebuild
similarity index 93%
rename from sys-apps/coreutils/coreutils-9.0_p20220409.ebuild
rename to sys-apps/coreutils/coreutils-9.0_p20220409-r1.ebuild
index 8460bd016468..776a67104587 100644
--- a/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild
+++ b/sys-apps/coreutils/coreutils-9.0_p20220409-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
 inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
-PATCH="${PN}-8.30-patches-01"
+MY_PATCH="${PN}-9.0_p20220409-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 
@@ -20,15 +20,13 @@ if [[ ${PV} == *_p* ]] ; then
 	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		!vanilla? (
-			mirror://gentoo/${PATCH}.tar.xz
-			https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
-		)
 		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
@@ -91,10 +89,8 @@ src_prepare() {
 		# Upstream patches
 	)
 
-	if [[ ${PV} != *_p* ]] && ! use vanilla ; then
+	if ! use vanilla ; then
 		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch )
 	fi
 
 	default
@@ -198,8 +194,7 @@ src_test() {
 	addwrite /dev/full
 	#export RUN_EXPENSIVE_TESTS="yes"
 	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
+	env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes
 }
 
 src_install() {


             reply	other threads:[~2022-04-12  6:58 UTC|newest]

Thread overview: 222+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-12  6:58 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-28 14:20 [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/ Arthur Zamarin
2025-10-28  8:59 Sam James
2025-09-12 14:36 Arthur Zamarin
2025-09-12 14:36 Arthur Zamarin
2025-09-12 14:36 Arthur Zamarin
2025-09-12 14:36 Arthur Zamarin
2025-05-31 22:23 Sam James
2025-05-18 12:05 Sam James
2025-04-13 21:22 Sam James
2025-04-09 12:24 Sam James
2025-04-06  2:02 Sam James
2025-02-04 19:22 Mike Gilbert
2025-01-19  1:14 Sam James
2024-12-09  7:41 Arthur Zamarin
2024-10-07  7:28 Sam James
2024-07-07  1:02 Ionen Wolkens
2024-07-05 19:41 Viorel Munteanu
2024-07-05 19:41 Viorel Munteanu
2024-07-04  0:49 Sam James
2024-06-24  0:43 Sam James
2024-05-29  6:26 Jakov Smolić
2024-05-18 10:19 Sam James
2024-05-09 23:09 Sam James
2024-04-06  6:50 Arthur Zamarin
2024-03-28 16:44 Sam James
2024-03-27  5:16 Sam James
2024-03-26 23:40 Sam James
2024-03-23 20:27 Sam James
2024-03-23 20:19 Sam James
2024-03-23 20:19 Sam James
2024-03-22 13:15 Arthur Zamarin
2024-03-22 13:15 Arthur Zamarin
2024-03-14  6:53 Arthur Zamarin
2024-03-14  6:53 Arthur Zamarin
2024-03-14  6:53 Arthur Zamarin
2024-03-14  6:53 Arthur Zamarin
2024-01-16  5:46 Viorel Munteanu
2024-01-16  5:46 Viorel Munteanu
2023-12-22 17:47 Arthur Zamarin
2023-10-26 22:39 Sam James
2023-10-23 14:05 Arthur Zamarin
2023-10-22 12:22 Sam James
2023-08-29 19:08 Sam James
2023-08-27 23:32 Sam James
2023-08-26 20:32 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-18 17:48 Sam James
2023-07-17  6:12 Sam James
2023-07-07 22:52 Sam James
2023-06-27 16:11 Sam James
2023-06-17 22:47 Sam James
2023-05-29  0:41 Sam James
2023-05-27  9:43 Sam James
2023-05-25  6:44 Sam James
2023-05-25  4:37 Sam James
2023-05-05  3:08 Sam James
2023-05-05  3:08 Sam James
2023-04-19  6:29 Sam James
2023-04-18 16:40 Sam James
2023-04-18 15:41 Sam James
2023-04-10 21:54 Sam James
2023-03-20 21:38 Sam James
2023-03-15  1:51 Sam James
2023-03-14 19:48 Sam James
2023-02-04 20:06 Sam James
2023-02-03 13:34 Sam James
2023-02-03 13:34 Sam James
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2023-01-21  6:57 Arthur Zamarin
2022-12-02 19:02 Arthur Zamarin
2022-12-01 19:05 Arthur Zamarin
2022-11-28 11:33 Andreas K. Hüttel
2022-11-28  2:50 Mike Gilbert
2022-11-27 23:17 Andreas K. Hüttel
2022-11-26 19:04 Arthur Zamarin
2022-11-26 19:04 Arthur Zamarin
2022-11-26 19:04 Arthur Zamarin
2022-11-25  9:24 Arthur Zamarin
2022-11-25  2:51 Sam James
2022-11-24 20:42 Sam James
2022-09-19  3:28 Sam James
2022-04-17 17:06 Sam James
2022-04-16  2:09 Sam James
2022-04-12  5:58 Sam James
2022-04-07  3:57 Sam James
2022-01-15 22:22 Georgy Yakovlev
2021-12-19 11:23 Sam James
2021-11-11 18:10 Georgy Yakovlev
2021-11-11 18:08 Georgy Yakovlev
2021-11-11  3:13 Sam James
2021-11-10  6:13 Sam James
2021-09-28  2:02 Sam James
2021-09-25 18:11 Sam James
2021-09-24 19:39 Sam James
2021-09-21 20:44 Sam James
2021-05-23  8:01 Michał Górny
2021-05-13 13:55 David Seifert
2021-05-13 13:55 David Seifert
2021-01-01  1:56 Michał Górny
2020-09-19 20:06 Sergei Trofimovich
2020-09-06 22:04 Sam James
2020-09-05  4:05 Sam James
2020-08-18 16:52 Agostino Sarubbo
2020-08-15  4:16 Sam James
2020-08-15  4:09 Sam James
2020-08-15  3:43 Sam James
2020-08-14 23:58 Sam James
2020-08-14 16:03 Sam James
2020-05-09  0:24 Aaron Bauman
2020-04-29 15:21 Thomas Deutschmann
2020-03-23 22:06 Sergei Trofimovich
2020-03-15 13:13 Mikle Kolyada
2020-03-07 11:06 Agostino Sarubbo
2020-03-07 10:58 Agostino Sarubbo
2020-03-07 10:54 Agostino Sarubbo
2020-03-07 10:50 Agostino Sarubbo
2020-03-07  8:59 Agostino Sarubbo
2020-03-07  8:25 Agostino Sarubbo
2020-03-06 12:32 Agostino Sarubbo
2020-03-06 11:35 Agostino Sarubbo
2020-03-05 15:26 Lars Wendler
2020-03-05 15:22 Lars Wendler
2020-02-10 13:26 Michał Górny
2020-02-07 17:00 Mike Gilbert
2020-02-07 16:54 Mike Gilbert
2019-09-03 17:30 William Hubbs
2019-09-03  3:42 William Hubbs
2019-05-05 19:54 Mikle Kolyada
2019-05-03 23:50 Mikle Kolyada
2019-03-11  9:33 Lars Wendler
2019-03-09  7:44 Mikle Kolyada
2019-03-02 15:49 Mikle Kolyada
2019-03-02 15:49 Mikle Kolyada
2019-03-02 15:49 Mikle Kolyada
2019-03-02 15:49 Mikle Kolyada
2019-02-28 15:23 Mikle Kolyada
2019-02-25  7:24 Mikle Kolyada
2019-02-25  7:24 Mikle Kolyada
2019-02-12 13:29 Mart Raudsepp
2019-02-07 17:26 Mikle Kolyada
2019-02-07 12:31 Tobias Klausmann
2019-02-04 19:41 Sergei Trofimovich
2019-01-18 12:55 Mikle Kolyada
2018-12-29 13:21 Mikle Kolyada
2018-07-21 14:27 Mikle Kolyada
2018-07-21  9:47 Tobias Klausmann
2018-07-13 18:46 Sergei Trofimovich
2018-07-12 21:16 Sergei Trofimovich
2018-07-09 17:09 Mart Raudsepp
2018-07-09 14:28 Thomas Deutschmann
2018-07-09 13:11 Mikle Kolyada
2018-07-02  7:41 Lars Wendler
2018-07-02  7:41 Lars Wendler
2018-05-30 23:28 Thomas Deutschmann
2018-05-29  8:11 Mike Frysinger
2018-05-24 16:10 Lars Wendler
2018-04-26  8:18 Lars Wendler
2018-04-20  9:23 Mart Raudsepp
2018-01-20 18:04 Tobias Klausmann
2018-01-10  6:19 Markus Meier
2017-12-29 17:41 Sergei Trofimovich
2017-12-27 22:47 Thomas Deutschmann
2017-12-25 11:42 Markus Meier
2017-12-21  5:45 Markus Meier
2017-11-29 11:27 Lars Wendler
2017-11-24 20:26 Sergei Trofimovich
2017-11-23 23:52 Matt Turner
2017-11-23 23:06 Sergei Trofimovich
2017-11-21  7:54 Sergei Trofimovich
2017-11-20 22:03 Sergei Trofimovich
2017-11-20 13:06 Manuel Rüger
2017-11-20 10:16 Jeroen Roovers
2017-11-19 20:24 Thomas Deutschmann
2017-11-10 17:00 Matt Turner
2017-11-10 10:16 Sergei Trofimovich
2017-11-07 22:44 Sergei Trofimovich
2017-11-06 21:02 Thomas Deutschmann
2017-11-06 16:22 Thomas Deutschmann
2017-11-05 21:29 Thomas Deutschmann
2017-11-05 21:29 Thomas Deutschmann
2017-10-10 16:47 Robin H. Johnson
2017-10-02 13:42 Manuel Rüger
2017-09-24 18:27 Sergei Trofimovich
2017-09-23 21:01 Sergei Trofimovich
2017-09-23 19:00 Sergei Trofimovich
2017-09-11  7:53 Sergei Trofimovich
2017-09-09 10:27 Markus Meier
2017-09-04 10:47 Tobias Klausmann
2017-09-03  8:34 Michał Górny
2017-09-02 17:29 Sergei Trofimovich
2017-09-02  7:12 Lars Wendler
2017-03-13  3:15 Mike Frysinger
2017-03-09  7:07 Mike Frysinger
2017-02-03 10:11 Lars Wendler
2017-01-20 12:01 Lars Wendler
2017-01-19 14:14 Mike Frysinger
2017-01-07 11:03 Jeroen Roovers
2016-12-24  9:26 Markus Meier
2016-11-30 21:12 Lars Wendler
2016-11-30 21:12 Lars Wendler
2016-11-27 22:02 Thomas Deutschmann
2016-11-27 17:51 Tobias Klausmann
2016-04-16  6:29 Mike Frysinger
2016-04-01 14:09 Mike Gilbert
2016-01-20 18:43 Mike Frysinger
2016-01-20 18:43 Mike Frysinger
2016-01-20 18:42 Mike Frysinger
2015-11-24 22:01 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=1649746553.eb4e0914066925d32a5311ac09a1965f637da9c1.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