skiboot: Remove PREFIX patch

There's no need to patch skiboot, we can just use the existing 'prefix'
variable.

Change-Id: I65c00333c86cf1d42aa03760c1317fa479b74a20
Signed-off-by: Joel Stanley <joel@jms.id.au>

2 files changed, 3 insertions, 73 deletions

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
index 13564794d..9a2b1e54b 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot.inc
@@ -2,7 +2,6 @@ HOMEPAGE = "https://github.com/open-power"
 LICENSE = "Apache-2.0"
 
 SRC_URI += "git://github.com/open-power/skiboot.git;nobranch=1"
-SRC_URI += "file://0001-external-Use-more-standard-PREFIX-vs-prefix.patch"
 
 FILESEXTRAPATHS_append := "${THISDIR}/skiboot:"
 
@@ -21,6 +20,8 @@ do_compile() {
     oe_runmake -C ${SKIBOOT_SUBDIR} all
 }
 
+# TODO: remove PREFIX=$prefix when updating to a version that has
+# http://patchwork.ozlabs.org/patch/923741/ is merged upstream
 do_install() {
-    oe_runmake -C ${SKIBOOT_SUBDIR} install DESTDIR=${D} PREFIX=/usr
+    oe_runmake -C ${SKIBOOT_SUBDIR} install DESTDIR=${D} prefix=/usr PREFIX=$prefix
 }
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0001-external-Use-more-standard-PREFIX-vs-prefix.patch b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0001-external-Use-more-standard-PREFIX-vs-prefix.patch
deleted file mode 100644
index d00973bfa..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/skiboot/skiboot/0001-external-Use-more-standard-PREFIX-vs-prefix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 3cd3e18ef5743d3f78fa540af1141db8de1fdbcc Mon Sep 17 00:00:00 2001
-From: Patrick Williams <patrick@stwcx.xyz>
-Date: Fri, 5 Aug 2016 16:02:37 -0500
-Subject: [PATCH] external: Use more-standard PREFIX vs prefix
-
-Distro packaging tools typically use PREFIX instead of prefix,
-so change all references to lower-case prefix to upper-case.
-
-pflash uses PREFIX since at least b2649b.
-
-Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
----
- external/gard/rules.mk        | 6 +++---
- external/opal-prd/Makefile    | 6 +++---
- external/xscom-utils/Makefile | 6 +++---
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/external/gard/rules.mk b/external/gard/rules.mk
-index 0dd14ed..dfe93d5 100644
---- a/external/gard/rules.mk
-+++ b/external/gard/rules.mk
-@@ -7,9 +7,9 @@ OBJS     += $(LIBFLASH_OBJS)
- OBJS     += common-arch_flash.o
- EXE       = gard
- 
--prefix = /usr/local/
--sbindir = $(prefix)/sbin
--datadir = $(prefix)/share
-+PREFIX = /usr/local/
-+sbindir = $(PREFIX)/sbin
-+datadir = $(PREFIX)/share
- mandir = $(datadir)/man
- 
- GARD_VERSION ?= $(shell ./make_version.sh $(EXE))
-diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile
-index 7482af3..8318348 100644
---- a/external/opal-prd/Makefile
-+++ b/external/opal-prd/Makefile
-@@ -3,9 +3,9 @@ LDFLAGS += -m64
- ASFLAGS = -m64
- CPPFLAGS += -I. -I../../include -I../../
- 
--prefix = /usr/local/
--sbindir = $(prefix)/sbin
--datadir = $(prefix)/share
-+PREFIX = /usr/local/
-+sbindir = $(PREFIX)/sbin
-+datadir = $(PREFIX)/share
- mandir = $(datadir)/man
- 
- all: links arch_links | opal-prd
-diff --git a/external/xscom-utils/Makefile b/external/xscom-utils/Makefile
-index 3fee247..9695105 100644
---- a/external/xscom-utils/Makefile
-+++ b/external/xscom-utils/Makefile
-@@ -3,9 +3,9 @@ CC = $(CROSS_COMPILE)gcc
- XSCOM_VERSION ?= $(shell ../../make_version.sh xscom-utils)
- CFLAGS += -O2 -g -Wall -m64
- 
--prefix = /usr/local/
--sbindir = $(prefix)/sbin
--datadir = $(prefix)/share
-+PREFIX = /usr/local/
-+sbindir = $(PREFIX)/sbin
-+datadir = $(PREFIX)/share
- mandir = $(datadir)/man
- 
- %.o: %.c
--- 
-2.9.0
-