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/sgpio/Makefile-error-fix.patch | |
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/sgpio/Makefile-error-fix.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch | 127 |
1 files changed, 127 insertions, 0 deletions
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 000000000..709f8316f --- /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 + |