summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/f2fs-tools/0001-fibmap.f2fs-compile-fix-for-musl-libc.patch36
-rw-r--r--main/f2fs-tools/APKBUILD12
2 files changed, 4 insertions, 44 deletions
diff --git a/main/f2fs-tools/0001-fibmap.f2fs-compile-fix-for-musl-libc.patch b/main/f2fs-tools/0001-fibmap.f2fs-compile-fix-for-musl-libc.patch
deleted file mode 100644
index 6999cd91d..000000000
--- a/main/f2fs-tools/0001-fibmap.f2fs-compile-fix-for-musl-libc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 38be92a84bb368a9e70e3d7bfb58ffd8075af58b Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 3 Mar 2014 09:14:57 +0000
-Subject: [PATCH] fibmap.f2fs: compile fix for musl libc
-
-Include sys/types.h for major/minor macros.
-
-This fixes the following compile error with musl libc:
-fibmap.o: In function `print_stat':
-/home/ncopa/src/f2fs-tools/tools/fibmap.c:34: undefined reference to `minor'
-/home/ncopa/src/f2fs-tools/tools/fibmap.c:34: undefined reference to `major'
-fibmap.o: In function `stat_bdev':
-/home/ncopa/src/f2fs-tools/tools/fibmap.c:54: undefined reference to `minor'
-/home/ncopa/src/f2fs-tools/tools/fibmap.c:54: undefined reference to `major'
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- tools/fibmap.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/fibmap.c b/tools/fibmap.c
-index ed0a08e..a6a112b 100644
---- a/tools/fibmap.c
-+++ b/tools/fibmap.c
-@@ -5,6 +5,7 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <libgen.h>
---
-1.9.0
-
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index d6409ca0f..64e34cca0 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=f2fs-tools
-pkgver=1.3.0
+pkgver=1.4.0
pkgrel=0
pkgdesc="Tools for Flash-Friendly File System (F2FS)"
url="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
@@ -13,7 +13,6 @@ install=""
subpackages="$pkgname-doc"
#source="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-$pkgver.tar.gz"
source="http://dev.alpinelinux.org/archive/f2fs-tools/f2fs-tools-$pkgver.tar.gz
- 0001-fibmap.f2fs-compile-fix-for-musl-libc.patch
"
disturl="dev.alpinelinux.org:/archive/$pkgname/"
giturl=git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
@@ -64,9 +63,6 @@ package() {
rm "$pkgdir"/usr/lib/*.la
}
-md5sums="1acfeb72439e36c3b7cafc9ea2299399 f2fs-tools-1.3.0.tar.gz
-216a141c5d81fe1d31e90bc10a3892d2 0001-fibmap.f2fs-compile-fix-for-musl-libc.patch"
-sha256sums="8f361a4e65b71000c786fa2de10d123a6c6dafeb2900bd6f311bf8a93f35e65f f2fs-tools-1.3.0.tar.gz
-b548b9c46812c9bea8db9bbf754a0063584196b1a926302586e5d9ecd2096503 0001-fibmap.f2fs-compile-fix-for-musl-libc.patch"
-sha512sums="434a5f5d7af81a8f3722f0429e45f7609b3cd4cf026132c8eb86d283295e6e40d07150d0908864a86d5adc4a0f918f3daf80b9192a3b1b0767b2c705f1495b8c f2fs-tools-1.3.0.tar.gz
-e4b0bc2d610cb19044bf46c2a0ac282477502fc021e6ab93b89be12b1035ba19c146050fbdc8706dd41188c0c255f609cd7a9bb499a25b5b27df95bb3d84af29 0001-fibmap.f2fs-compile-fix-for-musl-libc.patch"
+md5sums="be9bfdddf3e5fd5e701a88d0b388dc26 f2fs-tools-1.4.0.tar.gz"
+sha256sums="0c543027f393264ccd9a2d8cef60f7bcde28a42bcaac5c7ecedbccc25dc6a0ce f2fs-tools-1.4.0.tar.gz"
+sha512sums="fd461e9fb3baafd55c9c2fda9c42411a85c77c9d60fb483511ea6989d2924bd2d906af18fad97a05f8f1a91c98c30e9eff26e3e8488793fbb8afa4acd68c56db f2fs-tools-1.4.0.tar.gz"