diff options
author | Joe Peterson <lavajoe@gentoo.org> | 2009-09-21 15:57:43 +0000 |
---|---|---|
committer | Joe Peterson <lavajoe@gentoo.org> | 2009-09-21 15:57:43 +0000 |
commit | 29594314236325da92608eff51b4ca60374b5392 (patch) | |
tree | 973e0cd2f351a77ba7aefa13e3b1f51b948739a1 /sys-fs | |
parent | initial import of yafaray, ebuild by me, bug #273738 (diff) | |
download | historical-29594314236325da92608eff51b4ca60374b5392.tar.gz historical-29594314236325da92608eff51b4ca60374b5392.tar.bz2 historical-29594314236325da92608eff51b4ca60374b5392.zip |
New version 0.19 (bug #278066); fix hard-coded "gcc" and "make"
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/btrfs-progs/ChangeLog | 11 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/Manifest | 14 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild | 6 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild | 6 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild | 6 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild (renamed from sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild) | 43 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 16 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch | 30 |
8 files changed, 108 insertions, 24 deletions
diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog index 0b9a7866ddec..9588423ade95 100644 --- a/sys-fs/btrfs-progs/ChangeLog +++ b/sys-fs/btrfs-progs/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-fs/btrfs-progs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.21 2009/06/14 15:46:16 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.22 2009/09/21 15:57:42 lavajoe Exp $ + +*btrfs-progs-0.19 (21 Sep 2009) + + 21 Sep 2009; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-0.16-r1.ebuild, + btrfs-progs-0.17.ebuild, -btrfs-progs-0.18.ebuild, + btrfs-progs-0.18-r1.ebuild, +btrfs-progs-0.19.ebuild, + +files/btrfs-progs-0.19-convert-remove-used-space-update.patch, + btrfs-progs-9999.ebuild: + New version 0.19 (bug #278066); fix hard-coded "gcc" and "make" *btrfs-progs-0.18-r1 (14 Jun 2009) diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 4498f31b1335..be981dcbe25a 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,10 +1,12 @@ +AUX btrfs-progs-0.19-convert-remove-used-space-update.patch 1005 RMD160 52925f470e96f851f74862fa0ac9cf7bc729c536 SHA1 49636f68528d1faacc0d8a72be63862e4e3a672c SHA256 75759924f7d766705c5ea97d4cc2d70962b4c49e7f274465c3c2e9021d481f38 DIST btrfs-progs-0.16.tar.bz2 97344 RMD160 c2d3e1ec0eccafd381336841d5129f1c380c88df SHA1 506a0290553099a0b8694d69d41e63fbe0394835 SHA256 a0b7b2827db66f91be15afa497038fa13df55774ad77d6ab793d3c97d2c5dc4c DIST btrfs-progs-0.17.tar.bz2 110438 RMD160 7c1737e7315cdf1180080f52ed70a7739b7f9940 SHA1 cd247f4c09a17e97039aa69978921c848b08d621 SHA256 f5bc36fe394571721a3470eeef7ee462cfbea6b83ed2ecaa1da0e58d9f537a2a DIST btrfs-progs-0.18.tar.bz2 110410 RMD160 d86484c4a86f57189dbf77cadd694d2bfcb763a8 SHA1 c049943d7a31f63432b19c1eb5fbde119f4bf0bb SHA256 e81f483560eb93b99f33e20aa035e968d7e5b0894543b448cff6da983d4d4f0c -EBUILD btrfs-progs-0.16-r1.ebuild 1514 RMD160 0ec2a2eda4e2c09d3a846495a8bd93a9d1a06ec4 SHA1 def6783f234f334d17d526e8c6b26d8883ee5f37 SHA256 a92de4dd36bb7a8332ec5b50eb988d8c304f48fafa892aabfda6ba4a58495549 -EBUILD btrfs-progs-0.17.ebuild 1550 RMD160 d8326cff1f5b67f6e673100a2c76da581855f183 SHA1 eb4033b00a8c2e03413e8349cef0528b16223a06 SHA256 d15c6da86999e51c0515ef28f8bfa2cb27d2f17a8eb072dbf637ad11b3f1ff15 -EBUILD btrfs-progs-0.18-r1.ebuild 2036 RMD160 b53cecd5f66e8f681ed67b46a1eefef798a3e341 SHA1 a449224f8d8b6b142e12b195f86c4942849a7e0f SHA256 60907593edf43ade7155cf50ffbc980803d147e8e8e1601bcba011a251617fec -EBUILD btrfs-progs-0.18.ebuild 1771 RMD160 f187e4084749ee0d272b707c435ffd554df7a194 SHA1 a91004787684e0e8e6b9cf86ef2b03efbc1b32a5 SHA256 b82c736d17a5cc907f8c88851f7791f73ab74f0b3b328754e221afc6f83cdf2e -EBUILD btrfs-progs-9999.ebuild 1850 RMD160 bfb3f78ceea9130fe431e537c3576cd60a000dfe SHA1 77b2416698f5bf71291f37ae8c3abca1af35584a SHA256 e331465d2f659e422249d0f3eec08973c11960bdd7c6e3c54b2cadfdc241ffea -MISC ChangeLog 3703 RMD160 898e16b8613ec8daf5dc2b7ba3f093abe948ecc0 SHA1 fcc75083292cb1f618a5814802ab2c7aa06997f5 SHA256 f4341b234dd1fbd9b7f19418371d664afec2521236b52b969f1f9ac45a44622a +DIST btrfs-progs-0.19.tar.bz2 118119 RMD160 28e7955fd1f9e0ac68c465cf3bbeec3c889b0513 SHA1 483b44e844c3a97ccb830add21ca9327545dbc69 SHA256 f8a3dd03e87a33506d16ccc1e5a77c4c38ff1fa84b9502ed4b88c0b39fab70fc +EBUILD btrfs-progs-0.16-r1.ebuild 1642 RMD160 bf0049169e363af8290b26a6a59cff8a179f802e SHA1 23fb5ba116c70fdcd35406eb1fa7029ad4aa2ea7 SHA256 f51ad6e3873277f6381f8d76776d6a94f7f22b26fef9115f6b730867e924eb96 +EBUILD btrfs-progs-0.17.ebuild 1678 RMD160 4ab6fbe77a92c37de9ff5694f769712841036eb6 SHA1 ddd4613a4b198d20b35313dbea344dda405ea1f4 SHA256 d4fb9c479809410086c22ab65ea47333c33e2a7a120105c597cff8df55f699b1 +EBUILD btrfs-progs-0.18-r1.ebuild 2164 RMD160 c81024daf29fe8d5d51827caf37d7d49acd61dd7 SHA1 a28063966f6b46b8a3434246985b1172f6dd8678 SHA256 a26122b1291e6fe5c78348c8480d07cc61f3d3f4fbe0fd02513d1f027325fa53 +EBUILD btrfs-progs-0.19.ebuild 2436 RMD160 7a9a60f8759308770b6e661d7705f059dafc27da SHA1 170784fc7e2b6c7bf9d5b57dc6173383b7d391fb SHA256 10f94909072e73cd8345b81e4b04111cc89978042032e83f53124fbc1f3f98d0 +EBUILD btrfs-progs-9999.ebuild 2150 RMD160 d67acb7601c96d5bb79189b4c5d8645c42d667a0 SHA1 656db71feade49f2d20387f3ff30524d2110d067 SHA256 97b7ea5ef3396f182964d01f8d546b2a8065e3579e3d695b0f8d0a08176fc756 +MISC ChangeLog 4082 RMD160 7fd6ab25df4c8aa13df53fb28523b128ce79d07f SHA1 ed62cb75dba4fd89981635feb4758fca77b09f5a SHA256 efa559ec3dab3659ae6f0518994f3b979285da1d31c1ed5ac9e0753d70bf8559 MISC metadata.xml 321 RMD160 52634dbd80c8f5b68acf4c2587ffc9525885038b SHA1 50409407adeeacc078c93a4dfd9ae90033506209 SHA256 c2a766f3953ae00375ef6960f803cf2bb661e56afb2c99dda89a92cb6418d012 diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild index 1f8b0b8229b9..b4fd8a33e7ca 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild @@ -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.16-r1.ebuild,v 1.3 2009/06/06 05:13:09 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild,v 1.4 2009/09/21 15:57:42 lavajoe Exp $ inherit eutils @@ -25,6 +25,10 @@ src_unpack() { # Apply hot fixes #epatch "${FILESDIR}/${P}-hotfix.patch" + + # Fix hardcoded "gcc" and "make" + sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile + sed -i -e 's:make:$(MAKE):' Makefile } src_compile() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild index a5a47e14c07a..61f42edc905f 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild @@ -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.17.ebuild,v 1.3 2009/06/06 05:13:09 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild,v 1.4 2009/09/21 15:57:42 lavajoe Exp $ inherit eutils @@ -25,6 +25,10 @@ src_unpack() { # Apply hot fixes #epatch "${FILESDIR}/${P}-hotfix.patch" + + # Fix hardcoded "gcc" and "make" + sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile + sed -i -e 's:make:$(MAKE):' Makefile } src_compile() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild index b7fbc175f716..fece48606789 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild @@ -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: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild,v 1.2 2009/09/21 15:57:42 lavajoe Exp $ inherit eutils @@ -26,6 +26,10 @@ src_unpack() { # Apply hot fixes #epatch "${FILESDIR}/${P}-hotfix.patch" + + # Fix hardcoded "gcc" and "make" + sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile + sed -i -e 's:make:$(MAKE):' Makefile } src_compile() { diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild index ae6ae1344676..2ac41f6c6e55 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild @@ -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.ebuild,v 1.3 2009/06/06 05:13:09 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild,v 1.1 2009/09/21 15:57:42 lavajoe Exp $ inherit eutils @@ -11,26 +11,34 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="acl" +IUSE="acl debug-utils" -DEPEND="dev-python/matplotlib +DEPEND="debug-utils? ( dev-python/matplotlib ) acl? ( sys-apps/acl sys-fs/e2fsprogs - )" + )" RDEPEND="${DEPEND}" src_unpack() { unpack ${A} cd "${S}" - # Apply hot fixes - #epatch "${FILESDIR}/${P}-hotfix.patch" + # Remove code that updates the total used space, since + # btrfs_update_block_group does that work now. + # (patch that did not make 0.19 release) + epatch "${FILESDIR}/${P}-convert-remove-used-space-update.patch" + + # Fix hardcoded "gcc" and "make" + sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile + sed -i -e 's:make:$(MAKE):' 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 @@ -41,13 +49,12 @@ src_install() { into / dosbin btrfs-show dosbin btrfs-vol - dosbin btrfs-image dosbin btrfsctl - dosbin btrfstune dosbin btrfsck + dosbin btrfstune + dosbin btrfs-image # fsck will segfault if invoked at boot, so do not make this link #dosym btrfsck /sbin/fsck.btrfs - #newsbin debug-tree btrfs-debug-tree newsbin mkfs.btrfs mkbtrfs dosym mkbtrfs /sbin/mkfs.btrfs if use acl; then @@ -56,18 +63,30 @@ src_install() { ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)" fi + if use debug-utils; then + dobin btrfs-debug-tree + else + ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)" + fi + into /usr newbin bcp btrfs-bcp - newbin show-blocks btrfs-show-blocks + + if use debug-utils; then + newbin show-blocks btrfs-show-blocks + else + ewarn "Note: btrfs-show-blocks not installed (requires debug-utils USE flag)" + 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!" } diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 5f37fa9efd41..7695b1f1a534 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -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-9999.ebuild,v 1.10 2009/06/14 15:46:16 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.11 2009/09/21 15:57:41 lavajoe Exp $ inherit eutils git @@ -23,9 +23,20 @@ RDEPEND="${DEPEND}" EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git" EGIT_BRANCH="master" +src_unpack() { + git_src_unpack + cd "${S}" + + # Fix hardcoded "gcc" and "make" + sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile + sed -i -e 's:make:$(MAKE):' 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 @@ -51,7 +62,7 @@ src_install() { fi if use debug-utils; then - newsbin debug-tree btrfs-debug-tree + dobin btrfs-debug-tree else ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)" fi @@ -66,6 +77,7 @@ src_install() { fi dodoc INSTALL + emake prefix="${D}/usr/share" install-man } pkg_postinst() { diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch new file mode 100644 index 000000000000..e326f34af7e3 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch @@ -0,0 +1,30 @@ +--- /var/tmp/portage/sys-fs/btrfs-progs-0.19/work/btrfs-progs-0.19/convert.c 2009-06-11 10:56:15.000000000 -0600 ++++ btrfs-progs-unstable/convert.c 2009-09-21 08:51:43.773575874 -0600 +@@ -370,7 +370,6 @@ + struct btrfs_extent_item *ei; + u32 blocksize = root->sectorsize; + u64 nbytes; +- u64 bytes_used; + + if (disk_bytenr == 0) { + ret = btrfs_insert_file_extent(trans, root, objectid, +@@ -432,9 +431,6 @@ + nbytes = btrfs_stack_inode_nbytes(inode) + num_bytes; + btrfs_set_stack_inode_nbytes(inode, nbytes); + +- bytes_used = btrfs_root_used(&root->root_item); +- btrfs_set_root_used(&root->root_item, bytes_used + num_bytes); +- + btrfs_release_path(root, &path); + + ins_key.objectid = disk_bytenr; +@@ -454,9 +450,6 @@ + + btrfs_mark_buffer_dirty(leaf); + +- bytes_used = btrfs_super_bytes_used(&info->super_copy); +- btrfs_set_super_bytes_used(&info->super_copy, bytes_used + +- num_bytes); + ret = btrfs_update_block_group(trans, root, disk_bytenr, + num_bytes, 1, 0); + if (ret) |