mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: coreutils: Use upstream's fix for 'tail'.
* gnu/packages/patches/coreutils-racy-tail-test.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (coreutils)[source]: Replace this patch with upstream's fix for 'tail'.
This commit is contained in:
parent
2ae71b746b
commit
e393586161
3 changed files with 8 additions and 15 deletions
|
@ -418,7 +418,6 @@ dist_patch_DATA = \
|
|||
gnu/packages/patches/clang-libc-search-path.patch \
|
||||
gnu/packages/patches/clucene-pkgconfig.patch \
|
||||
gnu/packages/patches/cmake-fix-tests.patch \
|
||||
gnu/packages/patches/coreutils-racy-tail-test.patch \
|
||||
gnu/packages/patches/cpio-gets-undeclared.patch \
|
||||
gnu/packages/patches/cpufrequtils-fix-aclocal.patch \
|
||||
gnu/packages/patches/crda-optional-gcrypt.patch \
|
||||
|
|
|
@ -251,7 +251,14 @@ (define-public coreutils
|
|||
(base32
|
||||
"0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2"))
|
||||
(patches
|
||||
(list (search-patch "coreutils-racy-tail-test.patch")))))
|
||||
(list (origin
|
||||
(method url-fetch)
|
||||
(uri "http://git.savannah.gnu.org/cgit/coreutils.git/\
|
||||
patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0")
|
||||
(sha256
|
||||
(base32
|
||||
"1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz"))
|
||||
(file-name "coreutils-tail-inotify-race.patch"))))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("acl" ,acl) ; TODO: add SELinux
|
||||
("gmp" ,gmp) ;bignums in 'expr', yay!
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
Skip this test, which uncovers a race condition in how 'tail' handles
|
||||
file deletion. See <http://bugs.gnu.org/21460>.
|
||||
|
||||
--- a/tests/tail-2/assert.sh
|
||||
+++ b/tests/tail-2/assert.sh
|
||||
@@ -16,6 +16,7 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
+exit 77 # see <http://bugs.gnu.org/21460>
|
||||
|
||||
# This test fails with tail from textutils-2.0.
|
||||
# It would get something like this:
|
Loading…
Reference in a new issue