[PATCH rest-dbus] Add supporting files

[PATCH rest-dbus] Add supporting files

[OpenBMC Patches]

Add makefile, systemd service file.
Hardcode resources dir filesystem path.

https://github.com/openbmc/rest-dbus/pull/1

Brad Bishop (1):
  Add supporting files

 Makefile          | 21 +++++++++++++++++++++
 rest-dbus         |  2 +-
 rest-dbus.service |  8 ++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 Makefile
 create mode 100644 rest-dbus.service

-- 
2.6.0

[PATCH rest-dbus] Add supporting files

[OpenBMC Patches]

From: Brad Bishop <bradleyb@us.ibm.com>

Add makefile, systemd service file.
Hardcode resources dir filesystem path.
---
 Makefile          | 21 +++++++++++++++++++++
 rest-dbus         |  2 +-
 rest-dbus.service |  8 ++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 Makefile
 create mode 100644 rest-dbus.service

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3d79547
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+PACKAGE=rest-dbus
+
+prefix?=/usr/local
+bin=$(prefix)/usr/bin
+share=$(prefix)/usr/share/$(PACKAGE)
+srv=$(prefix)/lib/systemd/system/
+
+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
+	@install $(PACKAGE).service $(srv)
+
+uninstall:
+	@rm -f $(bin)/$(PACKAGE)
+	@rm -rf $(share)
+	@rm -f $(srv)/$(PACKAGE).service
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/rest-dbus.service b/rest-dbus.service
new file mode 100644
index 0000000..686cf69
--- /dev/null
+++ b/rest-dbus.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=DBUS introspecting REST server.
+
+[Service]
+ExecStart=/usr/bin/rest-dbus
+
+[Install]
+WantedBy=multi-user.target
-- 
2.6.0

Re: [PATCH rest-dbus] Add supporting files

[Patrick Williams]

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

On Wed, Oct 07, 2015 at 07:04:38PM -0500, OpenBMC Patches wrote:
> Add makefile, systemd service file.
> Hardcode resources dir filesystem path.
> 
> https://github.com/openbmc/rest-dbus/pull/1
> 
> Brad Bishop (1):
>   Add supporting files
> 
>  Makefile          | 21 +++++++++++++++++++++
>  rest-dbus         |  2 +-
>  rest-dbus.service |  8 ++++++++
>  3 files changed, 30 insertions(+), 1 deletion(-)
>  create mode 100644 Makefile
>  create mode 100644 rest-dbus.service

Any issues with this being merged?  It has been out there for a while.
-- 
Patrick Williams

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

Re: [PATCH rest-dbus] Add supporting files

[Jeremy Kerr]

Hi Brad,

> +PACKAGE=rest-dbus
> +
> +prefix?=/usr/local
> +bin=$(prefix)/usr/bin
> +share=$(prefix)/usr/share/$(PACKAGE)
> +srv=$(prefix)/lib/systemd/system/

We have /usr/ duplicated there in $(bin) and $(share).

You probably want this to work with

  make prefix=/usr libdir=/lib

and so using standard path names, this would be

  prefix ?= /usr/local
  bindir ?= $(prefix)/bin
  libdir ?= $(prefix)/lib
  datarootdir ?= $(prefix)/share
  pkgdatarootdir ?= $(prefix)/share/$(PACKAGE)
  servicedir ?= $(libdir)/systemd/system/

> -    resource_base = 'resources'
> +    resource_base = '/usr/share/rest-dbus/resources'

.. but this breaks if we use a different prefix. How about:

resource_base = os.path.join(os.path.dirname(__file__),
         os.pardir, 'share', 'resources')

- which still depends on pkgdatarootdir & bindir, but they're much less 
likely to be altered than prefix.

Also: generally, the systemd service definitions are part of the 
distribution, rather than upstream. Should we be putting that in the 
recipe instead?

Cheers,


Jeremy