From 7d0e479af0888ebcd334ef748740ef3c312ee9ce Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Wed, 2 Sep 2015 14:34:47 -0400
Subject: [PATCH] Switch to new packaging system
- Remove unused .packer.yml
- Move .git deletion to after configure is done
- Add dockerfile for each system
Issue: #80006
Change-Id: I41e2f115605a95744a939f786ab5b9bfb5253526
---
.packer.json | 168 ++++++++++++++++++++++++++++
.packer.yml | 50 ---------
debian/rules | 9 +-
docker/debian_8/Dockerfile | 9 ++
docker/debian_8_i386/Dockerfile | 9 ++
docker/debian_9/Dockerfile | 9 ++
docker/fedora_21/Dockerfile | 7 ++
docker/fedora_21_i386/Dockerfile | 7 ++
docker/fedora_22/Dockerfile | 7 ++
docker/ubuntu_14.04/Dockerfile | 10 ++
docker/ubuntu_14.04_i386/Dockerfile | 10 ++
docker/ubuntu_14.10/Dockerfile | 10 ++
docker/ubuntu_14.10_i386/Dockerfile | 10 ++
docker/ubuntu_15.04/Dockerfile | 10 ++
docker/ubuntu_15.04_i386/Dockerfile | 10 ++
ring-daemon.spec | 7 +-
16 files changed, 285 insertions(+), 57 deletions(-)
create mode 100644 .packer.json
delete mode 100644 .packer.yml
create mode 100644 docker/debian_8/Dockerfile
create mode 100644 docker/debian_8_i386/Dockerfile
create mode 100644 docker/debian_9/Dockerfile
create mode 100644 docker/fedora_21/Dockerfile
create mode 100644 docker/fedora_21_i386/Dockerfile
create mode 100644 docker/fedora_22/Dockerfile
create mode 100644 docker/ubuntu_14.04/Dockerfile
create mode 100644 docker/ubuntu_14.04_i386/Dockerfile
create mode 100644 docker/ubuntu_14.10/Dockerfile
create mode 100644 docker/ubuntu_14.10_i386/Dockerfile
create mode 100644 docker/ubuntu_15.04/Dockerfile
create mode 100644 docker/ubuntu_15.04_i386/Dockerfile
diff --git a/.packer.json b/.packer.json
new file mode 100644
index 0000000000..7d61363b22
--- /dev/null
+++ b/.packer.json
@@ -0,0 +1,168 @@
+{
+ "BuildType" : "Docker",
+ "BuildInstructions" : {
+ "fedora_21" : [
+ "mkdir -p /sources",
+ "cd /ring-daemon",
+ "cp ring-daemon.spec ..",
+ "cd ..",
+ "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec",
+ "tar -cf /sources/daemon /ring-daemon --exclude=\".git\"",
+ "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"",
+ "cp -R /root/rpmbuild/RPMS/x86_64/* /output"
+ ],
+ "fedora_21_i386" : [
+ "mkdir -p /sources",
+ "cd /ring-daemon",
+ "cp ring-daemon.spec ..",
+ "cd ..",
+ "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec",
+ "tar -cf /sources/daemon /ring-daemon --exclude=\".git\"",
+ "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"",
+ "cp -R /root/rpmbuild/RPMS/i686/* /output"
+ ],
+ "fedora_22": [
+ "mkdir -p /sources",
+ "cd /ring-daemon",
+ "cp ring-daemon.spec ..",
+ "cd ..",
+ "sed -i 's/%setup -q/%setup -n ring-daemon/' ring-daemon.spec",
+ "tar -cf /sources/daemon /ring-daemon --exclude=\".git\"",
+ "rpmbuild -ba ring-daemon.spec --define \"_sourcedir /sources\"",
+ "cp -R /root/rpmbuild/RPMS/x86_64/* /output"
+ ],
+ "debian_8": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "debian_8_i386": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "debian_9": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "ubuntu_14.04": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "ubuntu_14.04_i386": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "ubuntu_14.10": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "ubuntu_14.10_i386": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "ubuntu_15.04": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ],
+ "ubuntu_15.04_i386": [
+ "mkdir -p /sources/ring-daemon",
+ "cd /sources/ring-daemon",
+ "/ring-daemon/debian/rules get-orig-source",
+ "dch --release --distribution \"unstable\" debian/changelog",
+ "dpkg-buildpackage -uc -us",
+ "cd .. ",
+ "mv *.orig.tar* *.debian.tar* *deb *changes *dsc /output"
+ ]
+ },
+ "UpdateInstructions" : {
+ "fedora_21" : ["yum upgrade -y"],
+ "fedora_21_i386" : ["yum upgrade -y"],
+ "fedora_22": ["yum upgrade -y"],
+ "debian_8": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "debian_8_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "debian_9": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_14.04": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_14.10": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_15.04": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_14.04_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_14.10_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"],
+ "ubuntu_15.04_i386": ["apt-get update", "( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )"]
+
+ },
+ "ReviewType": "",
+ "ReviewAddress": "https://gerrit-ring.savoirfairelinux.com",
+ "Package" : {
+ "fedora_21" : "",
+ "fedora_21_i386" : "",
+ "fedora_22": "",
+ "debian_8": "",
+ "debian_8_i386": "",
+ "debian_9": "",
+ "ubuntu_14.04": "",
+ "ubuntu_14.10": "",
+ "ubuntu_15.04": "",
+ "ubuntu_14.04_i386": "",
+ "ubuntu_14.10_i386": "",
+ "ubuntu_15.04_i386": ""
+ },
+ "ReloadProjectCmd" : [
+ "git checkout packaging",
+ "git reset --hard origin/packaging",
+ "git pull"
+ ],
+ "AutoDeploySchedule": {
+ "fedora_21" : "@midnight",
+ "fedora_21_i386" : "@midnight",
+ "fedora_22": "@midnight",
+ "debian_8": "@midnight",
+ "debian_8_i386": "@midnight",
+ "debian_9": "@midnight",
+ "ubuntu_14.04": "@midnight",
+ "ubuntu_14.10": "@midnight",
+ "ubuntu_15.04": "@midnight",
+ "ubuntu_14.04_i386": "@midnight",
+ "ubuntu_14.10_i386": "@midnight",
+ "ubuntu_15.04_i386": "@midnight"
+ },
+ "DeployScript": "ring-nightly-sign-deploy.sh",
+ "NotificationMailAdress": ["Awesome Ring Team", "ring-dev@savoirfairelinux.com"]
+}
diff --git a/.packer.yml b/.packer.yml
deleted file mode 100644
index 5512db3138..0000000000
--- a/.packer.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-ubuntu_14.04:
- debian: debian
- ccache: true
- type: docker
-ubuntu_14.10:
- debian: debian
- ccache: true
- type: docker
-ubuntu_15.04:
- debian: debian
- ccache: true
- type: docker
-fedora_21:
- spec: ring-daemon.spec
- ccache: true
- type: docker
-fedora_22:
- spec: ring-daemon.spec
- deps:
- - speexdsp-devel
- ccache: true
- type: docker
-debian_8:
- debian: debian
- ccache: true
- type: docker
-debian_9:
- debian: debian
- ccache: true
- type: docker
-ubuntu_14.04_i386:
- debian: debian
- ccache: true
- type: docker
-ubuntu_14.10_i386:
- debian: debian
- ccache: true
- type: docker
-ubuntu_15.04_i386:
- debian: debian
- ccache: true
- type: docker
-fedora_21_i386:
- spec: ring-daemon.spec
- ccache: true
- type: docker
-debian_8_i386:
- debian: debian
- ccache: true
- type: docker
diff --git a/debian/rules b/debian/rules
index cb592fef6b..5b16e1a117 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ override_dh_auto_configure:
@echo "Contribs built"
#./autogen.sh && ./configure --prefix=/usr --with-contrib=yes CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs"
./autogen.sh && ./configure --prefix=/usr
+ rm -rf .git
dh_auto_configure
override_dh_auto_test:
@@ -53,12 +54,12 @@ get-orig-source:
git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all
- git checkout packaging -f
+ git checkout $(DAEMON_TAG) -f
git config user.name "joulupukki"
git config user.email "joulupukki@localhost"
- git merge $(DAEMON_TAG) --no-edit
- rm -rf .git
+ git merge origin/packaging --no-commit
+ git reset HEAD
# Packing
@echo "# Packing ... "
find . | sort \
- | XZ_OPT="-6v" tar -caf "../$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX
+ | XZ_OPT="-6v" tar -caf "../$(PKG)_$(VER)$(DTYPE).orig.tar.xz" --exclude=".git" -T- --owner=root --group=root --mode=a+rX
diff --git a/docker/debian_8/Dockerfile b/docker/debian_8/Dockerfile
new file mode 100644
index 0000000000..02afe04b89
--- /dev/null
+++ b/docker/debian_8/Dockerfile
@@ -0,0 +1,9 @@
+FROM debian:8
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/debian_8_i386/Dockerfile b/docker/debian_8_i386/Dockerfile
new file mode 100644
index 0000000000..17508fcb58
--- /dev/null
+++ b/docker/debian_8_i386/Dockerfile
@@ -0,0 +1,9 @@
+FROM savoirfairelinux/ring-debian32:8
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/debian_9/Dockerfile b/docker/debian_9/Dockerfile
new file mode 100644
index 0000000000..966fa3dc48
--- /dev/null
+++ b/docker/debian_9/Dockerfile
@@ -0,0 +1,9 @@
+FROM debian:jessie
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/fedora_21/Dockerfile b/docker/fedora_21/Dockerfile
new file mode 100644
index 0000000000..8145f5581d
--- /dev/null
+++ b/docker/fedora_21/Dockerfile
@@ -0,0 +1,7 @@
+FROM fedora:21
+
+RUN yum upgrade -y
+RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
+ libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
+ libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
+ gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel -y
diff --git a/docker/fedora_21_i386/Dockerfile b/docker/fedora_21_i386/Dockerfile
new file mode 100644
index 0000000000..55c4e192ad
--- /dev/null
+++ b/docker/fedora_21_i386/Dockerfile
@@ -0,0 +1,7 @@
+FROM savoirfairelinux/ring-fedora32:21
+
+RUN yum upgrade -y
+RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
+ libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
+ libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
+ gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel -y
diff --git a/docker/fedora_22/Dockerfile b/docker/fedora_22/Dockerfile
new file mode 100644
index 0000000000..1a6e9e04b1
--- /dev/null
+++ b/docker/fedora_22/Dockerfile
@@ -0,0 +1,7 @@
+FROM fedora:22
+
+RUN yum upgrade -y
+RUN yum install rpm-build tar rsync git make autoconf automake cmake speexdsp-devel pulseaudio-libs-devel \
+ libsamplerate-devel libtool dbus-devel expat-devel pcre-devel yaml-cpp-devel boost-devel dbus-c++-devel dbus-devel \
+ libsndfile-devel libsrtp-devel libXext-devel libXfixes-devel yasm git speex-devel chrpath check astyle uuid-c++-devel \
+ gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel uuid-devel gnutls-devel nettle-devel opus-devel speexdsp-devel -y
diff --git a/docker/ubuntu_14.04/Dockerfile b/docker/ubuntu_14.04/Dockerfile
new file mode 100644
index 0000000000..d047f45356
--- /dev/null
+++ b/docker/ubuntu_14.04/Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:14.04
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
+ autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/ubuntu_14.04_i386/Dockerfile b/docker/ubuntu_14.04_i386/Dockerfile
new file mode 100644
index 0000000000..2a473114a4
--- /dev/null
+++ b/docker/ubuntu_14.04_i386/Dockerfile
@@ -0,0 +1,10 @@
+FROM savoirfairelinux/ring-ubuntu32:14.04
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
+ autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/ubuntu_14.10/Dockerfile b/docker/ubuntu_14.10/Dockerfile
new file mode 100644
index 0000000000..f7dc7081ae
--- /dev/null
+++ b/docker/ubuntu_14.10/Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:14.10
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
+ autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/ubuntu_14.10_i386/Dockerfile b/docker/ubuntu_14.10_i386/Dockerfile
new file mode 100644
index 0000000000..447976e7a5
--- /dev/null
+++ b/docker/ubuntu_14.10_i386/Dockerfile
@@ -0,0 +1,10 @@
+FROM savoirfairelinux/ring-ubuntu32:14.10
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
+ autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/ubuntu_15.04/Dockerfile b/docker/ubuntu_15.04/Dockerfile
new file mode 100644
index 0000000000..0092fc8261
--- /dev/null
+++ b/docker/ubuntu_15.04/Dockerfile
@@ -0,0 +1,10 @@
+FROM ubuntu:15.04
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
+ autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/docker/ubuntu_15.04_i386/Dockerfile b/docker/ubuntu_15.04_i386/Dockerfile
new file mode 100644
index 0000000000..5437090d05
--- /dev/null
+++ b/docker/ubuntu_15.04_i386/Dockerfile
@@ -0,0 +1,10 @@
+FROM savoirfairelinux/ring-ubuntu32:15.04
+
+RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgrade -y )
+RUN apt-get install -y devscripts debianutils debhelper build-essential tar rsync git \
+ autoconf automake libpulse-dev libsamplerate0-dev libtool libdbus-1-dev \
+ libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev libboost-dev \
+ libdbus-c++-dev libsndfile1-dev libsrtp-dev libxext-dev \
+ libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle \
+ uuid-dev libudev-dev cmake --fix-missing
diff --git a/ring-daemon.spec b/ring-daemon.spec
index 549b799ab2..b0e0f24cf2 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -36,11 +36,11 @@ This is the daemon headers.
git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all
-git checkout packaging -f
+git checkout %{daemon_tag} -f
git config user.name "joulupukki"
git config user.email "joulupukki@localhost"
-git merge %{daemon_tag} --no-edit
-rm -rf .git
+git merge origin/packaging --no-commit
+git reset HEAD
# Apply all patches
for patch_file in $(cat debian/patches/series | grep -v "^#")
do
@@ -59,6 +59,7 @@ cd ../..
echo "Contribs built"
./autogen.sh
%configure --prefix=/usr CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs"
+rm -rf .git
make -j %{?_smp_mflags}
%install
--
GitLab