summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriele Santomaggio <G.santomaggio@gmail.com>2016-09-23 23:10:13 +0200
committerGitHub <noreply@github.com>2016-09-23 23:10:13 +0200
commitaf9f91fc36221207a7df68170a1a05b27d16cadf (patch)
treea27f391708776bf7294dbcbbe5123f1a05642e0a
parentafd253cc0e2b54a272f4f4fe07105b0622645c8c (diff)
parent3420eec4ca88c4f726a71faadd32a03617075af4 (diff)
downloaderlang-sd_notify-af9f91fc36221207a7df68170a1a05b27d16cadf.tar.gz
Merge pull request #16 from systemd/erlang-sd_notify_19_1
update for Erlang/ OTP 19.1
-rw-r--r--README.md14
-rw-r--r--docker/.DS_Storebin0 -> 6148 bytes
-rw-r--r--docker/centos_19/Dockerfile4
-rw-r--r--docker/ubuntu_19/Dockerfile2
-rw-r--r--packaging/.DS_Storebin0 -> 6148 bytes
-rw-r--r--packaging/deb/.DS_Storebin0 -> 6148 bytes
-rw-r--r--packaging/deb/Makefile2
-rw-r--r--packaging/deb/debian/changelog6
8 files changed, 14 insertions, 14 deletions
diff --git a/README.md b/README.md
index 4a3cb39..295e60b 100644
--- a/README.md
+++ b/README.md
@@ -12,29 +12,29 @@ On Fedora/CentOS
```bash
extract the tar.gz
- mkdir -p /usr/lib64/erlang/lib/sd_notify-0.11/priv/
- mkdir -p /usr/lib64/erlang/lib/sd_notify-0.11/ebin/
- cp priv/* /usr/lib64/erlang/lib/sd_notify-0.11/priv/
- cp ebin/* /usr/lib64/erlang/lib/sd_notify-0.11/ebin/
+ mkdir -p /usr/lib64/erlang/lib/sd_notify-{version}/priv/
+ mkdir -p /usr/lib64/erlang/lib/sd_notify-{version}/ebin/
+ cp priv/* /usr/lib64/erlang/lib/sd_notify-{version}/priv/
+ cp ebin/* /usr/lib64/erlang/lib/sd_notify-{version}/ebin/
```
On Debian/Ubuntu
```bash
- dpkg -i erlang-sd-notify_0.11-1_amd64.deb
+ dpkg -i erlang-sd-notify_{version}-1_amd64.deb
```
Build from source using Docker
===
-On Ubuntu
+Ubuntu
```bash
docker build -t build_ubuntu_{version} docker/ubuntu_{version}/
docker run -v {sd_notify_dir}:/home/sd/ build_ubuntu_{version} /bin/sh -c "cd /home/sd/; make deb"
```
-on Centos
+Centos
```bash
docker build -t build_centos_{version} docker/centos_{version}/
diff --git a/docker/.DS_Store b/docker/.DS_Store
new file mode 100644
index 0000000..f0fcf26
--- /dev/null
+++ b/docker/.DS_Store
Binary files differ
diff --git a/docker/centos_19/Dockerfile b/docker/centos_19/Dockerfile
index bb07d21..819d749 100644
--- a/docker/centos_19/Dockerfile
+++ b/docker/centos_19/Dockerfile
@@ -13,9 +13,9 @@ RUN yum install -y \
-RUN wget https://github.com/rabbitmq/erlang-rpm/releases/download/v1.4.0/erlang-19.0-1.el7.centos.x86_64.rpm
+RUN wget https://github.com/rabbitmq/erlang-rpm/releases/download/v1.4.5/erlang-19.1.0-1.el7.centos.x86_64.rpm
-RUN rpm -i erlang-19.0-1.el7.centos.x86_64.rpm
+RUN rpm -i erlang-19.1.0-1.el7.centos.x86_64.rpm
RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar
diff --git a/docker/ubuntu_19/Dockerfile b/docker/ubuntu_19/Dockerfile
index d38e286..f6fe24d 100644
--- a/docker/ubuntu_19/Dockerfile
+++ b/docker/ubuntu_19/Dockerfile
@@ -18,6 +18,6 @@ RUN apt-get install -y \
RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb
RUN dpkg -i erlang-solutions_1.0_all.deb
RUN apt-get update -y
-RUN apt-get install erlang=1:19.0-1 -y
+RUN apt-get install erlang=1:19.1-1 -y
RUN apt-get install -y erlang-dev \
erlang-eunit
diff --git a/packaging/.DS_Store b/packaging/.DS_Store
new file mode 100644
index 0000000..f29304c
--- /dev/null
+++ b/packaging/.DS_Store
Binary files differ
diff --git a/packaging/deb/.DS_Store b/packaging/deb/.DS_Store
new file mode 100644
index 0000000..812fc5b
--- /dev/null
+++ b/packaging/deb/.DS_Store
Binary files differ
diff --git a/packaging/deb/Makefile b/packaging/deb/Makefile
index a04d30b..e5b41a9 100644
--- a/packaging/deb/Makefile
+++ b/packaging/deb/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.11
+VERSION=0.12
# Directory names
DEB_BUILD_DIR=deb-build
diff --git a/packaging/deb/debian/changelog b/packaging/deb/debian/changelog
index 19e6a83..d4f442f 100644
--- a/packaging/deb/debian/changelog
+++ b/packaging/deb/debian/changelog
@@ -1,6 +1,6 @@
-erlang-sd-notify (0.11-1) UNRELEASED; urgency=medium
+erlang-sd-notify (0.12-1) UNRELEASED; urgency=medium
- * Update for 19.0
+ * Update for 19.1
- -- Gabriele Santomaggio <g.santomaggio@gmail.com> Tue, 19 Jul 2016 14:12:18 +0000
+ -- Gabriele Santomaggio <g.santomaggio@gmail.com> Fri, 23 Sep 2016 22:54:18 +0000