aboutsummaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2017-08-22 08:21:42 -0700
committerAric Belsito <lluixhi@gmail.com>2017-08-22 08:21:42 -0700
commit74bbe9510a2de00f4fa58f2c99b5eb96a6b3bb23 (patch)
tree4f31e1e5ac4c7b608c3809196bf3e545dc7ddafd /sys-fs
parentapp-misc/pax-utils: version bump to 1.2.2-r1 (diff)
downloadmusl-74bbe9510a2de00f4fa58f2c99b5eb96a6b3bb23.tar.gz
musl-74bbe9510a2de00f4fa58f2c99b5eb96a6b3bb23.tar.bz2
musl-74bbe9510a2de00f4fa58f2c99b5eb96a6b3bb23.zip
sys-fs/f2fs-tools: sync with tree
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/f2fs-tools/Manifest5
-rw-r--r--sys-fs/f2fs-tools/f2fs-tools-1.7.0-r2.ebuild31
-rw-r--r--sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild6
-rw-r--r--sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch10
4 files changed, 17 insertions, 35 deletions
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 300068f..fa655ce 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,8 +1,7 @@
AUX f2fs-tools-1.6.1-sysmacros.patch 1555 SHA256 f3a2364f7263092a6d7e0875738a4cb4b95474f7be0c9d2ad158f4f4126f8a69 SHA512 10e3f473f21d00126fc570ad82f9f6218ed1fba7eb0fe24947c4e67186f82db09fa7563c10ccb74398652f41cda4753afa31d8140cdcb003ce0da0f71bc64415 WHIRLPOOL fab8dd17576a87f139931535d7f4e7dc817b0f442d24f05d9ff19704e8e35d31d70bf341911064fe10e199bf92bbb54a38e9ee099a9135e565cdd7ea41fb2939
+AUX f2fs-tools-1.8.0-sysmacros.patch 324 SHA256 0708ae4d53f3e295d297cc29b509847179f2012490a9356b262bbe352af72f33 SHA512 15e2e79c34efe001c08d059ad4f6a01e7f066b6e8e2466e8d3c6423f8c59a90582cb345ce62cbc340bd0aac2eff6f21113d2cc8b88135e828f36ce5b08b4b6d2 WHIRLPOOL 60eb824bfee4a1bb32a11c5f09512a4fd0da85b19da74655780356717ee61a768b13cfac63dd8057e2a71af77dce19f4dc781cf6aad0f769ab615f858c3bb8c7
DIST f2fs-tools-1.6.1.tar.xz 282152 SHA256 1c2f9ab663d26c939924ad6bbcfbacf676bec1f6dbae8f9ef5362ade4b03d885 SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2 WHIRLPOOL b5659154da6e48138b4f49481a68b25c95ba2461971609b4cb0399d173a7c0e5b0203baccd8da2adc7a8c2d7b078620649aea9ee57739498452a8b946fb43836
-DIST f2fs-tools-1.7.0.tar.xz 301320 SHA256 d2f9138694b5ca12f54a4f897516b4db746a8009f4ba10feb3eb9a34435ed6aa SHA512 3751820e6fda719f906c388c74ce018ac2aea874701c4579e5d02a3c71a8413efd4d35f6c4c6e88cb2abf030d6616d045eb9a81572b9654e068d968c17269959 WHIRLPOOL c0152a6715b318a8aab808a282d9baf085b108e6ab7d390083d12d8437b4ea32c0339846ecf0f72a0b0407f6d7556232c65cc75628830527eea6f8ec3a225a19
DIST f2fs-tools-1.8.0.tar.xz 301108 SHA256 0d9b00d9e873da4508bb297c7a5ef46050af350deb21b32898c16ed5164bb6a4 SHA512 aff27e1113cc3034194e496883570143bd6a3cc7cc077e868255052298a401cc36c423579b4e695fe3e480d770ae05f9d14d9bb4bbc0311bdd5e23e37950a27f WHIRLPOOL 4a7ae8533e4a02bd9d1ee09461c7bd30e8ef8d47bcc4e7adfe631eb14c2231fb0db9a253eeca7d0437296ad65abd446ab2249bc48ccc07b89f923d078d17e4dc
EBUILD f2fs-tools-1.6.1.ebuild 778 SHA256 f0ce9f31f5d928b4f24ad454665f677505c15ab16ac3afc1f1fed115767f8044 SHA512 4272ce9af46759136e8e9003e58014aa2b49c4c5cab3940de2f81633339a49d7bda73801b57c2afe59cfa61ae79e6da78c051e9a427d524e437278e14fbe0fae WHIRLPOOL 2774c506eebc45aefae9aa109bfa85c0b960c86b1d3bf24026c6b1cf1150149d713b87694a8b2bc686034f1ce692f51bb0a782de03ddc539bb3f733775e6dbc6
-EBUILD f2fs-tools-1.7.0-r2.ebuild 701 SHA256 9e4be7da9d6306c15b467908ad6a3d480f7aa9a4df0c96ca821058af56158397 SHA512 fc6bf9c105e5da731ce968c6021c92f7070dca649e2f2e4c61317c3f8203cddf2e5181f697233ffd9e9a49ee83f70f330a98cefd0fa9e99cdb7409c3bdce0614 WHIRLPOOL b2327fe90899562ec17867cdc6d153619f3e2fd3a633b43306be07cf242c5696313859743ca854786a66d5bbb865d7efdfc0c18cf5318e2c54896dd253e81f88
-EBUILD f2fs-tools-1.8.0.ebuild 745 SHA256 be802af7b96d44a575f7c9a609452f44144fa278acb81fa8c13d6579e860eadf SHA512 dc413da3545ebb349444d134270150713724d5834759c44b279bcc5ce8658f05d58fcc0f505b00ce7a70c9d6357f54fb093a0a155c353853f639cd253f39b4f6 WHIRLPOOL b5a354685acf0aebe358c9e004f96cbaacd92be17738bb8dd71e14722fcaea247cc43cf402433f425633389aafb53cd644002217efd18bb664fb5b3386e15d14
+EBUILD f2fs-tools-1.8.0.ebuild 814 SHA256 90dde48b7c774066fee6bc9655f0dff0bdf1dc114b31209d30a74cadf27fd9d4 SHA512 6dce7a6c74bc673eb5e55dd8b50cb0427665c89e15c61fcb1a3161d633917ed50f0300aec97d9c931d99733d6038b26aa94ea284eb904ff7b6214df754b1213a WHIRLPOOL 93a9ad8cc2d6c7c895c233cd43d1d1bdea14326591da59d90440f6dae33ee835d278cfea9084ac09c6d29f4097083b97436e6eb76a5ddd6dd73d467d2cd40913
MISC metadata.xml 332 SHA256 4e1cb81c66b944bba224c9aac140df609f7b7639c2b19ba62476ce37f559caf6 SHA512 bc1094f4316330324f30e1fc02c2ec4c4ac3a4201b3d6203dc24845bcbcd194a2c762b39399aef2f42d9df0064ca75c84495e49832b8fd02038bfba7a177ac7b WHIRLPOOL 23696f69ba884991eb2bdccb5021fefc384fe506827a83bbc8626ab6b5055b0a3a505e163cdd1c3246abc9e7b3e2ab2def71a8f5b81d4192b09c7e89eed603a4
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.7.0-r2.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.7.0-r2.ebuild
deleted file mode 100644
index 3d65e62..0000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE=""
-
-RDEPEND="
- sys-apps/util-linux
- sys-libs/libselinux
- elibc_musl? ( sys-libs/queue )"
-DEPEND="$RDEPEND"
-
-src_configure() {
- #This is required to install to /sbin, bug #481110
- econf \
- --bindir="${EPREFIX}"/sbin \
- --disable-static
-}
-
-src_install() {
- default
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild
index 96dfa57..4351597 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE="selinux"
RDEPEND="
@@ -18,6 +18,10 @@ RDEPEND="
elibc_musl? ( sys-libs/queue )"
DEPEND="$RDEPEND"
+PATCHES=(
+ "${FILESDIR}"/${P}-sysmacros.patch #623660
+)
+
src_configure() {
#This is required to install to /sbin, bug #481110
econf \
diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch
new file mode 100644
index 0000000..7ca7022
--- /dev/null
+++ b/sys-fs/f2fs-tools/files/f2fs-tools-1.8.0-sysmacros.patch
@@ -0,0 +1,10 @@
+--- f2fs-tools-1.8.0/lib/libf2fs.c.orig 2017-07-03 03:01:53.000000000 +0600
++++ f2fs-tools-1.8.0/lib/libf2fs.c 2017-08-17 00:45:01.638979885 +0600
+@@ -16,6 +16,7 @@
+ #include <fcntl.h>
+ #include <mntent.h>
+ #include <time.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/mount.h>
+ #include <sys/ioctl.h>