diff --git a/.packer.json b/.packer.json new file mode 100644 index 0000000000000000000000000000000000000000..7d61363b22b02333cbd482f35966fe8998e9454d --- /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 5512db31385312b9b412ed7abdf697643823f00b..0000000000000000000000000000000000000000 --- 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 cb592fef6bcb4a8e932e2b7303e730bd1789982e..5b16e1a117ef2aad1c1bf219dc026d4c7e461e7d 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 0000000000000000000000000000000000000000..02afe04b899356c87afcd73b9da42654aa7d53e9 --- /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 0000000000000000000000000000000000000000..17508fcb58914a2d0e43e67f8dc63703f04ad8f4 --- /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 0000000000000000000000000000000000000000..966fa3dc48a9ee8d3e9715f4e45d0038082ed695 --- /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 0000000000000000000000000000000000000000..8145f5581defc3225d2d0830b4ae4fa9487bb9a5 --- /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 0000000000000000000000000000000000000000..55c4e192adbf2ce2d0c225b5ecafc0a094688c03 --- /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 0000000000000000000000000000000000000000..1a6e9e04b12a0ef5682d454591f5fe8ee19df8b8 --- /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 0000000000000000000000000000000000000000..d047f45356d41c655ee59d88ca740358e97271dc --- /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 0000000000000000000000000000000000000000..2a473114a46970d4282fa21b1de7990c439bcbce --- /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 0000000000000000000000000000000000000000..f7dc7081ae0a8376d72020b59a92f53755404894 --- /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 0000000000000000000000000000000000000000..447976e7a5351d47fcee9b3003998240fc5c7ebe --- /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 0000000000000000000000000000000000000000..0092fc82614301e779d60c675ca9ce00355fa200 --- /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 0000000000000000000000000000000000000000..5437090d05062d01d452f8c251c0fd40fbd5ad39 --- /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 549b799ab25ab919ca85e62e3cd6c02aaff7e239..b0e0f24cf26b90e1c96602e2329e125f6fbb17d3 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