diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
| commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
| tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-oe/recipes-extended/sgpio | |
| parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
| download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz | |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/sgpio')
3 files changed, 183 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch new file mode 100644 index 0000000000..87fdd6058a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch @@ -0,0 +1,29 @@ +From 92bf2f24d4762efd1dbcc4add457e2b600aa50cf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Mar 2017 08:02:17 -0700 +Subject: [PATCH] makefile: Add LDFLAGS to linking rule + +This make it use correct link flags and fixes errors like +No GNU_HASH in the elf binary + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index c2b0bc7..cdfb58f 100755 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ sgpio.o: sgpio.c + ${CC} $(CFLAGS) -c sgpio.c + + sgpio: sgpio.o +- ${CC} -g sgpio.o -o sgpio ++ ${CC} $(LDFLAGS) -g sgpio.o -o sgpio + + clean: + rm -f sgpio.o sgpio +-- +2.12.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch new file mode 100644 index 0000000000..709f8316f1 --- /dev/null +++ b/meta-openembedded/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. + +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-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb new file mode 100644 index 0000000000..63e8d36d0a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb @@ -0,0 +1,27 @@ +SUMMARY = "SGPIO captive backplane tool" +HOMEPAGE = "http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing" +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 \ + file://0001-makefile-Add-LDFLAGS-to-linking-rule.patch \ + " +SRC_URI[md5sum] = "a417bf68da4e9bd79a4664c11d7debd1" +SRC_URI[sha256sum] = "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbbd4a7363d990fc0270b" + +S = "${WORKDIR}/${BPN}" + +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} +} |