Move back to sabayon ebuild with arm patch
Package-Manager: portage-2.2.0_alpha142 RepoMan-Options: --force
This commit is contained in:
Mario Fetka
parent
648ed3d1d5
commit
71d9077b43
|
|
@ -2,5 +2,5 @@ AUX 0001-btrfs-progs-unstable-darksatanic-repo-fix-arg-checki.patch 1134 SHA256
|
|||
AUX 0002-btrfs-progs-ignore-unavailable-loop-device-source-files.patch 1854 SHA256 ba9b505ce439db0446dad0624a18bea18873edb46f2ceab38af595d3c536892b SHA512 74802b92fe537df3fe21dfd4c1aa6f0a21eabf68307162246947ed088dca0feae5f72fd5b0a31a2f1b980eca3a9c9aa6faa1beeb7a4f863845867ccc7cb7e11d WHIRLPOOL c4678da21e822f0671f0a4b576fe4d81febe42de5ef59459f9812f4cfd787ee197e363a0865d4050a578f7282c584fe66d3b9299b8b1517f1270b2af58a0c4eb
|
||||
AUX btrfs-progs-Modify-Makefile-to-allow-optional-ACL-dependency.patch 1202 SHA256 7531469b262250d24198e853ce4b042f47fe23bc226d56af58e0bbc14e255ca7 SHA512 0f92d6e272b9c9c294040f902fed94f512a3cff6798d846cc4f095b0059fa5cff9eef7a6708a18950c37df1a566170ba53783543a1ef9492f921b4b207803ab1 WHIRLPOOL 605432f47fa8ea5be9203749477fd7c38231a490004da4573ea8563c616586fe38dce91c2aaf9dd8f774eb5c2a9c5e0fb5cc11be31059203ad9c6db6269c9957
|
||||
AUX v2-Btrfs-progs-fix-unaligned-accesses.patch 7864 SHA256 7d1b12bc5b7a53b533be2ebffef85d4a52c0f5783e106792ab545a119d5268db SHA512 d15fb6cee4e11177b463f65ea348a4f2bc3c3f6266746a3bb7be462d823e0fd97424f45e424f19889921371a5375f893600deb95e12114011da71d2f960af763 WHIRLPOOL 00258832256a29670aa7e0bd55afc37d8fdcec7e919d50fb45a1381f658863e6ca83f5c3e284a91d7037c33d8c93e223061c598f798cd2189ed4ec1432f4c5ba
|
||||
EBUILD btrfs-progs-0.20_pre20121005.ebuild 2253 SHA256 2bf35a0d51510676b600324116f11bcf7db6e0070ba19afa99a6ad4ade47adf8 SHA512 5a7bc28ebbdcf11d73f6b33e9f5cd08eec044dbef197f55a3f54d024804b1611b4d4a76a34444c434f24f7ea401441a3dc30ff4b9bea6a6080c452a56bd6c6cd WHIRLPOOL 7f8d0dfbf9a457c708e3b9a0cbace9814ced0c64a45f4ea6f1df09dada90034bbb5b74c270bd2ea407804874bc81987e90904426677c0cf9c43a5a94e79fe803
|
||||
EBUILD btrfs-progs-0.20_pre20121005.ebuild 2741 SHA256 07459f6a29b09d4a518748d9d81e97a6b3a228397b8efaeca681eedf40f1a10f SHA512 6d4113ec28c0d1976cb21aae284cdcae2469f071709170b4cb1c5a821807ba2326802e812f5a3a9e8c3df068242f0ec747e80e3ff1254f2c62b3ba5b29b563ac WHIRLPOOL 323eea093521d5f9df47fd094ecd6ae59755510aa694da6f28b579c701ef5371f1fd2a61dc15f657f622eaa576e2cb784b4e72ce48ea5917a40933d01e217414
|
||||
MISC metadata.xml 332 SHA256 9bfca7447ff362e4b98047c151d4bf4251051ad503387e49129bbbd1b96fd4c2 SHA512 cf679f23c0b6999c2a6e346b645db770197ef56bb9321c5978b1827e5289df32e1cb73822e0f11424ec6bbe76ff1e0702abbe4e9089fb30b4ae3227cc6cf24d5 WHIRLPOOL d5f888e6a516106307caf667944582e2fa2d38d353ec0f4b6ce3bab3bcff7a160085052da7b7d1fe9b427ae8826a534da14a69d4c1d4f1d72002c8b4984bad35
|
||||
|
|
|
|||
|
|
@ -1,40 +1,35 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Copyright 1999-2011 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.20_rc1.ebuild,v 1.1 2012/10/11 08:35:51 slyfox Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.15 2011/10/29 05:17:45 slyfox Exp $
|
||||
|
||||
EAPI=4
|
||||
EAPI="4"
|
||||
|
||||
MY_PV=${PV/_pre/-pre}
|
||||
|
||||
inherit eutils git-2 toolchain-funcs
|
||||
#inherit eutils toolchain-funcs
|
||||
inherit eutils git-2
|
||||
|
||||
DESCRIPTION="Btrfs filesystem utilities"
|
||||
HOMEPAGE="https://btrfs.wiki.kernel.org"
|
||||
# tarballed out of v0.20-rc1 tag in btrfs-progs repo
|
||||
#SRC_URI="http://dev.gentoo.org/~slyfox/${PN}-${MY_PV}.tar.gz"
|
||||
HOMEPAGE="http://btrfs.wiki.kernel.org/"
|
||||
SRC_URI=""
|
||||
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
|
||||
IUSE="acl debug-utils"
|
||||
|
||||
DEPEND="sys-libs/zlib
|
||||
sys-apps/acl
|
||||
sys-fs/e2fsprogs"
|
||||
DEPEND="debug-utils? ( dev-python/matplotlib )
|
||||
acl? (
|
||||
sys-apps/acl
|
||||
sys-fs/e2fsprogs
|
||||
)"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
|
||||
EGIT_COMMIT="91d9eec1ff044394f2b98ee7fcb76713dd33b994"
|
||||
|
||||
src_unpack() {
|
||||
git-2_src_unpack
|
||||
}
|
||||
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-Modify-Makefile-to-allow-optional-ACL-dependency.patch
|
||||
|
||||
|
|
@ -52,23 +47,53 @@ src_prepare() {
|
|||
|
||||
epatch "${FILESDIR}"/v2-Btrfs-progs-fix-unaligned-accesses.patch
|
||||
|
||||
# Fix hardcoded "gcc" and "make"
|
||||
sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
|
||||
sed -i -e 's:make:$(MAKE):' Makefile
|
||||
|
||||
# upstream didn't bump program version
|
||||
sed -i -e "s:Btrfs v0\.19:v${MY_PV}:" version.sh || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
|
||||
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
|
||||
all || die
|
||||
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
|
||||
btrfs-image || die
|
||||
if use acl; then
|
||||
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
|
||||
btrfs-convert || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" prefix=/usr bindir=/sbin mandir=/usr/share/man install
|
||||
emake mandir="/usr/share/man" bindir="/sbin" install DESTDIR="${D}"
|
||||
|
||||
# fsck will segfault if invoked at boot, so do not make this link
|
||||
#dosym btrfsck /sbin/fsck.btrfs
|
||||
|
||||
# newsbin mkfs.btrfs mkbtrfs
|
||||
|
||||
dosym mkfs.btrfs /sbin/mkbtrfs
|
||||
if ! use acl; then
|
||||
ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
|
||||
fi
|
||||
|
||||
into /usr
|
||||
newbin bcp btrfs-bcp
|
||||
|
||||
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.31 and above)."
|
||||
ewarn ""
|
||||
ewarn " This version should NOT be used with earlier versions"
|
||||
ewarn " of the standalone btrfs module!"
|
||||
ewarn "WARNING: This version of btrfs-progs uses the latest unstable code,"
|
||||
ewarn " and care should be taken that it is compatible with the"
|
||||
ewarn " version of btrfs in your kernel!"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue