summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/yaffs-utils')
-rw-r--r--sys-fs/yaffs-utils/ChangeLog8
-rw-r--r--sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch19
-rw-r--r--sys-fs/yaffs-utils/yaffs-utils-9999.ebuild21
3 files changed, 30 insertions, 18 deletions
diff --git a/sys-fs/yaffs-utils/ChangeLog b/sys-fs/yaffs-utils/ChangeLog
index d332f716da96..b81e55959c4b 100644
--- a/sys-fs/yaffs-utils/ChangeLog
+++ b/sys-fs/yaffs-utils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/yaffs-utils
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/ChangeLog,v 1.1 2006/07/31 05:25:59 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/ChangeLog,v 1.2 2011/09/11 19:01:47 vapier Exp $
+
+ 11 Sep 2011; Mike Frysinger <vapier@gentoo.org> yaffs-utils-9999.ebuild,
+ files/yaffs-utils-9999-build.patch:
+ Convert to git and clean up a bit #382327 by Paul Osmialowski.
*yaffs-utils-9999 (31 Jul 2006)
diff --git a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch b/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
index 17b890923b8a..901484db9995 100644
--- a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
+++ b/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
@@ -1,15 +1,24 @@
---- yaffs/utils/Makefile
-+++ yaffs/utils/Makefile
-@@ -16,7 +16,7 @@
+diff --git a/utils/Makefile b/utils/Makefile
+index 4929e08..51c4e5f 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -16,14 +16,13 @@
#KERNELDIR = /usr/src/kernel-headers-2.4.18
-CFLAGS = -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
-+CFLAGS+= -I.. -Wall -DCONFIG_YAFFS_UTIL
++CFLAGS+= -I.. -Wall -DCONFIG_YAFFS_UTIL $(CPPFLAGS)
CFLAGS+= -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
CFLAGS+= -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
-@@ -36,13 +36,13 @@ $(MKYAFFSIMAGEOBJS): %.o: %.c
+ ## Change if you are using a cross-compiler
+ MAKETOOLS =
+
+-CC=$(MAKETOOLS)gcc
+
+ MKYAFFSOBJS = mkyaffs.o
+
+@@ -36,13 +35,13 @@ $(MKYAFFSIMAGEOBJS): %.o: %.c
$(CC) -c $(CFLAGS) $< -o $@
mkyaffsimage: $(MKYAFFSIMAGEOBJS)
diff --git a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild b/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
index 43c81d579862..fa9edb7dea45 100644
--- a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
+++ b/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2009 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/yaffs-utils/yaffs-utils-9999.ebuild,v 1.2 2009/09/19 15:04:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild,v 1.3 2011/09/11 19:01:47 vapier Exp $
-ECVS_SERVER="cvs.aleph1.co.uk:/home/aleph1/cvs"
-ECVS_MODULE="yaffs"
+EAPI="2"
-inherit eutils cvs
+EGIT_REPO_URI="git://www.aleph1.co.uk/yaffs"
+EGIT_UNPACK_DIR=${WORKDIR}
+
+inherit eutils git toolchain-funcs
DESCRIPTION="tools for generating YAFFS images"
HOMEPAGE="http://www.aleph1.co.uk/yaffs/"
@@ -15,14 +17,11 @@ SLOT="0"
KEYWORDS=""
IUSE=""
-DEPEND=""
-
-S=${WORKDIR}/${ECVS_MODULE}/utils
+S=${WORKDIR}/utils
-src_unpack() {
- cvs_src_unpack
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
+ tc-export CC
}
src_install() {