Skip to content
Snippets Groups Projects
Unverified Commit 94aaa833 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

packaging: prepare packaging for Ubuntu 19.04 

Change-Id: I4953f10bce3bbecd960dbaa8edd8928992af7d2f
Gitlab: #598
parent c9a431e9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile.packaging
+ 4
− 0
View file @ 94aaa833
...@@ -91,6 +91,10 @@ package-all: package-debian_9 \ ...@@ -91,6 +91,10 @@ package-all: package-debian_9 \
package-ubuntu_18.10_i386 \ package-ubuntu_18.10_i386 \
package-ubuntu_18.10_oci \ package-ubuntu_18.10_oci \
package-ubuntu_18.10_i386_oci \ package-ubuntu_18.10_i386_oci \
package-ubuntu_19.04 \
package-ubuntu_19.04_i386 \
package-ubuntu_19.04_oci \
package-ubuntu_19.04_i386_oci \
package-fedora_27 \ package-fedora_27 \
package-fedora_27_i386 \ package-fedora_27_i386 \
package-fedora_28 \ package-fedora_28 \
......
docker/Dockerfile_ubuntu_19.04 0 → 100644
+ 71
− 0
View file @ 94aaa833
FROM ubuntu:19.04
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y devscripts equivs
# Speed up mk-build-deps
RUN apt-get clean
RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \
git \
autoconf \
automake \
autopoint \
cmake \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
libgtk-3-dev \
libnotify-dev \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
yasm \
nasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libayatana-appindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD /opt/build-package-debian.sh
docker/Dockerfile_ubuntu_19.04_i386 0 → 100644
+ 71
− 0
View file @ 94aaa833
FROM i386/ubuntu:19.04
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y devscripts equivs
# Speed up mk-build-deps
RUN apt-get clean
RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \
git \
autoconf \
automake \
autopoint \
cmake \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
libupnp-dev \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
libgtk-3-dev \
libnotify-dev \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
yasm \
nasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libayatana-appindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD /opt/build-package-debian.sh
packaging/rules/debian-one-click-install/rules
+ 3
− 0
View file @ 94aaa833
...@@ -179,6 +179,9 @@ get-orig-source: ...@@ -179,6 +179,9 @@ get-orig-source:
rm ${tmpdir}/*.tar.gz rm ${tmpdir}/*.tar.gz
# Unpack all of the orig tarballs into tarballs-unpacked # Unpack all of the orig tarballs into tarballs-unpacked
if [ -d "${tmpdir}/ring/" ]; then \
mv ${tmpdir}/ring/ ${tmpdir}/ring-project/; \
fi
mkdir ${tmpdir}/ring-project/daemon/contrib/tarballs-unpacked mkdir ${tmpdir}/ring-project/daemon/contrib/tarballs-unpacked
for i in `find ${tmpdir}/ring-project/daemon/contrib/tarballs/ -name "*.tar.*"`; do \ for i in `find ${tmpdir}/ring-project/daemon/contrib/tarballs/ -name "*.tar.*"`; do \
projectname=`basename $$i` && \ projectname=`basename $$i` && \
......
packaging/rules/debian/rules
+ 3
− 0
View file @ 94aaa833
...@@ -208,6 +208,9 @@ get-orig-source: ...@@ -208,6 +208,9 @@ get-orig-source:
rm ${tmpdir}/*.tar.gz rm ${tmpdir}/*.tar.gz
# Unpack all of the orig tarballs into tarballs-unpacked # Unpack all of the orig tarballs into tarballs-unpacked
if [ -d "${tmpdir}/ring/" ]; then \
mv ${tmpdir}/ring/ ${tmpdir}/ring-project/; \
fi
mkdir ${tmpdir}/ring-project/daemon/contrib/tarballs-unpacked mkdir ${tmpdir}/ring-project/daemon/contrib/tarballs-unpacked
for i in `find ${tmpdir}/ring-project/daemon/contrib/tarballs/ -name "*.tar.*"`; do \ for i in `find ${tmpdir}/ring-project/daemon/contrib/tarballs/ -name "*.tar.*"`; do \
projectname=`basename $$i` && \ projectname=`basename $$i` && \
......
scripts/build-package-debian.sh
+ 1
− 1
View file @ 94aaa833
...@@ -52,7 +52,7 @@ DEBEMAIL="The Ring project <ring@gnu.org>" dch --create --package ring --newvers ...@@ -52,7 +52,7 @@ DEBEMAIL="The Ring project <ring@gnu.org>" dch --create --package ring --newvers
DEBEMAIL="The Ring project <ring@gnu.org>" dch --release --distribution "unstable" debian/changelog DEBEMAIL="The Ring project <ring@gnu.org>" dch --release --distribution "unstable" debian/changelog
# create orig tarball # create orig tarball
mk-origtargz ${RELEASE_TARBALL_FILENAME} mk-origtargz --compression gzip ${RELEASE_TARBALL_FILENAME}
rm --verbose ${RELEASE_TARBALL_FILENAME} rm --verbose ${RELEASE_TARBALL_FILENAME}
GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL=$(readlink -f ../ring_*.orig.tar.gz) debian/rules get-orig-source GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL=$(readlink -f ../ring_*.orig.tar.gz) debian/rules get-orig-source
......
scripts/make-packaging-target.py
+ 28
− 0
View file @ 94aaa833
...@@ -206,6 +206,34 @@ def run_generate_all(parsed_args): ...@@ -206,6 +206,34 @@ def run_generate_all(parsed_args):
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{
"distribution": "ubuntu_19.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default",
},
{
"distribution": "ubuntu_19.04_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default",
},
{
"distribution": "ubuntu_19.04_oci",
"docker_image": "ubuntu_19.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)",
},
{
"distribution": "ubuntu_19.04_i386_oci",
"docker_image": "ubuntu_19.04_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)",
},
# Fedora # Fedora
{ {
"distribution": "fedora_27", "distribution": "fedora_27",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment