* [gentoo-commits] proj/musl:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2016-05-29 6:58 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2016-05-29 6:58 UTC (permalink / raw
To: gentoo-commits
commit: b97a722643e59b672199a3ebb9bf79fcd7c4021e
Author: Laine Gholson <laine.gholson <AT> gmail <DOT> com>
AuthorDate: Sun May 29 06:58:57 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 29 06:59:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b97a7226
sys-fs/btrfs-progs: use pthread_join() instead of pthread_tryjoin_np().
sys-fs/btrfs-progs/Manifest | 4 +
sys-fs/btrfs-progs/btrfs-progs-4.5.3-r99.ebuild | 96 ++++++++++++++++++++++++
sys-fs/btrfs-progs/files/pthread-join-musl.patch | 11 +++
sys-fs/btrfs-progs/metadata.xml | 16 ++++
4 files changed, 127 insertions(+)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
new file mode 100644
index 0000000..bda5a26
--- /dev/null
+++ b/sys-fs/btrfs-progs/Manifest
@@ -0,0 +1,4 @@
+AUX pthread-join-musl.patch 401 SHA256 43016ca7f13dc31b8ce0342f269a054468387459666e487370d3eb6ff5969c37 SHA512 4fab0120dd5061ce7b2119c45a342b72322d49598d68b48da54e30bf1e10ee319f5e0bf5d6a541a05b23e24cbf2a5d9c383736c1332772f5d9603a690702d0d5 WHIRLPOOL cb8b767ee05aa593df03c1652b3b7fe15755e40831f0ece1b446e8504b244e5e1935d81257515334ef46ed43c337caee9316ade80d7d654b72708b663ca2ed30
+DIST btrfs-progs-v4.5.3.tar.xz 1207344 SHA256 e6e79608d81ccda62ad877c20e4d0868dc68e570ba42f4c94e66bf5e8ee0ebd3 SHA512 7bb15728577cdc56773e87583196ed36e15a4c417f03816e8a101506070e667b8e51f66fcf98095ddc20c9ce10da0b78de1171e9c8a6cb20a4811fd35d508961 WHIRLPOOL c938f35d4ec74beeb41e8ab56632bb33c7500f283cef3d59ff97494ab957be9f2e309feb80e383c29417ba78d7e2a89704faf6fe2558a06852944790f434172c
+EBUILD btrfs-progs-4.5.3-r99.ebuild 2251 SHA256 63bbbec9f868ef2d2f63da06de62c6603b62e1330adad4bf6621a2fa6325c8de SHA512 e31c79436795f7866df80370e7e77574dd618cd287644fd1996387eaee32b83e66cf873406df9c809d5f3f679ece6d7c0f5c11761e76ecb13c3894c65a7c6f44 WHIRLPOOL 55ee9f628e6f0e3688493a155ee37e97d1ff6713c9e898be87f995f23128e223a445118b2a81ca0e03d8b8337e638b252e6240956a32d92b1d9ed5eb88fbcc59
+MISC metadata.xml 547 SHA256 261b1a38d12015f9c36fbd95fe36640cec9deea73100398d83197ca61e092858 SHA512 e82e3de6134bdb4b53bffd10a362bb9ce98ad0c958f4779880f1bef3d6c49f40084e25a0ae36dacbd60f90c63f98353700a2588ccc1d10f91a125ac74cdbc9f6 WHIRLPOOL 01aebc044e7a7c94fd7e4ea7bde7d2bc8daeaa83029bdbbee74c7a7edf2c86be4f71d137cdb55659e88971310b57eca9700d642f94999bf4bf36dd3c58672de8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.5.3-r99.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.5.3-r99.ebuild
new file mode 100644
index 0000000..0d1c364
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.5.3-r99.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV=v${PV}
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ WANT_LIBTOOL=none
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
+ EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert static static-libs"
+
+PATCHES=( "${FILESDIR}/pthread-join-musl.patch" )
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+ dev-libs/lzo:2=
+ sys-apps/util-linux:0=[static-libs(+)?]
+ sys-libs/zlib:0=
+ convert? (
+ sys-fs/e2fsprogs:0=
+ sys-libs/e2fsprogs-libs:0=
+ )
+"
+DEPEND="${RDEPEND}
+ convert? ( sys-apps/acl )
+ app-text/asciidoc
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+ static? (
+ dev-libs/lzo:2[static-libs(+)]
+ sys-apps/util-linux:0[static-libs(+)]
+ sys-libs/zlib:0[static-libs(+)]
+ convert? (
+ sys-fs/e2fsprogs:0[static-libs(+)]
+ sys-libs/e2fsprogs-libs:0[static-libs(+)]
+ )
+ )
+"
+
+if [[ ${PV} == 9999 ]]; then
+ DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+ default
+ if [[ ${PV} == 9999 ]]; then
+ eautoreconf
+ mkdir config || die
+ local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+ [[ -e ${automakedir} ]] || die "Could not locate automake directory"
+ ln -s "${automakedir}"/install-sh config/install-sh || die
+ ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+ ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/sbin
+ $(use_enable convert)
+ $(use_enable elibc_glibc backtrace)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake V=1 all $(usev static)
+}
+
+src_install() {
+ local makeargs=(
+ $(usex static-libs '' 'libs_static=')
+ $(usex static install-static '')
+ )
+ emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+ newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/btrfs-progs/files/pthread-join-musl.patch b/sys-fs/btrfs-progs/files/pthread-join-musl.patch
new file mode 100644
index 0000000..901307f
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/pthread-join-musl.patch
@@ -0,0 +1,11 @@
+--- btrfs-progs-4.5.3/chunk-recover.c 2016-05-27 14:30:52.868999654 -0500
++++ btrfs-progs-4.5.3/chunk-recover.c 2016-05-27 14:31:00.008999652 -0500
+@@ -887,7 +887,7 @@
+ for (i = 0; i < devidx; i++) {
+ if (dev_scans[i].bytenr == -1)
+ continue;
+- ret = pthread_tryjoin_np(t_scans[i],
++ ret = pthread_join(t_scans[i],
+ (void **)&t_rets[i]);
+ if (ret == EBUSY) {
+ all_done = 0;
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
new file mode 100644
index 0000000..5a009b6
--- /dev/null
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <use>
+ <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
+ <flag name="static">Build static binaries in addition to the dynamic ones</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/
@ 2017-12-10 2:12 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2017-12-10 2:12 UTC (permalink / raw
To: gentoo-commits
commit: aa8814878e300f3e879cc2ab391045763c938dbb
Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com>
AuthorDate: Fri Dec 1 23:09:49 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 02:11:57 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=aa881487
sys-fs/btrfs-progs: initial commit
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-fs/btrfs-progs/Manifest | 1 +
sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild | 107 +++++++++++++++++++++++++++++
sys-fs/btrfs-progs/files/musl-compat.patch | 24 +++++++
sys-fs/btrfs-progs/metadata.xml | 22 ++++++
4 files changed, 154 insertions(+)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
new file mode 100644
index 0000000..14fed4e
--- /dev/null
+++ b/sys-fs/btrfs-progs/Manifest
@@ -0,0 +1 @@
+DIST btrfs-progs-v4.14.tar.xz 1697584 SHA256 09095cbc3bc2b6aa9d09c93146fb4d7437c51d2572f6918b74fe990fcdcb91af SHA512 11171e6730f4aa102bdb4cd405da2d4c55e2c102fec4cc6d3135df516c78af1c34fede722a1677bd9c638b47e77085e005b29333ae70b98771501e32628890f7 WHIRLPOOL 70584ed3dd537bea34d07fdb5597365326d826799c9ee70d6b64faec536e2eedee3feb32a0bcc487e962d90a8f075443d3adfaecd5410fc7780b7af296a53f5c
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild
new file mode 100644
index 0000000..79b512d
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.14.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+ MY_PV=v${PV}
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+ S="${WORKDIR}"/${PN}-${MY_PV}
+else
+ WANT_LIBTOOL=none
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+ EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+ dev-libs/lzo:2=
+ sys-apps/util-linux:0=[static-libs(+)?]
+ sys-libs/zlib:0=
+ convert? (
+ sys-fs/e2fsprogs:0=
+ sys-libs/e2fsprogs-libs:0=
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27
+ )
+ )
+ zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+ convert? ( sys-apps/acl )
+ >=app-text/asciidoc-8.6.0
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+ static? (
+ dev-libs/lzo:2[static-libs(+)]
+ sys-apps/util-linux:0[static-libs(+)]
+ sys-libs/zlib:0[static-libs(+)]
+ convert? (
+ sys-fs/e2fsprogs:0[static-libs(+)]
+ sys-libs/e2fsprogs-libs:0[static-libs(+)]
+ reiserfs? (
+ >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+ )
+ )
+ zstd? ( app-arch/zstd:0[static-libs(+)] )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/musl-compat.patch"
+)
+
+if [[ ${PV} == 9999 ]]; then
+ DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+ default
+ if [[ ${PV} == 9999 ]]; then
+ AT_M4DIR=m4 eautoreconf
+ mkdir config || die
+ local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+ [[ -e ${automakedir} ]] || die "Could not locate automake directory"
+ ln -s "${automakedir}"/install-sh config/install-sh || die
+ ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+ ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+ fi
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bindir="${EPREFIX}"/sbin
+ $(use_enable convert)
+ $(use_enable elibc_glibc backtrace)
+ $(use_enable zstd)
+ --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake V=1 all $(usev static)
+}
+
+src_install() {
+ local makeargs=(
+ $(usex static-libs '' 'libs_static=')
+ $(usex static install-static '')
+ )
+ emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+ newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/btrfs-progs/files/musl-compat.patch b/sys-fs/btrfs-progs/files/musl-compat.patch
new file mode 100644
index 0000000..424c59d
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/musl-compat.patch
@@ -0,0 +1,24 @@
+diff -upr btrfs-progs-v4.3.1.orig/utils.c btrfs-progs-v4.3.1/utils.c
+--- btrfs-progs-v4.3.1.orig/utils.c 2015-11-20 01:15:32.227019383 +0100
++++ btrfs-progs-v4.3.1/utils.c 2015-11-20 01:16:59.419971215 +0100
+@@ -1208,13 +1208,19 @@ static int resolve_loop_device(const cha
+ {
+ int ret;
+ FILE *f;
++ struct stat stat_buf;
+ char fmt[20];
+ char p[PATH_MAX];
+ char real_loop_dev[PATH_MAX];
+
+ if (!realpath(loop_dev, real_loop_dev))
+ return -errno;
+- snprintf(p, PATH_MAX, "/sys/block/%s/loop/backing_file", strrchr(real_loop_dev, '/'));
++
++ if (stat(real_loop_dev, &stat_buf) || !S_ISBLK(stat_buf.st_mode))
++ return -errno;
++
++ snprintf(p, PATH_MAX, "/sys/dev/block/%d:%d/loop/backing_file",
++ major(stat_buf.st_rdev), minor(stat_buf.st_rdev));
+ if (!(f = fopen(p, "r"))) {
+ if (errno == ENOENT)
+ /*
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
new file mode 100644
index 0000000..d131bb2
--- /dev/null
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <use>
+ <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
+ <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag>
+ <flag name="static">Build static binaries in addition to the dynamic ones</flag>
+ <flag name="zstd">Enable zstd compression support.</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-12-10 2:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-10 2:12 [gentoo-commits] proj/musl:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2016-05-29 6:58 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox