[PATCH] gnu: blktrace: Update to db4f634.

DoneSubmitted by Vincent Legoll.
Details
2 participants
  • Mathieu Othacehe
  • Vincent Legoll
Owner
unassigned
Severity
normal
V
V
Vincent Legoll wrote on 21 Mar 13:08 +0100
CAEwRq=pq-NhgLDbEFjFObVOzqKwTPA3ZR6Nyju_NnS6JMfKfkA@mail.gmail.com
Wow, that was fast !
The cleanup series got applied instantly, inretrospect, I should have done it beforesubmitting blktrace for inclusion in guix, itwould have caused less churn...
I incremented revision, is that the rightthing to do ?
-- Vincent Legoll
From d07ad04673f45cbfe8c01721de12667ba65ed9e6 Mon Sep 17 00:00:00 2001From: Vincent Legoll <vincent.legoll@gmail.com>Date: Sat, 21 Mar 2020 12:58:33 +0100Subject: [PATCH] gnu: blktrace: Update to db4f634.
* gnu/packages/linux.scm (blktrace): Update to db4f634.[revision]: Increment variable.[patches]: Remove variable.* gnu/packages/patches/blktrace-use-rmtree.patch: Remove file.* gnu/local.mk (dist_patch_DATA): Remove it.--- gnu/local.mk | 1 - gnu/packages/linux.scm | 9 +++--- .../patches/blktrace-use-rmtree.patch | 32 ------------------- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/blktrace-use-rmtree.patch
Toggle diff (79 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex f2f096c51c..0f1a694044 100644--- a/gnu/local.mk+++ b/gnu/local.mk@@ -768,7 +768,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \- %D%/packages/patches/blktrace-use-rmtree.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scmindex 12da3c8f63..a1973c1e60 100644--- a/gnu/packages/linux.scm+++ b/gnu/packages/linux.scm@@ -4014,8 +4014,8 @@ applications.") (define-public blktrace ;; Take a newer commit to get the fix for CVE-2018-10689.- (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc")- (revision "0"))+ (let ((commit "db4f6340e04716285ea56fe26d76381c3adabe58")+ (revision "1")) (package (name "blktrace") (version (git-version "1.2.0" revision commit))@@ -4027,9 +4027,8 @@ applications.") (url home-page) (commit commit))) (sha256- (base32 "1ihdfimg7mfcgdm6l09xfqx5kdyv42x743dxp3z3w65q5vd7xy89"))- (file-name (git-file-name name version))- (patches (search-patches "blktrace-use-rmtree.patch"))))+ (base32 "0ah7xn4qnx09k6bm39p69av7d0c8cl6863drv6a1nf914sq1kpgp"))+ (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:make-flagsdiff --git a/gnu/packages/patches/blktrace-use-rmtree.patch b/gnu/packages/patches/blktrace-use-rmtree.patchdeleted file mode 100644index bb0a10da72..0000000000--- a/gnu/packages/patches/blktrace-use-rmtree.patch+++ /dev/null@@ -1,32 +0,0 @@-From 6d1ce4a3a1a561644695a50c00cbd28494728061 Mon Sep 17 00:00:00 2001-From: Vincent Legoll <vincent.legoll@gmail.com>-Date: Mon, 16 Mar 2020 11:43:19 +0100-Subject: [PATCH 02/10] bno_plot.py: Use shutil.rmtree() instead of- os.system('/bin/rm')------ btt/bno_plot.py | 4 ++--- 1 file changed, 2 insertions(+), 2 deletions(-)--diff --git a/btt/bno_plot.py b/btt/bno_plot.py-index f05cfdc..36fc524 100644---- a/btt/bno_plot.py-+++ b/btt/bno_plot.py-@@ -40,7 +40,7 @@ To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt.- - from __future__ import absolute_import- from __future__ import print_function--import getopt, glob, os, sys, tempfile-+import getopt, glob, os, sys, tempfile, shutil- - verbose = 0- cmds = """-@@ -125,4 +125,4 @@ if __name__ == '__main__':- sys.exit(1)- - os.waitpid(pid, 0)-- os.system('/bin/rm -rf ' + tmpdir)-+ shutil.rmtree(tmpdir)--- -2.20.1--- 2.25.1
M
M
Mathieu Othacehe wrote on 21 Mar 15:22 +0100
(address . guix-patches@gnu.org)(address . 40163-done@debbugs.gnu.org)
87a749kctq.fsf@gmail.com
Hello,
Toggle quote (3 lines)> I incremented revision, is that the right> thing to do ?
Yes, seems fine! Pushed as 93a267b7a40a762a66fa5149336f2c5545cbed30.
Thanks,
Mathieu
?