From 72aa295e44d46f80a037bfdc68f831bee56efbab Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Thu, 26 Apr 2018 02:15:55 +0200
Subject: [PATCH] gnu: Add f2fs-tools@1.7.0.

* gnu/packages/linux.scm (f2fs-tools-1.7): New variable.
(f2fs-tools): Inherit from f2fs-tools-1.7.
---
 gnu/packages/linux.scm | 69 ++++++++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ac28b2b453..7648b55764 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3264,8 +3264,54 @@ repair and easy administration.")
 from the btrfs-progs package.  It is meant to be used in initrds.")
     (license (package-license btrfs-progs))))
 
+(define-public f2fs-tools-1.7
+  (package
+    (name "f2fs-tools")
+    (version "1.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://git.kernel.org/cgit/linux/kernel/git/jaegeuk"
+                    "/f2fs-tools.git/snapshot/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k"))))
+
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'bootstrap
+           (lambda _
+             (zero? (system* "autoreconf" "-vif"))))
+         (add-after 'install 'install-headers
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (out-include (string-append out "/include")))
+               (install-file "include/f2fs_fs.h" out-include)
+               (install-file "mkfs/f2fs_format_utils.h" out-include)
+               #t))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libuuid" ,util-linux)
+       ("libselinux" ,libselinux)))
+    (home-page "https://f2fs.wiki.kernel.org/")
+    (synopsis "Userland tools for f2fs")
+    (description
+     "F2FS, the Flash-Friendly File System, is a modern file system
+designed to be fast and durable on flash devices such as solid-state
+disks and SD cards.  This package provides the userland utilities.")
+    ;; The formatting utility, libf2fs and include/f2fs_fs.h is dual
+    ;; GPL2/LGPL2.1, everything else is GPL2 only. See 'COPYING'.
+    (license (list license:gpl2 license:lgpl2.1))))
+
 (define-public f2fs-tools
   (package
+    (inherit f2fs-tools-1.7)
     (name "f2fs-tools")
     (version "1.8.0")
     (source (origin
@@ -3276,29 +3322,8 @@ from the btrfs-progs package.  It is meant to be used in initrds.")
               (sha256
                (base32
                 "1bir9ladb58ijlcvrjrq1fb1xv5ys50zdjaq0yzliib0apsyrnyl"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'bootstrap
-           (lambda _
-             (zero? (system* "autoreconf" "-vif")))))))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("pkg-config" ,pkg-config)))
     (inputs
-     `(("libuuid" ,util-linux)))
-    (home-page "https://f2fs.wiki.kernel.org/")
-    (synopsis "Userland tools for f2fs")
-    (description
-     "F2FS, the Flash-Friendly File System, is a modern file system
-designed to be fast and durable on flash devices such as solid-state
-disks and SD cards.  This package provides the userland utilities.")
-    ;; The formatting utility, libf2fs and include/f2fs_fs.h is dual
-    ;; GPL2/LGPL2.1, everything else is GPL2 only. See 'COPYING'.
-    (license (list license:gpl2 license:lgpl2.1))))
+     `(("libuuid" ,util-linux)))))
 
 (define-public freefall
   (package