public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #69745 from worldofpeace/update-f2fs-tools

Browse Source 
f2fs-tools: 1.11.0 -> 1.13.0
This commit is contained in:
worldofpeace 2019-10-04 01:08:09 +00:00 committed by GitHub
commit 0137b08bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/filesystems/f2fs-tools/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "f2fs-tools"; pname = "f2fs-tools";
version = "1.11.0"; version = "1.13.0";
src = fetchgit { src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; sha256 = "0h6wincsvg6s232ajxblg66r5nx87v00a4w7xkbxgbl1qyny477j";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];

20
pkgs/tools/filesystems/f2fs-tools/f2fs-tools-cross-fix.patch
View File

@ -1,25 +1,27 @@
--- f2fs-tools/configure.ac.orig 2018-11-29 05:05:57.154988687 +0300 diff --git a/configure.ac b/configure.ac
+++ f2fs-tools/configure.ac 2018-11-29 05:06:12.667316101 +0300 index 9b0e872..0108219 100644
@@ -20,14 +20,16 @@ --- a/configure.ac
+++ b/configure.ac
@@ -20,14 +20,16 @@ AC_DEFINE([F2FS_MINOR_VERSION], m4_bpatsubst(f2fs_tools_version,
[\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]), [\([0-9]*\).\([0-9]*\)\(\w\|\W\)*], [\2]),
[Minor version for f2fs-tools]) [Minor version for f2fs-tools])
-AC_CHECK_FILE(.git, -AS_IF([test -d .git],[
- AC_DEFINE([F2FS_TOOLS_DATE], - AC_DEFINE([F2FS_TOOLS_DATE],
- "m4_bpatsubst(f2fs_tools_gitdate, - "m4_bpatsubst(f2fs_tools_gitdate,
- [\([0-9-]*\)\(\w\|\W\)*], [\1])", - [\([0-9-]*\)\(\w\|\W\)*], [\1])",
- [f2fs-tools date based on Git commits]), - [f2fs-tools date based on Git commits])],[
- AC_DEFINE([F2FS_TOOLS_DATE], - AC_DEFINE([F2FS_TOOLS_DATE],
- "f2fs_tools_date", - "f2fs_tools_date",
- [f2fs-tools date based on Source releases])) - [f2fs-tools date based on Source releases])])
+dnl AC_CHECK_FILE(.git, +dnl AS_IF([test -d .git],[
+dnl AC_DEFINE([F2FS_TOOLS_DATE], +dnl AC_DEFINE([F2FS_TOOLS_DATE],
+dnl "m4_bpatsubst(f2fs_tools_gitdate, +dnl "m4_bpatsubst(f2fs_tools_gitdate,
+dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])", +dnl [\([0-9-]*\)\(\w\|\W\)*], [\1])",
+dnl [f2fs-tools date based on Git commits]), +dnl [f2fs-tools date based on Git commits])],[
+dnl AC_DEFINE([F2FS_TOOLS_DATE], +dnl AC_DEFINE([F2FS_TOOLS_DATE],
+dnl "f2fs_tools_date", +dnl "f2fs_tools_date",
+dnl [f2fs-tools date based on Source releases])) +dnl [f2fs-tools date based on Source releases])])
+ +
+AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases]) +AC_DEFINE([F2FS_TOOLS_DATE], "f2fs_tools_date", [f2fs-tools date based on Source releases])