aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/f2fs-tools/APKBUILD39
-rw-r--r--main/f2fs-tools/musl-fix-includes.patch10
2 files changed, 29 insertions, 20 deletions
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 39d09a403e..d6409ca0ff 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -1,9 +1,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=f2fs-tools
-pkgver=1.2.0
-pkgrel=1
+pkgver=1.3.0
+pkgrel=0
pkgdesc="Tools for Flash-Friendly File System (F2FS)"
-url="http://sourceforge.net/projects/f2fs-tools/"
+url="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
arch="all"
license="GPLv2+"
depends=""
@@ -13,10 +13,29 @@ 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
- musl-fix-includes.patch
+ 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
_builddir="$srcdir"/f2fs-tools-$pkgver
+snapshot() {
+ local _format="tar.gz"
+ mkdir -p "$srcdir" && cd "$srcdir"
+ # clone git repo and archive
+ local _tag=v$pkgver
+ msg "Creating git snapshot: $pkgname-$pkgver"
+ git clone --branch $_tag --depth=1 \
+ --bare $giturl ${pkgname}.git || return 1
+ git --git-dir ${pkgname}.git archive \
+ --format=$_format \
+ -o $pkgname-$pkgver.$_format \
+ --prefix=$pkgname-$pkgver/ $_tag \
+ || return 1
+ # upload to defined distfiles url
+ scp $pkgname-$pkgver.$_format $disturl || return 1
+}
+
prepare() {
local i
cd "$_builddir"
@@ -45,9 +64,9 @@ package() {
rm "$pkgdir"/usr/lib/*.la
}
-md5sums="d27ad7cd56f6001f7e1d508d85eef195 f2fs-tools-1.2.0.tar.gz
-58f111607726f2e4db5f5622359e621a musl-fix-includes.patch"
-sha256sums="243361c689d851f70feb0e5c97a93394392dc0629f965bcebda9ca825315f732 f2fs-tools-1.2.0.tar.gz
-4eaa40dbac52ae4a83a09e5414557bab495afc2b0cb36085eef4c018ebfd42fd musl-fix-includes.patch"
-sha512sums="f259c354c849e84269a8218ad738b38e8a40ac39be1355d323dab6fdf5d58145759db229cceb51524462aad1ef14d3ee57df4c398bb40b3b5288a1869e5567ab f2fs-tools-1.2.0.tar.gz
-0d5d83d992acc0477e3de4981853c6e7757335fa2527621f023e49ca022394582c4085529a6e02e4514d6eccfe69bbe101c4ffa41ba9328df14155da6fe834db musl-fix-includes.patch"
+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"
diff --git a/main/f2fs-tools/musl-fix-includes.patch b/main/f2fs-tools/musl-fix-includes.patch
deleted file mode 100644
index 1e13427b1f..0000000000
--- a/main/f2fs-tools/musl-fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- f2fs-tools-1.2.0.orig/fsck/fibmap.c
-+++ f2fs-tools-1.2.0/fsck/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 <linux/types.h>