diff options
author | 2011-11-19 21:10:01 +0000 | |
---|---|---|
committer | 2011-11-19 21:10:01 +0000 | |
commit | 53417239a84faa4d44058ca7d25b3af416dd8251 (patch) | |
tree | 3db1c0e918b634e423b0573147efe4584c876bd0 /sys-fs | |
parent | also delete old patch (diff) | |
download | gentoo-2-53417239a84faa4d44058ca7d25b3af416dd8251.tar.gz gentoo-2-53417239a84faa4d44058ca7d25b3af416dd8251.tar.bz2 gentoo-2-53417239a84faa4d44058ca7d25b3af416dd8251.zip |
Version bump.
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/mtd-utils/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch | 32 | ||||
-rw-r--r-- | sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild | 67 |
3 files changed, 106 insertions, 1 deletions
diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog index 3d2c74cf28d2..f3a691385271 100644 --- a/sys-fs/mtd-utils/ChangeLog +++ b/sys-fs/mtd-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/mtd-utils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.48 2011/11/19 21:09:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.49 2011/11/19 21:10:01 vapier Exp $ + +*mtd-utils-1.4.8 (19 Nov 2011) + + 19 Nov 2011; Mike Frysinger <vapier@gentoo.org> +mtd-utils-1.4.8.ebuild, + +files/mtd-utils-1.4.8-install.patch: + Version bump. 07 Nov 2011; Mike Frysinger <vapier@gentoo.org> -mtd-utils-1.4.4.ebuild, -mtd-utils-20100718.ebuild, -files/mtd-utils-20100718-ubi-parallel.patch: diff --git a/sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch b/sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch new file mode 100644 index 000000000000..4ef55cff284c --- /dev/null +++ b/sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch @@ -0,0 +1,32 @@ +From c7e4747c1589b2d090361cb753f212a7eec5ca7f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 19 Nov 2011 15:59:21 -0500 +Subject: [PATCH 1/2] Makefile: fix install target with out-of-tree builds + +The install target always looks for the compiled binaries in the working +directory which breaks when doing something like `make CHOST=... install`. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index d0bc3d6..4b71b8f 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,9 +58,9 @@ endif + rm -f $(BUILDDIR)/include/version.h + $(MAKE) -C $(TESTS) clean + +-install:: ${BINS} ${SCRIPTS} ++install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS} + mkdir -p ${DESTDIR}/${SBINDIR} +- install -m 0755 ${BINS} ${SCRIPTS} ${DESTDIR}/${SBINDIR}/ ++ install -m 0755 $^ ${DESTDIR}/${SBINDIR}/ + mkdir -p ${DESTDIR}/${MANDIR}/man1 + gzip -9c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz + +-- +1.7.6.1 + diff --git a/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild b/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild new file mode 100644 index 000000000000..23b5a2fdd5b4 --- /dev/null +++ b/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild,v 1.1 2011/11/19 21:10:01 vapier Exp $ + +EAPI="3" + +inherit eutils + +if [[ ${PV} == "99999999" ]] ; then + EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git" + + inherit git + SRC_URI="" + #KEYWORDS="" +else + if [[ ${PV} == *.*.* ]] ; then + MY_PV="${PV}-*" + SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + else + MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b" + SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~x86-linux" +fi + +DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)" +HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary" + +LICENSE="GPL-2" +SLOT="0" +IUSE="xattr" + +# We need libuuid +RDEPEND="!sys-fs/mtd + dev-libs/lzo + sys-libs/zlib + >=sys-apps/util-linux-2.16" +# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2 +# And ACL brings in Attr as well. +DEPEND="${RDEPEND} + xattr? ( sys-apps/acl )" + +# Diff snapshots have diff versions encoded into their dirnames +S=${WORKDIR}/${PN} + +src_prepare() { + cd "${S}"* + epatch "${FILESDIR}"/${P}-install.patch +} + +makeopts() { + echo CROSS=${CHOST}- + use xattr || echo WITHOUT_XATTR=1 +} + +src_compile() { + cd "${S}"* + emake $(makeopts) || die +} + +src_install() { + cd "${S}"* + emake $(makeopts) install DESTDIR="${ED}" || die + dodoc *.txt + newdoc mkfs.ubifs/README README.mkfs.ubifs + # TODO: check ubi-utils for docs+scripts +} |