diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-07-20 03:13:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-07-20 03:13:34 +0000 |
| commit | ec4452ddf5c15ff6a9255150823c3bd3d29eb4b8 (patch) | |
| tree | 1b9240cb4031d8e3dfe87eaa3f7a890162474d46 /sys-fs | |
| parent | Stable for HPPA (bug #324463). (diff) | |
| download | gentoo-2-ec4452ddf5c15ff6a9255150823c3bd3d29eb4b8.tar.gz gentoo-2-ec4452ddf5c15ff6a9255150823c3bd3d29eb4b8.tar.bz2 gentoo-2-ec4452ddf5c15ff6a9255150823c3bd3d29eb4b8.zip | |
Fix parallel build issues with libubi and mkfs.ubifs #276374.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/mtd-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch | 27 | ||||
| -rw-r--r-- | sys-fs/mtd-utils/mtd-utils-20100718.ebuild | 8 |
3 files changed, 39 insertions, 2 deletions
diff --git a/sys-fs/mtd-utils/ChangeLog b/sys-fs/mtd-utils/ChangeLog index cc9f5865fe7d..df608de10a5b 100644 --- a/sys-fs/mtd-utils/ChangeLog +++ b/sys-fs/mtd-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/mtd-utils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.30 2010/07/18 20:10:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/ChangeLog,v 1.31 2010/07/20 03:13:34 vapier Exp $ + + 20 Jul 2010; Mike Frysinger <vapier@gentoo.org> mtd-utils-20100718.ebuild, + +files/mtd-utils-20100718-ubi-parallel.patch: + Fix parallel build issues with libubi and mkfs.ubifs #276374. *mtd-utils-20100718 (18 Jul 2010) diff --git a/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch b/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch new file mode 100644 index 000000000000..94db9350267a --- /dev/null +++ b/sys-fs/mtd-utils/files/mtd-utils-20100718-ubi-parallel.patch @@ -0,0 +1,27 @@ +From 52aa25079d6d5116a8bf3b24b32abe210f37f08f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 19 Jul 2010 23:06:37 -0400 +Subject: [PATCH] fix parallel build between ubi-utils and mkfs.ubifs + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + Makefile | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/Makefile b/Makefile +index b558705..8457654 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,6 +9,9 @@ endif + + SUBDIRS = lib ubi-utils mkfs.ubifs + ++# mkfs.ubifs needs -lubi which is in ubi-utils/ ++subdirs_mkfs.ubifs_all: subdirs_ubi-utils_all ++ + TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ + ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \ + flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite nandtest \ +-- +1.7.1.1 + diff --git a/sys-fs/mtd-utils/mtd-utils-20100718.ebuild b/sys-fs/mtd-utils/mtd-utils-20100718.ebuild index 3b4e8520079d..e7088911d6ca 100644 --- a/sys-fs/mtd-utils/mtd-utils-20100718.ebuild +++ b/sys-fs/mtd-utils/mtd-utils-20100718.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20100718.ebuild,v 1.1 2010/07/18 20:10:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mtd-utils/mtd-utils-20100718.ebuild,v 1.2 2010/07/20 03:13:34 vapier Exp $ EAPI="3" +inherit eutils + if [[ ${PV} == "99999999" ]] ; then EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git" @@ -35,6 +37,10 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN} +src_prepare() { + epatch "${FILESDIR}"/${P}-ubi-parallel.patch #276374 +} + makeopts() { echo CROSS=${CHOST}- use xattr || echo WITHOUT_XATTR=1 |