diff options
Diffstat (limited to 'sys-fs/f2fs-tools')
| -rw-r--r-- | sys-fs/f2fs-tools/Manifest | 5 | ||||
| -rw-r--r-- | sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild | 37 | ||||
| -rw-r--r-- | sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild | 30 | ||||
| -rw-r--r-- | sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch | 56 |
4 files changed, 96 insertions, 32 deletions
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index 11d06e4fb5df..72d047b6f29e 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -1,9 +1,10 @@ AUX f2fs-tools-1.10.0-fibmap-include-config_h.patch 401 BLAKE2B 83b0888b5892111165134b858e79bd7b68d3f1f2f66e67745b75e2ab5510f003969a60e8e8d148aba23c2e1b2167d184e20f8acdbbf5dd40cfacc773e9a4f1fc SHA512 d1ccb17c15267a42e64b1760410f1ff5ffeca8bc1545afacd7723e0a86ef7172df63dfbe85c9395f6c2d1b0651dc40bea991b9c30445badde4a1256fa58e6627 +AUX f2fs-tools-1.12.0-fsck.patch 1504 BLAKE2B 8e8cdda64e093faa17a1b9c8757c1013a49222b6d48306f5088f217c9e252b2bbca098bb77d34eeb9bb36fa37d7751c26c274625bc034506ed7b66d9ee353869 SHA512 ff4304561e03086094116e67d8e71d6f1388b89b203b7a852f3b02f31f892735ee96551e8fa3577babb1062eb3e50bff4b957085879ac59e94efaa0f2e4d4a95 AUX f2fs-tools-1.6.1-sysmacros.patch 1555 BLAKE2B a7cf99912c969492ae6d7d6f2db6bda30caf2fa750530b52543d7b4f5d38acb349d87ac2ec839d86fc32afe172ff989450593e5ce55b3c3eea54f69a32c7e23e SHA512 10e3f473f21d00126fc570ad82f9f6218ed1fba7eb0fe24947c4e67186f82db09fa7563c10ccb74398652f41cda4753afa31d8140cdcb003ce0da0f71bc64415 DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853 DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7 -DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2 +DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad EBUILD f2fs-tools-1.10.0.ebuild 789 BLAKE2B 0680b935d90f332dc60206b041008379cd9b16afcd6c8abb69ad2b66cd715ad4cc72e72fbdf8a19e570aa1851a5ca69338f38de7ae51eea0d6becc6a4b2e5b77 SHA512 8c5f8da38251d75da53783dd47b904c53e5dd0fd054089c7338859e71ebacba47894b2d597ed171a000e33675975e1b23bac20a78f8c88de40fbe5904f24ecd4 EBUILD f2fs-tools-1.11.0-r1.ebuild 779 BLAKE2B 98b962936657814d59a229304d966362efde637a62e879adecf35acdce778d22fe0eb6059985cc31db9087d8e879e72d4ac33a7d1e3daf6a8ee83eb714ae4d64 SHA512 09849f743eb3db3eb1bc8ffa8cee82708d44a5d78ca1845c59b88a9bbd8ef8c3c20ee0beb91b4be498088d82b80dba9cd98f296eeca383b5ca8fc8259e6b8b6b -EBUILD f2fs-tools-1.6.1.ebuild 737 BLAKE2B fd513f95c8c154cf24f3cf74483a7c0c9fb6094780234c6eda83af63ae66c9c7d059bf0aec26e902aff8c782ae44fdcbc9989852450d07b0b99d21b9fda12225 SHA512 a303cc13d4fee5657d93008d9d189dfcfed920bc80e6f4e383d751e29f83745659ee23d8917abddc733a1f2ed66d991c8b9a10aa93ac2134e7e164899a789d22 +EBUILD f2fs-tools-1.12.0-r1.ebuild 822 BLAKE2B 7aa72f84312b51fad9a24930ebbc11ed8b7873948b9df97a83d5335620ed562f7f14627d84a58293ca304a0901966ad1522f0e74f9705692818ae057f9823345 SHA512 325afb1c2b4af9782e04a76e586e96b04fc6113e91f31084ad7924bd6c8f0cd607a88b32a2c77274d8ab7b24aafb265ac660e7554556c3bac9dea42a878109f8 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild new file mode 100644 index 000000000000..523fddda1779 --- /dev/null +++ b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +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/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/6" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" +IUSE="selinux" + +RDEPEND="selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND}" + +src_prepare() { + eapply "${FILESDIR}"/${P}-fsck.patch + default + eautoreconf +} + +src_configure() { + #This is required to install to /sbin, bug #481110 + econf \ + --bindir="${EPREFIX}"/sbin \ + --disable-static \ + $(use_with selinux) +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild deleted file mode 100644 index 0b088d41d9a5..000000000000 --- a/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib eutils - -DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" -HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary" -SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/0" -KEYWORDS="amd64 arm ~mips ppc ppc64 x86" -IUSE="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-sysmacros.patch #580338 -} - -src_configure() { - #This is required to install to /sbin, bug #481110 - econf --prefix=/ --includedir=/usr/include -} - -src_install() { - default - rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a - rm -f "${ED}"/$(get_libdir)/libf2fs_format.{,l}a -} diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch new file mode 100644 index 000000000000..72d86fec465c --- /dev/null +++ b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch @@ -0,0 +1,56 @@ +From a6160c3e21f43b89b49802cc4a956d1c4b65ae44 Mon Sep 17 00:00:00 2001 +From: Chao Yu <yuchao0@huawei.com> +Date: Mon, 26 Nov 2018 18:53:37 +0800 +Subject: fsck.f2fs: allow to fsck readonly image w/ -f option + +To keep line with e2fsprogs, let's allow to fsck mounted image as +readonly w/ -f option. + +Reported-by: Perfect Gentleman <perfect007gentleman@gmail.com> +Signed-off-by: Chao Yu <yuchao0@huawei.com> +--- + fsck/main.c | 1 + + include/f2fs_fs.h | 1 + + lib/libf2fs.c | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fsck/main.c b/fsck/main.c +index 675c603..bb79f6e 100644 +--- a/fsck/main.c ++++ b/fsck/main.c +@@ -249,6 +249,7 @@ void f2fs_parse_options(int argc, char *argv[]) + case 'f': + case 'y': + c.fix_on = 1; ++ c.force = 1; + MSG(0, "Info: Force to fix corruption\n"); + break; + case 'q': +diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h +index 65cc8fd..6eebb3a 100644 +--- a/include/f2fs_fs.h ++++ b/include/f2fs_fs.h +@@ -369,6 +369,7 @@ struct f2fs_configuration { + void *private; + int dry_run; + int fix_on; ++ int force; + int defset; + int bug_on; + int alloc_failed; +diff --git a/lib/libf2fs.c b/lib/libf2fs.c +index cc335db..498f6c0 100644 +--- a/lib/libf2fs.c ++++ b/lib/libf2fs.c +@@ -821,7 +821,7 @@ int get_device_info(int i) + return -1; + } + +- if (S_ISBLK(stat_buf->st_mode)) ++ if (S_ISBLK(stat_buf->st_mode) && !c.force) + fd = open(dev->path, O_RDWR | O_EXCL); + else + fd = open(dev->path, O_RDWR); +-- +cgit 1.2-0.3.lf.el7 + |