Update rest-dbus
Removed upstreamed patches to makefile.
Updated path in systemd service file.
Add dependency on mapper.
diff --git a/common/recipes-phosphor/rest-dbus/files/makefile.patch b/common/recipes-phosphor/rest-dbus/files/makefile.patch
deleted file mode 100644
index 96a82c1..0000000
--- a/common/recipes-phosphor/rest-dbus/files/makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..3d79547
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,18 @@
-+PACKAGE=rest-dbus
-+
-+prefix?=/usr/local
-+bin=$(prefix)/usr/bin
-+share=$(prefix)/usr/share/$(PACKAGE)
-+
-+build clean all:
-+
-+install:
-+ @install -d $(bin) $(share)/resources $(srv)
-+ @install -m 755 $(PACKAGE) $(bin)
-+ @for f in resources/*; do \
-+ install -m644 $$f $(share)/resources; \
-+ done
-+
-+uninstall:
-+ @rm -f $(bin)/$(PACKAGE)
-+ @rm -rf $(share)
diff --git a/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch b/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch
deleted file mode 100644
index d68a037..0000000
--- a/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/rest-dbus
-===================================================================
---- git.orig/rest-dbus
-+++ git/rest-dbus
-@@ -8,7 +8,6 @@ import os
- from xml.etree import ElementTree
-
- busses = {
-- 'session': dbus.SessionBus,
- 'system': dbus.SystemBus,
- }
-
diff --git a/common/recipes-phosphor/rest-dbus/files/resources-path.patch b/common/recipes-phosphor/rest-dbus/files/resources-path.patch
deleted file mode 100644
index dee4404..0000000
--- a/common/recipes-phosphor/rest-dbus/files/resources-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/rest-dbus b/rest-dbus
-index 56ec1f9..078b1cf 100755
---- a/rest-dbus
-+++ b/rest-dbus
-@@ -40,7 +40,7 @@ class DBusRestResourceResponse(DBusRestResponse):
- 'png': 'image/png',
- 'gif': 'image/gif',
- }
-- resource_base = 'resources'
-+ resource_base = '/usr/share/rest-dbus/resources'
-
- def __init__(self, name):
- (_, ext) = os.path.splitext(name)
diff --git a/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
index 686cf69..b6f9b97 100644
--- a/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
+++ b/common/recipes-phosphor/rest-dbus/files/rest-dbus.service
@@ -2,7 +2,7 @@
Description=DBUS introspecting REST server.
[Service]
-ExecStart=/usr/bin/rest-dbus
+ExecStart=/usr/sbin/rest-dbus
[Install]
WantedBy=multi-user.target