Re: [PATCH 5/5] sgpio : add new recipe

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 5048 bytes --]

On Wed, Nov 19, 2014 at 03:33:30PM +0100, Martin Jansa wrote:
> On Mon, Nov 17, 2014 at 07:00:08PM +0800, Li xin wrote:
> > Intel SGPIO enclosure management utility
> > 
> > Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> > ---
> >  .../0001-Makefile-modify-some-parameters.patch     | 51 ++++++++++++++++++++++
> >  meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb   | 28 ++++++++++++
> >  2 files changed, 79 insertions(+)
> >  create mode 100644 meta-oe/recipes-extended/sgpio/sgpio-1.2.0.10/0001-Makefile-modify-some-parameters.patch
> >  create mode 100644 meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
> > 
> > diff --git a/meta-oe/recipes-extended/sgpio/sgpio-1.2.0.10/0001-Makefile-modify-some-parameters.patch b/meta-oe/recipes-extended/sgpio/sgpio-1.2.0.10/0001-Makefile-modify-some-parameters.patch
> > new file mode 100644
> > index 0000000..8b23a19
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/sgpio/sgpio-1.2.0.10/0001-Makefile-modify-some-parameters.patch
> > @@ -0,0 +1,51 @@
> > +From ecb100a252c691075720ff0604e2ebdb83deb994 Mon Sep 17 00:00:00 2001
> > +From: Li xin <lixin.fnst@cn.fujitsu.com>
> > +Date: Mon, 17 Nov 2014 12:26:21 +0900
> > +Subject: [PATCH] Makefile : modify some parameters
> > +
> > +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> > +---
> > + Makefile | 13 ++++++++-----
> > + 1 file changed, 8 insertions(+), 5 deletions(-)
> > +
> > +diff --git a/Makefile b/Makefile
> > +index 278d966..431d993 100755
> > +--- a/Makefile
> > ++++ b/Makefile
> > +@@ -23,25 +23,28 @@
> > + 
> > + 
> > + MANDIR ?= /usr/local/man
> > ++SBIN_DIR = /sbin
> > ++INSTALL =/usr/bin/install -c
> > + ALL = sgpio
> > ++CFLAGS = -g -Wall
> > + 
> > + all: $(ALL)
> > + 
> > + sgpio.o: sgpio.c
> > +-	gcc -g -Wall -c sgpio.c
> > ++	${CC} $(CFLAGS) -c sgpio.c
> > + 
> > + sgpio: sgpio.o
> > +-	gcc -g sgpio.o -o sgpio
> > ++	${CC} -g sgpio.o -o sgpio
> > + 
> > + clean:
> > + 	rm -f sgpio.o sgpio
> > + 
> > + install: $(ALL)
> > + 	for i in $(ALL); do \
> > +-		install $$i /sbin/$$i; \
> > ++	    $(INSTALL) -D $$i $(SBIN_DIR)/$$i; \
> > + 	done
> > +-	install -d $(MANDIR)/man1
> > +-	install -m 0644 *.1 $(MANDIR)/man1
> > ++	$(INSTALL) -d $(MANDIR)/man1
> > ++	$(INSTALL) -m 0644 *.1 $(MANDIR)/man1
> > + 
> > + uninstall:
> > + 	for i in $(ALL); do \
> > +-- 
> > +1.8.4.2
> > +
> > diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
> > new file mode 100644
> > index 0000000..7867d9d
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
> > @@ -0,0 +1,28 @@
> > +SUMMARY = "SGPIO captive backplane tool"
> > +DESCRIPTION = "Intel SGPIO enclosure management utility"
> > +HOMEPAGE = "http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing"
> > +SECTION = "System Environment/Base"
> > +
> > +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${PN}-1.2-0.10-src.tar.gz/a417bf68da4e9bd79a4664c11d7debd1/${PN}-1.2-0.10-src.tar.gz"
> > +
> > +SRC_URI += "file://0001-Makefile-modify-some-parameters.patch"
> > +
> > +SRC_URI[md5sum] = "a417bf68da4e9bd79a4664c11d7debd1"
> > +SRC_URI[sha256sum] = "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbbd4a7363d990fc0270b"
> > +
> > +S = "${WORKDIR}/${PN}"
> > +
> > +LICENSE = "GPLv2+"
> > +LIC_FILES_CHKSUM = "file://LICENSE_GPL;md5=393a5ca445f6965873eca0259a17f833"
> > +
> > +do_compile_prepend() {
> > +	oe_runmake clean
> > +}
> > +
> > +do_install() {
> > +	oe_runmake install \
> > +                INSTALL="/usr/bin/install -p" \
> > +                DESTDIR=${D} \
> > +	        SBIN_DIR=${D}/${sbindir} \
> > +	        MANDIR=${D}/${mandir}
> 
> use 4 spaces for indentation, no tabs and definitely no mix of tabs and
> spaces
> 
> I've fixed this one when cherry-picking to master-next

But there is another issue:

ERROR: Command Error: exit status: 1  Output:
Applying patch 0001-Makefile-modify-some-parameters.patch
patching file Makefile
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- rejects in file Makefile
Patch 0001-Makefile-modify-some-parameters.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sgpio/1.2.0.10-r0/temp/log.do_patch.5210
NOTE: recipe sgpio-1.2.0.10-r0: task do_patch: Failed
NOTE: recipe vlan-1.9-r0: task do_unpack: Succeeded
ERROR: Task 15324 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb, do_patch) failed with exit code '1'


> 
> > +}
> > -- 
> > 1.8.4.2
> > 
> > -- 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]