Skip to content
Snippets Groups Projects
Commit 7d0e479a authored by Edric Milaret's avatar Edric Milaret
Browse files

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
parent fd6d4df8
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 285 additions and 57 deletions
.packer.json 0 → 100644
+ 168
− 0
View file @ 7d0e479a
{
"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"]
}
.packer.yml deleted 100644 → 0
+ 0
− 50
View file @ fd6d4df8
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
debian/rules
+ 5
− 4
View file @ 7d0e479a
...@@ -21,6 +21,7 @@ override_dh_auto_configure: ...@@ -21,6 +21,7 @@ override_dh_auto_configure:
@echo "Contribs built" @echo "Contribs built"
#./autogen.sh && ./configure --prefix=/usr --with-contrib=yes CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs" #./autogen.sh && ./configure --prefix=/usr --with-contrib=yes CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs"
./autogen.sh && ./configure --prefix=/usr ./autogen.sh && ./configure --prefix=/usr
rm -rf .git
dh_auto_configure dh_auto_configure
override_dh_auto_test: override_dh_auto_test:
...@@ -53,12 +54,12 @@ get-orig-source: ...@@ -53,12 +54,12 @@ get-orig-source:
git init git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all git fetch --all
git checkout packaging -f git checkout $(DAEMON_TAG) -f
git config user.name "joulupukki" git config user.name "joulupukki"
git config user.email "joulupukki@localhost" git config user.email "joulupukki@localhost"
git merge $(DAEMON_TAG) --no-edit git merge origin/packaging --no-commit
rm -rf .git git reset HEAD
# Packing # Packing
@echo "# Packing ... " @echo "# Packing ... "
find . | sort \ 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
docker/debian_8/Dockerfile 0 → 100644
+ 9
− 0
View file @ 7d0e479a
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
docker/debian_8_i386/Dockerfile 0 → 100644
+ 9
− 0
View file @ 7d0e479a
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
docker/debian_9/Dockerfile 0 → 100644
+ 9
− 0
View file @ 7d0e479a
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
docker/fedora_21/Dockerfile 0 → 100644
+ 7
− 0
View file @ 7d0e479a
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
docker/fedora_21_i386/Dockerfile 0 → 100644
+ 7
− 0
View file @ 7d0e479a
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
docker/fedora_22/Dockerfile 0 → 100644
+ 7
− 0
View file @ 7d0e479a
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
docker/ubuntu_14.04/Dockerfile 0 → 100644
+ 10
− 0
View file @ 7d0e479a
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
docker/ubuntu_14.04_i386/Dockerfile 0 → 100644
+ 10
− 0
View file @ 7d0e479a
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
docker/ubuntu_14.10/Dockerfile 0 → 100644
+ 10
− 0
View file @ 7d0e479a
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
docker/ubuntu_14.10_i386/Dockerfile 0 → 100644
+ 10
− 0
View file @ 7d0e479a
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
docker/ubuntu_15.04/Dockerfile 0 → 100644
+ 10
− 0
View file @ 7d0e479a
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
docker/ubuntu_15.04_i386/Dockerfile 0 → 100644
+ 10
− 0
View file @ 7d0e479a
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
ring-daemon.spec
+ 4
− 3
View file @ 7d0e479a
...@@ -36,11 +36,11 @@ This is the daemon headers. ...@@ -36,11 +36,11 @@ This is the daemon headers.
git init git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all git fetch --all
git checkout packaging -f git checkout %{daemon_tag} -f
git config user.name "joulupukki" git config user.name "joulupukki"
git config user.email "joulupukki@localhost" git config user.email "joulupukki@localhost"
git merge %{daemon_tag} --no-edit git merge origin/packaging --no-commit
rm -rf .git git reset HEAD
# Apply all patches # Apply all patches
for patch_file in $(cat debian/patches/series | grep -v "^#") for patch_file in $(cat debian/patches/series | grep -v "^#")
do do
...@@ -59,6 +59,7 @@ cd ../.. ...@@ -59,6 +59,7 @@ cd ../..
echo "Contribs built" echo "Contribs built"
./autogen.sh ./autogen.sh
%configure --prefix=/usr CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs" %configure --prefix=/usr CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="-Wl,-z,defs"
rm -rf .git
make -j %{?_smp_mflags} make -j %{?_smp_mflags}
%install %install
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment