Patchwork tree: new recipe for version 1.6.0

login
register
mail settings
Submitter Christian Charreyre
Date April 23, 2014, 8:41 a.m.
Message ID <1398242491-2373-1-git-send-email-christian.charreyre@cioinfoindus.fr>
Download mbox | patch
Permalink /patch/70773/
State New
Headers show

Comments

Christian Charreyre - April 23, 2014, 8:41 a.m.
This patch creates the recipe for the command tree, which is a recursive
directory listing command that produces a depth indented listing of files,
which is colorized ala dircolors if the LS_COLORS environment variable is
set and output is to tty

Signed-off-by: Christian Charreyre <christian.charreyre@cioinfoindus.fr>
---
 .../tree/tree/0001-adapt-Makefile.patch            |   44 ++++++++++++++++++++
 meta/recipes-support/tree/tree_1.6.0.bb |   15 +++++++
 2 files changed, 59 insertions(+)
 create mode 100644 meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
 create mode 100644 meta/recipes-support/tree/tree_1.6.0.bb
Saul Wold - April 23, 2014, 6 p.m.
On 04/23/2014 01:41 AM, Christian Charreyre wrote:
> This patch creates the recipe for the command tree, which is a recursive
> directory listing command that produces a depth indented listing of files,
> which is colorized ala dircolors if the LS_COLORS environment variable is
> set and output is to tty
>

Thanks for the submission, a couple of questions and comments below.

Why is this needed in oe-core?  Are there many people interested in it?

Maybe it should start in meta-openemebedded/meta-oe

> Signed-off-by: Christian Charreyre <christian.charreyre@cioinfoindus.fr>
> ---
>   .../tree/tree/0001-adapt-Makefile.patch            |   44 ++++++++++++++++++++
>   meta/recipes-support/tree/tree_1.6.0.bb |   15 +++++++
>   2 files changed, 59 insertions(+)
>   create mode 100644 meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
>   create mode 100644 meta/recipes-support/tree/tree_1.6.0.bb
>
> diff --git a/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch b/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
> new file mode 100644
> index 0000000..bcc19c9
> --- /dev/null
> +++ b/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
> @@ -0,0 +1,44 @@
> +Adapt Makefile to cross compilation and tool environment
> +
This 0001-adapt-Makefile.patch should have an Upstream-Status and 
Signed-off-by tags also.

Please see: http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

> +Index: tree-1.6.0/Makefile
> +===================================================================
> +--- tree-1.6.0.orig/Makefile	2011-06-24 16:25:27.000000000 +0200
> ++++ tree-1.6.0/Makefile	2014-04-22 16:53:14.817331834 +0200
> +@@ -16,23 +16,23 @@
> + # along with this program; if not, write to the Free Software
> + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> +
> +-prefix = /usr
> ++prefix = ${DESTDIR}/usr
> +
> +-CC=gcc
> ++CC ?= gcc
> +
> + VERSION=1.6.0
> + TREE_DEST=tree
> + BINDIR=${prefix}/bin
> + MAN=tree.1
> +-MANDIR=${prefix}/man/man1
> ++MANDIR=${prefix}/share/man/man1
> + OBJS=tree.o unix.o html.o xml.o hash.o color.o
> +
> + # Uncomment options below for your particular OS:
> +
> + # Linux defaults:
> + #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
> +-CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
> +-LDFLAGS=-s
> ++CFLAGS ?= -O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
> ++LDFLAGS ?= -s
> +
> + # Uncomment for FreeBSD:
> + #CFLAGS=-O2 -Wall -fomit-frame-pointer
> +@@ -97,7 +97,7 @@
> + 	install -d $(BINDIR)
> + 	install -d $(MANDIR)
> + 	if [ -e $(TREE_DEST) ]; then \
> +-		install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
> ++		install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
> + 	fi
> + 	install doc/$(MAN) $(MANDIR)/$(MAN)
> +
> diff --git a/meta/recipes-support/tree/tree_1.6.0.bb b/meta/recipes-support/tree/tree_1.6.0.bb
> new file mode 100644
> index 0000000..f1ca376
> --- /dev/null
> +++ b/meta/recipes-support/tree/tree_1.6.0.bb
> @@ -0,0 +1,15 @@
> +DESCRIPTION = "a recursive directory listing command."
This is more of a SUMMARY, can you expand of the DESCRIPTIION?

> +SECTION = "console/utils"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
> +
> +SRC_URI = "http://mama.indstate.edu/users/ice/${PN}/src/${PN}-${PV}.tgz \
> +	file://0001-adapt-Makefile.patch \
> +"
> +
> +SRC_URI[md5sum] = "04e967a3f4108d50cde3b4b0e89e970a"
> +SRC_URI[sha256sum] = "4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591"
> +
> +inherit autotools
> +
Does it really use autotools?  I think it can just use the standard 
do_compile/do_install and does not require autotools.

> +CFLAGS_append = " -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
>

Thanks again
	Sau!
Christian Charreyre - May 6, 2014, 4:13 p.m.
Hello Saul,

Le 23/04/2014 20:00, Saul Wold a écrit :
> On 04/23/2014 01:41 AM, Christian Charreyre wrote:
>> This patch creates the recipe for the command tree, which is a recursive
>> directory listing command that produces a depth indented listing of 
>> files,
>> which is colorized ala dircolors if the LS_COLORS environment 
>> variable is
>> set and output is to tty
>>
>
> Thanks for the submission, a couple of questions and comments below.
>
> Why is this needed in oe-core?  Are there many people interested in it?
>
> Maybe it should start in meta-openemebedded/meta-oe

I didn't know where to locate it. meta-openemebedded/meta-oeis OK for 
me, I'll change the patch accordingly.
>
>> Signed-off-by: Christian Charreyre <christian.charreyre@cioinfoindus.fr>
>> ---
>>   .../tree/tree/0001-adapt-Makefile.patch            |   44 
>> ++++++++++++++++++++
>>   meta/recipes-support/tree/tree_1.6.0.bb |   15 +++++++
>>   2 files changed, 59 insertions(+)
>>   create mode 100644 
>> meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
>>   create mode 100644 meta/recipes-support/tree/tree_1.6.0.bb
>>
>> diff --git a/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch 
>> b/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
>> new file mode 100644
>> index 0000000..bcc19c9
>> --- /dev/null
>> +++ b/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
>> @@ -0,0 +1,44 @@
>> +Adapt Makefile to cross compilation and tool environment
>> +
> This 0001-adapt-Makefile.patch should have an Upstream-Status and 
> Signed-off-by tags also.
>
> Please see: 
> http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

OK, done in next version

>
>> +Index: tree-1.6.0/Makefile
>> +===================================================================
>> +--- tree-1.6.0.orig/Makefile    2011-06-24 16:25:27.000000000 +0200
>> ++++ tree-1.6.0/Makefile    2014-04-22 16:53:14.817331834 +0200
>> +@@ -16,23 +16,23 @@
>> + # along with this program; if not, write to the Free Software
>> + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
>> 02111-1307  USA
>> +
>> +-prefix = /usr
>> ++prefix = ${DESTDIR}/usr
>> +
>> +-CC=gcc
>> ++CC ?= gcc
>> +
>> + VERSION=1.6.0
>> + TREE_DEST=tree
>> + BINDIR=${prefix}/bin
>> + MAN=tree.1
>> +-MANDIR=${prefix}/man/man1
>> ++MANDIR=${prefix}/share/man/man1
>> + OBJS=tree.o unix.o html.o xml.o hash.o color.o
>> +
>> + # Uncomment options below for your particular OS:
>> +
>> + # Linux defaults:
>> + #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE 
>> -D_FILE_OFFSET_BITS=64
>> +-CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>> +-LDFLAGS=-s
>> ++CFLAGS ?= -O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE 
>> -D_FILE_OFFSET_BITS=64
>> ++LDFLAGS ?= -s
>> +
>> + # Uncomment for FreeBSD:
>> + #CFLAGS=-O2 -Wall -fomit-frame-pointer
>> +@@ -97,7 +97,7 @@
>> +     install -d $(BINDIR)
>> +     install -d $(MANDIR)
>> +     if [ -e $(TREE_DEST) ]; then \
>> +-        install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
>> ++        install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
>> +     fi
>> +     install doc/$(MAN) $(MANDIR)/$(MAN)
>> +
>> diff --git a/meta/recipes-support/tree/tree_1.6.0.bb 
>> b/meta/recipes-support/tree/tree_1.6.0.bb
>> new file mode 100644
>> index 0000000..f1ca376
>> --- /dev/null
>> +++ b/meta/recipes-support/tree/tree_1.6.0.bb
>> @@ -0,0 +1,15 @@
>> +DESCRIPTION = "a recursive directory listing command."
> This is more of a SUMMARY, can you expand of the DESCRIPTIION?

I'll try

>
>> +SECTION = "console/utils"
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM = 
>> "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
>> +
>> +SRC_URI = 
>> "http://mama.indstate.edu/users/ice/${PN}/src/${PN}-${PV}.tgz \
>> +    file://0001-adapt-Makefile.patch \
>> +"
>> +
>> +SRC_URI[md5sum] = "04e967a3f4108d50cde3b4b0e89e970a"
>> +SRC_URI[sha256sum] = 
>> "4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591"
>> +
>> +inherit autotools
>> +
> Does it really use autotools?  I think it can just use the standard 
> do_compile/do_install and does not require autotools.

I used autotools inheritance to avoid to explicitely define 
do_compile/do_install. Whet is the good method if I don't inherit from 
autotools.
Do I define them explicitely in the recipe or is there a way to inherit 
from another class ?

>
>> +CFLAGS_append = " -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
>>
>
> Thanks again
>     Sau!
>
>

Waiting for your reply to send a corrected patch.

Regards.

Patch

diff --git a/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch b/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
new file mode 100644
index 0000000..bcc19c9
--- /dev/null
+++ b/meta/recipes-support/tree/tree/0001-adapt-Makefile.patch
@@ -0,0 +1,44 @@ 
+Adapt Makefile to cross compilation and tool environment
+
+Index: tree-1.6.0/Makefile
+===================================================================
+--- tree-1.6.0.orig/Makefile	2011-06-24 16:25:27.000000000 +0200
++++ tree-1.6.0/Makefile	2014-04-22 16:53:14.817331834 +0200
+@@ -16,23 +16,23 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-prefix = /usr
++prefix = ${DESTDIR}/usr
+ 
+-CC=gcc
++CC ?= gcc
+ 
+ VERSION=1.6.0
+ TREE_DEST=tree
+ BINDIR=${prefix}/bin
+ MAN=tree.1
+-MANDIR=${prefix}/man/man1
++MANDIR=${prefix}/share/man/man1
+ OBJS=tree.o unix.o html.o xml.o hash.o color.o
+ 
+ # Uncomment options below for your particular OS:
+ 
+ # Linux defaults:
+ #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-LDFLAGS=-s
++CFLAGS ?= -O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++LDFLAGS ?= -s
+ 
+ # Uncomment for FreeBSD:
+ #CFLAGS=-O2 -Wall -fomit-frame-pointer
+@@ -97,7 +97,7 @@
+ 	install -d $(BINDIR)
+ 	install -d $(MANDIR)
+ 	if [ -e $(TREE_DEST) ]; then \
+-		install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
++		install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
+ 	fi
+ 	install doc/$(MAN) $(MANDIR)/$(MAN)
+ 
diff --git a/meta/recipes-support/tree/tree_1.6.0.bb b/meta/recipes-support/tree/tree_1.6.0.bb
new file mode 100644
index 0000000..f1ca376
--- /dev/null
+++ b/meta/recipes-support/tree/tree_1.6.0.bb
@@ -0,0 +1,15 @@ 
+DESCRIPTION = "a recursive directory listing command."
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI = "http://mama.indstate.edu/users/ice/${PN}/src/${PN}-${PV}.tgz \
+	file://0001-adapt-Makefile.patch \
+"
+
+SRC_URI[md5sum] = "04e967a3f4108d50cde3b4b0e89e970a"
+SRC_URI[sha256sum] = "4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591"
+
+inherit autotools
+
+CFLAGS_append = " -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"