Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
jami-project
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
172
Issues
172
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-project
Commits
79be2da8
Unverified
Commit
79be2da8
authored
Oct 19, 2020
by
Sébastien Blin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
packaging: add ubuntu 20.10
Change-Id: I6fe7da475e0004278382c4d5a996568557829bf4
parent
e6b6c694
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
87 additions
and
0 deletions
+87
-0
Makefile.packaging
Makefile.packaging
+2
-0
docker/Dockerfile_ubuntu_20.10
docker/Dockerfile_ubuntu_20.10
+69
-0
packaging/rules/debian-one-click-install/jami-all.postinst
packaging/rules/debian-one-click-install/jami-all.postinst
+2
-0
scripts/make-packaging-target.py
scripts/make-packaging-target.py
+14
-0
No files found.
Makefile.packaging
View file @
79be2da8
...
@@ -106,6 +106,8 @@ package-all: package-debian_9 \
...
@@ -106,6 +106,8 @@ package-all: package-debian_9 \
package-ubuntu_19.10_i386_oci
\
package-ubuntu_19.10_i386_oci
\
package-ubuntu_20.04
\
package-ubuntu_20.04
\
package-ubuntu_20.04_oci
\
package-ubuntu_20.04_oci
\
package-ubuntu_20.10
\
package-ubuntu_20.10_oci
\
package-fedora_31
\
package-fedora_31
\
package-fedora_31_i386
\
package-fedora_31_i386
\
package-fedora_32
\
package-fedora_32
\
...
...
docker/Dockerfile_ubuntu_20.10
0 → 100644
View file @
79be2da8
FROM ubuntu:20.10
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=3 \
git \
autoconf \
automake \
autopoint \
cmake \
libtool \
libdbus-1-dev \
libdbus-c++-dev \
libgnutls28-dev \
libargon2-0-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/jami-all.postinst
View file @
79be2da8
...
@@ -113,6 +113,8 @@ if [ -f /etc/os-release ]; then
...
@@ -113,6 +113,8 @@ if [ -f /etc/os-release ]; then
ENDTAG
=
"ubuntu_19.10"
ENDTAG
=
"ubuntu_19.10"
elif
[
"
${
UBUNTU_CODENAME
}
"
=
"focal"
]
||
[
"
${
ID
}
_
${
VERSION_ID
}
"
=
"ubuntu_20.04"
]
;
then
elif
[
"
${
UBUNTU_CODENAME
}
"
=
"focal"
]
||
[
"
${
ID
}
_
${
VERSION_ID
}
"
=
"ubuntu_20.04"
]
;
then
ENDTAG
=
"ubuntu_20.04"
ENDTAG
=
"ubuntu_20.04"
elif
[
"
${
UBUNTU_CODENAME
}
"
=
"groovy"
]
||
[
"
${
ID
}
_
${
VERSION_ID
}
"
=
"ubuntu_20.10"
]
;
then
ENDTAG
=
"ubuntu_20.10"
else
else
# Distribution is not supported. Don't provide automatic updates.
# Distribution is not supported. Don't provide automatic updates.
CAN_ADD_DEB_SOURCE
=
false
CAN_ADD_DEB_SOURCE
=
false
...
...
scripts/make-packaging-target.py
View file @
79be2da8
...
@@ -316,6 +316,20 @@ def run_generate_all(parsed_args):
...
@@ -316,6 +316,20 @@ 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_20.10"
,
"debian_packaging_override"
:
""
,
"output_file"
:
"$(DEBIAN_DSC_FILENAME)"
,
"options"
:
"--privileged --security-opt apparmor=docker-default"
,
},
{
"distribution"
:
"ubuntu_20.10_oci"
,
"docker_image"
:
"ubuntu_20.10"
,
"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
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment