From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mail.openembedded.org (Postfix) with ESMTP id 3EB7A7210F for ; Fri, 21 Nov 2014 14:08:36 +0000 (UTC) Received: by mail-wi0-f175.google.com with SMTP id l15so12176728wiw.8 for ; Fri, 21 Nov 2014 06:08:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:date:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=ZOfOL9LSQA/XopeuAZVoCFp7bZz4hRYxpxhlaYLm/Wo=; b=fIkpU+vIGegczWnkooqz1iLRmZJzghrrnuWfsfkC0uo6bkDVcJUg1TaxGNkFyQwypo 9XdKO/d851hGT0yKrsUS4iqAMMZYwuySz2FTwZvELg/hYOiwgccpwcdHh0lySRe0FJVY Fu+O58qESWaMMZVFJNE+ITV8VZqC0qe1Nyu27jLphm1KHK1FDmb8ku+qikLCFk4/23Eh IxxScjaKbnw0brnTszEyg+AzHUrMjVAz4/oQ7hHaQht4TZJhtb9ml5M5dfkLYfS7jd0x inJ37cPpedR+EUWiVJx/YENS+JO1N/tCMxEITjvO4PbE5V8MrrReT8ZDP1UQs9XECKXr nJlg== X-Received: by 10.194.193.2 with SMTP id hk2mr7790254wjc.40.1416578578565; Fri, 21 Nov 2014 06:02:58 -0800 (PST) Received: from localhost (ip-89-176-104-3.net.upcbroadband.cz. [89.176.104.3]) by mx.google.com with ESMTPSA id v6sm8178556wjz.40.2014.11.21.06.02.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Nov 2014 06:02:57 -0800 (PST) From: Martin Jansa X-Google-Original-From: Martin Jansa Date: Fri, 21 Nov 2014 15:03:00 +0100 To: openembedded-devel@lists.openembedded.org Message-ID: <20141121140300.GF2163@jama> References: <1416222008-9218-1-git-send-email-lixin.fnst@cn.fujitsu.com> <1416222008-9218-6-git-send-email-lixin.fnst@cn.fujitsu.com> <20141119143330.GF3315@jama> MIME-Version: 1.0 In-Reply-To: <20141119143330.GF3315@jama> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH 5/5] sgpio : add new recipe X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 14:08:40 -0000 X-Groupsio-MsgNum: 52973 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="TU+u6i6jrDPzmlWF" Content-Disposition: inline --TU+u6i6jrDPzmlWF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > >=20 > > Signed-off-by: Li Xin > > --- > > .../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 > >=20 > > diff --git a/meta-oe/recipes-extended/sgpio/sgpio-1.2.0.10/0001-Makefil= e-modify-some-parameters.patch b/meta-oe/recipes-extended/sgpio/sgpio-1.2.0= =2E10/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-modif= y-some-parameters.patch > > @@ -0,0 +1,51 @@ > > +From ecb100a252c691075720ff0604e2ebdb83deb994 Mon Sep 17 00:00:00 2001 > > +From: Li xin > > +Date: Mon, 17 Nov 2014 12:26:21 +0900 > > +Subject: [PATCH] Makefile : modify some parameters > > + > > +Signed-off-by: Li Xin > > +--- > > + 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 @@ > > +=20 > > +=20 > > + MANDIR ?=3D /usr/local/man > > ++SBIN_DIR =3D /sbin > > ++INSTALL =3D/usr/bin/install -c > > + ALL =3D sgpio > > ++CFLAGS =3D -g -Wall > > +=20 > > + all: $(ALL) > > +=20 > > + sgpio.o: sgpio.c > > +- gcc -g -Wall -c sgpio.c > > ++ ${CC} $(CFLAGS) -c sgpio.c > > +=20 > > + sgpio: sgpio.o > > +- gcc -g sgpio.o -o sgpio > > ++ ${CC} -g sgpio.o -o sgpio > > +=20 > > + clean: > > + rm -f sgpio.o sgpio > > +=20 > > + 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 > > +=20 > > + uninstall: > > + for i in $(ALL); do \ > > +--=20 > > +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 =3D "SGPIO captive backplane tool" > > +DESCRIPTION =3D "Intel SGPIO enclosure management utility" > > +HOMEPAGE =3D "http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing" > > +SECTION =3D "System Environment/Base" > > + > > +SRC_URI =3D "http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${PN}-1.2-0= =2E10-src.tar.gz/a417bf68da4e9bd79a4664c11d7debd1/${PN}-1.2-0.10-src.tar.gz" > > + > > +SRC_URI +=3D "file://0001-Makefile-modify-some-parameters.patch" > > + > > +SRC_URI[md5sum] =3D "a417bf68da4e9bd79a4664c11d7debd1" > > +SRC_URI[sha256sum] =3D "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbb= d4a7363d990fc0270b" > > + > > +S =3D "${WORKDIR}/${PN}" > > + > > +LICENSE =3D "GPLv2+" > > +LIC_FILES_CHKSUM =3D "file://LICENSE_GPL;md5=3D393a5ca445f6965873eca02= 59a17f833" > > + > > +do_compile_prepend() { > > + oe_runmake clean > > +} > > + > > +do_install() { > > + oe_runmake install \ > > + INSTALL=3D"/usr/bin/install -p" \ > > + DESTDIR=3D${D} \ > > + SBIN_DIR=3D${D}/${sbindir} \ > > + MANDIR=3D${D}/${mandir} >=20 > use 4 spaces for indentation, no tabs and definitely no mix of tabs and > spaces >=20 > 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 wi= th -f) ERROR: Function failed: patch_do_patch ERROR: Logfile of failure stored in: /home/jenkins/oe/world/shr-core/tmp-gl= ibc/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-o= e/recipes-extended/sgpio/sgpio_1.2.0.10.bb, do_patch) failed with exit code= '1' >=20 > > +} > > --=20 > > 1.8.4.2 > >=20 > > --=20 > > _______________________________________________ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel >=20 > --=20 > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --=20 Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com --TU+u6i6jrDPzmlWF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlRvRhQACgkQN1Ujt2V2gBwDDACfRh0Jq3zwIkZvnUefIdWqR1NQ Q4wAoJjTK43SljjWdyc3hGbk1xkl7/Sc =eHiV -----END PGP SIGNATURE----- --TU+u6i6jrDPzmlWF--