Re: [meta-oe][PATCH V3] tree: Add a new package

[Koen Kooi <koen@dominion.thruhere.net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hongjun Yang schreef op 30-10-14 14:24:
> From: "Hongjun.Yang" <hongjun.yang@windriver.com>
> 
> Add tree command, some ptest cases need it.
> 
> Signed-off-by: Hongjun.Yang <hongjun.yang@windriver.com>
> 
> --- .../tree/tree-1.7.0/fix-cross-env.patch            | 36
> ++++++++++++++++++++++ meta-oe/recipes-support/tree/tree_1.7.0.bb
> | 16 ++++++++++ 2 files changed, 52 insertions(+) create mode 100644
> meta-oe/recipes-support/tree/tree-1.7.0/fix-cross-env.patch create mode
> 100644 meta-oe/recipes-support/tree/tree_1.7.0.bb
> 
> diff --git a/meta-oe/recipes-support/tree/tree-1.7.0/fix-cross-env.patch
> b/meta-oe/recipes-support/tree/tree-1.7.0/fix-cross-env.patch new file
> mode 100644 index 0000000..d0118f6 --- /dev/null +++
> b/meta-oe/recipes-support/tree/tree-1.7.0/fix-cross-env.patch @@ -0,0
> +1,36 @@ +From 945a5861bb19a34d31119bc38f813513296ce2ad Mon Sep 17
> 00:00:00 2001 +From: "Hongjun.Yang" <hongjun.yang@windriver.com> +Date:
> Thu, 30 Oct 2014 20:38:06 +0800 +Subject: [PATCH] Fix the cross-compiling
> issue + +Upstream-Status: Pending + +Signed-off-by: Hongjun.Yang
> <hongjun.yang@windriver.com> +--- + Makefile | 6 +++--- + 1 file changed,
> 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile 
> +index e91f1f6..e496a52 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,13
> +18,13 @@ + + prefix = /usr + +-CC=gcc ++#CC=gcc + + VERSION=1.7.0 +
> TREE_DEST=tree +-BINDIR=${prefix}/bin ++BINDIR=${DESTDIR}/${prefix}/bin +
> MAN=tree.1 +-MANDIR=${prefix}/man/man1 
> ++MANDIR=${DESTDIR}/${prefix}/man/man1 + OBJS=tree.o unix.o html.o xml.o
> json.o hash.o color.o + + # Uncomment options below for your particular
> OS: +-- +1.9.1 + diff --git a/meta-oe/recipes-support/tree/tree_1.7.0.bb
> b/meta-oe/recipes-support/tree/tree_1.7.0.bb new file mode 100644 index
> 0000000..c1c3a8b

This whole patch can be replaced with:

EXTRA_OEMAKE="CC='${CC}' CFLAGS='${CFLAGS} -DLINUX -D_LARGEFILE64_SOURCE
- -D_FILE_OFFSET_BITS=64' LDFLAGS='${LDFLAGS}'

[..]

do_install() {
	oe_runmake install BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1
}



> --- /dev/null +++ b/meta-oe/recipes-support/tree/tree_1.7.0.bb @@ -0,0
> +1,16 @@ +SUMMARY = "This is a handy little utility to display a tree
> view of directories." +HOMEPAGE =
> "http://mama.indstate.edu/users/ice/tree/" +SECTION = "console/utils" 
> +LICENSE="GPLv2" +LIC_FILES_CHKSUM =
> "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" + +inherit
> autotools-brokensep + +SRC_URI =
> "http://mama.indstate.edu/users/ice/tree/src/tree-1.7.0.tgz \

change that to tree-${PV}.tgz

> +	   file://fix-cross-env.patch \ +	  " + +SRC_URI[md5sum] =
> "abe3e03e469c542d8e157cdd93f4d8a6" +SRC_URI[sha256sum] =
> "6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12" + 
> +FILES_${PN}-doc += "${prefix}/man"
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFUUkOgMkyGM64RGpERAl1xAJ9PiXKuZSheKeib1V/8N3UHKk1AtACgmVlS
au0DIDX3zHLlieCyAW550nE=
=Gh6Q
-----END PGP SIGNATURE-----