Hi, I made a version bump of the btrfs-progs package and added the patch from bug report #259961 to this ebuild, too. j0inty Reproducible: Always
Created attachment 198197 [details] btrfs-progs-0.19.ebuild
Please attach unified diffs (diff -u) when you did changes to an ebuild. That would be much more handy for our devs.
Thanks for the bump. Yes, I had planned to bump this as soon as btrfs in the kernel (vanilla-sources) gets the required code. 2.6.31 is still in early stages, not yet keyworded for ~amd64.
Created attachment 204426 [details, diff] Changes from 0.18-r1 to 0.19
Comment on attachment 204426 [details, diff] Changes from 0.18-r1 to 0.19 Hello, I did some more changes for 0.19 ebuild: * 0.19 has manpages. * debug-tree is already called btrfs-debug-tree in 0.19 and does not need to be renamed. * I changed the warning to point to kernels >2.6.31.
Comment on attachment 204426 [details, diff] Changes from 0.18-r1 to 0.19 ><HTML><HEAD/><BODY><PRE>--- btrfs-progs-0.18-r1.ebuild 2009-09-17 15:48:26.000000000 +0200 >+++ btrfs-progs-0.19.ebuild 2009-09-17 15:48:33.000000000 +0200 >@@ -1,6 +1,6 @@ > # Copyright 1999-2009 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild,v 1.1 2009/06/14 15:46:16 lavajoe Exp $ >+# $Header:$ > > inherit eutils > >@@ -26,11 +26,16 @@ > > # Apply hot fixes > #epatch "${FILESDIR}/${P}-hotfix.patch" >+ >+ # Fix hardcoded gcc >+ sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile > } > > src_compile() { > emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ > all || die >+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ >+ btrfstune btrfs-image || die > if use acl; then > emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ > convert || die >@@ -55,8 +60,9 @@ > ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)" > fi > >+ > if use debug-utils; then >- newsbin debug-tree btrfs-debug-tree >+ dosbin btrfs-debug-tree > else > ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)" > fi >@@ -71,13 +77,14 @@ > fi > > dodoc INSTALL >+ emake prefix="${D}/usr/share" install-man > } > > pkg_postinst() { > ewarn "WARNING: This version of btrfs-progs corresponds to and should only" > ewarn " be used with the version of btrfs included in the" >- ewarn " Linux kernel (2.6.29-rc2 and above)." >+ ewarn " Linux kernel (2.6.31 and above)." > ewarn "" > ewarn " This version should NOT be used with earlier versions" >- ewarn " of the standaline btrfs module!" >+ ewarn " of the standalone btrfs module!" > } ></PRE></BODY></HTML>
Created attachment 204431 [details, diff] Correction: Changes from 0.18-r1 to 0.19 One command should read dosbin instead of newsbin.
Thanks for the patches!