Re: [meta-oe][PATCH v3] sgpio: add new recipe

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

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

On Fri, Jan 23, 2015 at 10:49:50AM +0800, Li xin wrote:
> Intel SGPIO enclosure management utility.
> 
> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> ---
>  .../sgpio/sgpio/Makefile-error-fix.patch           | 127 +++++++++++++++++++++
>  meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb   |  26 +++++
>  2 files changed, 153 insertions(+)
>  create mode 100644 meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch
>  create mode 100644 meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
> 
> diff --git a/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch b/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch
> new file mode 100644
> index 0000000..709f831
> --- /dev/null
> +++ b/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch
> @@ -0,0 +1,127 @@
> +Fix Makefile:
> +
> +* change the file format from dos to unix to avoid do_patch failed.
> +* override gcc,SBIN_DIR and INSTALL for cross-compilation.

And now it fails :)

ERROR: Command Error: exit status: 1  Output:
Applying patch Makefile-error-fix.patch
patching file Makefile
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file Makefile
Patch Makefile-error-fix.patch does not apply (enforce with -f)
ERROR: Function failed: patch_do_patch
NOTE: Running task 24080 of 31430 (ID: 15862, /home/jenkins/oe/world/shr-core/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb, do_rm_work_all)
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.22993
NOTE: recipe sgpio-1.2.0.10-r0: task do_patch: Failed
ERROR: Task 15924 (/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'

> +Upstream-Status: pending
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> +---
> + Makefile | 107 ++++++++++++++++++++++++++++++++-------------------------------
> + 1 file changed, 55 insertions(+), 52 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 278d966..c2b0bc7 100755
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -1,52 +1,55 @@
> +-########################################################################
> +-# Copyright (C) 2007-2008, Intel Corp. All rights reserved.
> +-#
> +-#
> +-# This program is free software; you can redistribute it and/or modify it under
> +-# the terms of the GNU General Public License as published by the Free Software
> +-# Foundation; either version 2 of the License, or (at your option) any later version.
> +-#
> +-# This program is distributed in the hope that it will be useful, but
> +-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> +-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
> +-# for more details.
> +-#
> +-# You should have received a copy of the GNU General Public License along
> +-# with this program; if not, write to the Free Software Foundation, Inc.,
> +-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> +-########################################################################
> +-
> +-
> +-# Intel SGPIO enclosure management utility
> +-#
> +-# Author: Eric R Hall <Eric.R.Hall@intel.com>
> +-
> +-
> +-MANDIR ?= /usr/local/man
> +-ALL = sgpio
> +-
> +-all: $(ALL)
> +-
> +-sgpio.o: sgpio.c
> +-	gcc -g -Wall -c sgpio.c
> +-
> +-sgpio: sgpio.o
> +-	gcc -g sgpio.o -o sgpio
> +-
> +-clean:
> +-	rm -f sgpio.o sgpio
> +-
> +-install: $(ALL)
> +-	for i in $(ALL); do \
> +-		install $$i /sbin/$$i; \
> +-	done
> +-	install -d $(MANDIR)/man1
> +-	install -m 0644 *.1 $(MANDIR)/man1
> +-
> +-uninstall:
> +-	for i in $(ALL); do \
> +-		rm -f /sbin/$$i; \
> +-	done
> +-	for i in $(ALL:=.1); do \
> +-		rm -f $(MANDIR)/man1/$$i; \
> +-	done
> ++########################################################################
> ++# Copyright (C) 2007-2008, Intel Corp. All rights reserved.
> ++#
> ++#
> ++# This program is free software; you can redistribute it and/or modify it under
> ++# the terms of the GNU General Public License as published by the Free Software
> ++# Foundation; either version 2 of the License, or (at your option) any later version.
> ++#
> ++# This program is distributed in the hope that it will be useful, but
> ++# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
> ++# for more details.
> ++#
> ++# You should have received a copy of the GNU General Public License along
> ++# with this program; if not, write to the Free Software Foundation, Inc.,
> ++# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> ++########################################################################
> ++
> ++
> ++# Intel SGPIO enclosure management utility
> ++#
> ++# Author: Eric R Hall <Eric.R.Hall@intel.com>
> ++
> ++
> ++MANDIR ?= /usr/local/man
> ++SBIN_DIR = /sbin
> ++INSTALL =/usr/bin/install -c
> ++ALL = sgpio
> ++CFLAGS = -g -Wall
> ++
> ++all: $(ALL)
> ++
> ++sgpio.o: sgpio.c
> ++	${CC} $(CFLAGS) -c sgpio.c
> ++
> ++sgpio: sgpio.o
> ++	${CC} -g sgpio.o -o sgpio
> ++
> ++clean:
> ++	rm -f sgpio.o sgpio
> ++
> ++install: $(ALL)
> ++	for i in $(ALL); do \
> ++		$(INSTALL) -D $$i $(SBIN_DIR)/$$i; \
> ++	done
> ++	$(INSTALL) -d $(MANDIR)/man1
> ++	$(INSTALL) -m 0644 *.1 $(MANDIR)/man1
> ++
> ++uninstall:
> ++	for i in $(ALL); do \
> ++		rm -f /sbin/$$i; \
> ++	done
> ++	for i in $(ALL:=.1); do \
> ++		rm -f $(MANDIR)/man1/$$i; \
> ++	done
> +-- 
> +1.8.3.1
> +
> 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..9807a31
> --- /dev/null
> +++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
> @@ -0,0 +1,26 @@
> +SUMMARY = "SGPIO captive backplane tool"
> +DESCRIPTION = "Intel SGPIO enclosure management utility"
> +
> +SRC_URI = " \
> +    http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.tar.gz/a417bf68da4e9bd79a4664c11d7debd1/${BPN}-1.2-0.10-src.tar.gz \
> +    file://Makefile-error-fix.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}
> +}
> -- 
> 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

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