From 2d5dc43afd0de433050c597606482dde79f4483b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 16 May 2012 12:04:51 -0400 Subject: [PATCH] mtd-utils: pull in latest stable version Upgraded sys-fs/mtd-utils to version 1.4.8 on amd64, arm, x86. We want it for some simple testing. Nothing pulls it in yet. BUG=None TEST=`emerge-amd64-generic mtd-utils` works TEST=`emerge-arm-generic mtd-utils` works TEST=`emerge-x86-generic mtd-utils` works Change-Id: I5b385e3fe2d491936be12db0da3ae28a02a5d397 Reviewed-on: https://gerrit.chromium.org/gerrit/22822 Reviewed-by: Bryan Freed Tested-by: Bryan Freed Commit-Ready: Mike Frysinger --- .../metadata/md5-cache/sys-fs/mtd-utils-1.4.8 | 13 ++++ .../portage-stable/sys-fs/mtd-utils/Manifest | 1 + .../files/mtd-utils-1.4.8-install.patch | 32 +++++++++ .../sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild | 67 +++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/mtd-utils-1.4.8 create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/mtd-utils-1.4.8 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/mtd-utils-1.4.8 new file mode 100644 index 0000000000..547826f1b9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/mtd-utils-1.4.8 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16 xattr? ( sys-apps/acl ) +DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI) +EAPI=3 +HOMEPAGE=http://git.infradead.org/?p=mtd-utils.git;a=summary +IUSE=xattr +KEYWORDS=amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16 +SLOT=0 +SRC_URI=http://git.infradead.org/mtd-utils.git/snapshot/v1.4.8.tar.gz -> mtd-utils-1.4.8.tar.gz +_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=2ca383ae703f5d8faefd719104547fc0 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/Manifest new file mode 100644 index 0000000000..3954608eac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/Manifest @@ -0,0 +1 @@ +DIST mtd-utils-1.4.8.tar.gz 335568 RMD160 59ec75cffe4ea5fe8a113d1f61c4c9ece4891737 SHA1 bed0aa33e5c53adf3128da6c19adbfe59bf55ad4 SHA256 c8d291ec979824996df905f41801507aec2e6d4625bc62bc0a71411849a5d642 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch b/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/files/mtd-utils-1.4.8-install.patch new file mode 100644 index 0000000000..4ef55cff28 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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 +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 +--- + 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/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild new file mode 100644 index 0000000000..c99aa57b78 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2012 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.6 2012/04/17 16:02:42 ranger 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 ~amd64-linux ~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 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 +}