Commit 553fef15 authored by Fredy Pulido's avatar Fredy Pulido

packaging: renaming packages from ring to jami

This commit rename the tarball, debian, ubuntu and fedora packages.

This commit also modify the debian post install script to add support
our repositories for Debian 10 and Ubuntu 18.10 and 19.04 and create
transition packages to ensure a proper nama transition in debian based
distributions.

Warning: when using reprepo to add the ring transition deb package
this get into pool/main/j/jami. for now we think is a reprepo error
because reads the Source: instead of Package: field.

Change-Id: I47449a79c1a8bfd6ee0f3ffed618886f1dc1645a
parent 91b5fdab
......@@ -32,13 +32,13 @@ LAST_COMMIT_DATE_SHORT:=$(shell echo $(LAST_COMMIT_DATE) | sed -s 's/-//g')
COMMIT_ID:=$(shell git rev-parse --short HEAD)
RELEASE_VERSION:=$(LAST_COMMIT_DATE_SHORT).$(NUMBER_OF_COMMITS).$(COMMIT_ID)
RELEASE_TARBALL_FILENAME:=ring_$(RELEASE_VERSION).tar.gz
RELEASE_TARBALL_FILENAME:=jami_$(RELEASE_VERSION).tar.gz
# Debian versions
DEBIAN_VERSION:=$(RELEASE_VERSION)~dfsg1-1
DEBIAN_DSC_FILENAME:=ring_$(DEBIAN_VERSION).dsc
DEBIAN_DSC_FILENAME:=jami_$(DEBIAN_VERSION).dsc
DEBIAN_OCI_VERSION:=$(RELEASE_VERSION)~dfsg1-0
DEBIAN_OCI_DSC_FILENAME:=ring_$(DEBIAN_OCI_VERSION).dsc
DEBIAN_OCI_DSC_FILENAME:=jami_$(DEBIAN_OCI_VERSION).dsc
DEBIAN_OCI_PKG_DIR:="packaging/rules/debian-one-click-install"
#####################
......@@ -140,7 +140,7 @@ env:
clean:
rm -rf env
rm -rf docs/build
rm -f ring_*.tar.gz
rm -f jami_*.tar.gz
rm -rf packages
rm -f Makefile.packaging.distro_targets
rm -f .docker-image-*
# ring-all package for jami.net website
# jami-all package for jami.net website
This source package provides a single ring-all binary package.
This source package provides a single jami-all binary package.
This binary package is the same as the mainline ring-all, apart from
This binary package is the same as the mainline jami-all, apart from
the fact that it installs release keys and jami.net package repository
as trusted peers so Jami can be updated from jami.net along with
system updates.
......@@ -13,7 +13,7 @@ system updates.
1- Prepare the new changelog entry mentioning the new version.
(the version on the changelog will be used to determine what to download).
Releases are available here: https://dl.jami.net/ring-release/tarballs/
Releases are available here: https://dl.jami.net/release/tarballs/
2- Run debian/rules get-orig-source
......
Source: ring
Source: jami
Section: comm
Priority: optional
Maintainer: Alexandre Viau <aviau@debian.org>
......@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 9),
libayatana-appindicator3-dev | libappindicator3-dev,
libnm-dev,
libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# ring-daemon
# jami-daemon
libdbus-1-dev,
libdbus-c++-dev,
libupnp-dev,
......@@ -59,21 +59,35 @@ Homepage: https://jami.net
Vcs-Git: https://git.jami.net/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project
Package: ring-all
Package: jami-all
Architecture: any
Depends: libqt5sql5-sqlite,
gnupg,
${shlibs:Depends},
${misc:Depends}
Replaces: ring,
ring-gnome,
ring-daemon
Conflicts: ring,
ring-gnome,
ring-daemon
Replaces: jami,
jami-daemon,
jami-gnome,
ring,
ring-all,
ring-daemon,
ring-gnome
Conflicts: jami,
jami-daemon,
jami-gnome,
ring,
ring-all,
ring-daemon,
ring-gnome
Description: Secure and distributed voice, video and chat platform - all in one package
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the GNOME desktop client and dring, the Jami daemon.
Package: ring-all
Depends: jami-all, ${misc:Depends}
Architecture: all
Description: transitional package for jami-all
This is a transitional package. It can safely be removed.
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ring
Upstream-Name: jami
Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
Source: https://dl.jami.net/ring-release/tarballs/
Source: https://dl.jami.net/release/tarballs/
Files-Excluded: client-electron/*
client-uwp/*
client-windows/*
......@@ -21,7 +21,7 @@ Copyright: 2004-2019 Savoir-faire Linux Inc.
2012-2013 LOTES TM LLC
2011-2014 lolilolicon <lolilolicon@gmail.com>
License: GPL-3+
Comment: Upstream embeds everything that is needed to build ring inside the release tarball.
Comment: Upstream embeds everything that is needed to build Jami inside the release tarball.
Everything that is already in Debian has been removed.
.
OpenDHT was kept and not packaged independently. OpenDHT was written for Jami and is a moving
......
......@@ -2,9 +2,9 @@
set -e
###############################################################################
# RING PACKAGE POSTINST #
# JAMI PACKAGE POSTINST #
# #
# Install Ring's package repository to the trusted sources and add Ring's #
# Install Jami's package repository to the trusted sources and add Jami's #
# release key to trusted keyring. #
# #
# NOTE: We follow https://wiki.debian.org/DebianRepository/UseThirdParty #
......@@ -26,9 +26,10 @@ set -e
# $RING_REPO = $RING_REPO_BASE/debian_9
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
RING_REPO_BASE="https://dl.jami.net/ring-nightly"
# Ring release key.
# Jami release key.
RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
RING_KEY="\
-----BEGIN PGP PUBLIC KEY BLOCK-----
......@@ -73,9 +74,9 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
# In general: you will not need to modify these variables.
# WARNING: When modifying the paths, keep in mind that the corresponding
# postrm paths should be modified as well
APT_FILE="/etc/apt/sources.list.d/ring-main.list"
APT_FILE="/etc/apt/sources.list.d/jami-main.list"
UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
RING_UPDATE_MANAGER_ID="ring-main"
RING_UPDATE_MANAGER_ID="jami-main"
RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${RING_UPDATE_MANAGER_CFG}"
......@@ -93,13 +94,21 @@ CAN_ADD_DEB_SOURCE=true
if [ -f /etc/os-release ]; then
. /etc/os-release
# Set-up Ring repository end tag
# Set-up Jami repository end tag
if [ "${DEBIAN_CODENAME}" = "stretch" ] || [ "${ID}_${VERSION_ID}" = "debian_9" ]; then
ENDTAG="debian_9"
elif [ "${DEBIAN_CODENAME}" = "buster" ] || [ "${ID}_${VERSION_ID}" = "debian_10" ]; then
ENDTAG="debian_10"
elif [ "${UBUNTU_CODENAME}" = "xenial" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_16.04" ]; then
ENDTAG="ubuntu_16.04"
elif [ "${UBUNTU_CODENAME}" = "bionic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.04" ]; then
ENDTAG="ubuntu_18.04"
elif [ "${UBUNTU_CODENAME}" = "cosmic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.10" ]; then
ENDTAG="ubuntu_18.10"
elif [ "${UBUNTU_CODENAME}" = "disco" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_19.04" ]; then
ENDTAG="ubuntu_19.04"
elif [ "${UBUNTU_CODENAME}" = "eoan" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_19.10" ]; then
ENDTAG="ubuntu_19.10"
else
# Distribution is not supported. Don't provide automatic updates.
CAN_ADD_DEB_SOURCE=false
......@@ -130,6 +139,7 @@ EOF
# Add an entry for the package repository to the trusted package
# sources (DEB822 format)
# FIXME As soon as we rename the repo use ring instead of jami
cat > $APT_FILE <<EOF
deb ${RING_REPO} ring main
EOF
......@@ -139,8 +149,9 @@ EOF
if [ -d /etc/update-manager -a ! -f $UPDATE_MANAGER_CFG_PATH ]
then
mkdir -p $UPDATE_MANAGER_PATH
# FIXME As soon as we change the repo name use jami (this line +5)
cat > $UPDATE_MANAGER_CFG_PATH <<EOF
# Added by Ring to prevent disabling of Ring repository sources on
# Added by Jami to prevent disabling of Jami repository sources on
# distribution release upgrade.
[ThirdPartyMirrors]
ring/${RING_UPDATE_MANAGER_ID}=${RING_REPO}
......
......@@ -13,7 +13,7 @@ NO_CPUS=1
endif
# Binary package names
RING_ALL_IN_ONE_PKG_NAME="ring-all"
RING_ALL_IN_ONE_PKG_NAME="jami-all"
%:
dh $@
......@@ -135,7 +135,7 @@ override_dh_clean:
override_dh_auto_install:
######################
## Ring AiO install ##
## Jami AiO install ##
######################
## daemon
......@@ -156,7 +156,7 @@ override_dh_auto_install:
## GNOME client
cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/ring-all/usr/bin/ring.cx
ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx
tmpdir:= $(shell mktemp -d)
workdir:= $(shell pwd)
......@@ -165,22 +165,22 @@ version_to_download := $(shell dpkg-parsechangelog -ldebian/changelog | perl -ne
# Repacks the tarball with contrib tarballs unpacked.
get-orig-source:
# Download ring tarball
# Download jami tarball
if [ -n "$$GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL" ]; then \
mv $$GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL ${tmpdir}; \
else \
uscan --rename --destdir=${tmpdir} --download-version ${version_to_download} ;\
fi
# Unpack ring tarball
# Unpack jami tarball
tar -C ${tmpdir} -xf ${tmpdir}/*.tar.gz
# Remove original tarball
rm ${tmpdir}/*.tar.gz
# Unpack all of the orig tarballs into tarballs-unpacked
if [ -d "${tmpdir}/ring/" ]; then \
mv ${tmpdir}/ring/ ${tmpdir}/ring-project/; \
if [ -d "${tmpdir}/jami/" ]; then \
mv ${tmpdir}/jami/ ${tmpdir}/ring-project/; \
fi
mkdir ${tmpdir}/ring-project/daemon/contrib/tarballs-unpacked
for i in `find ${tmpdir}/ring-project/daemon/contrib/tarballs/ -name "*.tar.*"`; do \
......@@ -214,7 +214,7 @@ get-orig-source:
rm -rf ${tmpdir}/ring-project/daemon/contrib/tarballs
# Create the new tarball
cd ${tmpdir} && tar -czf ${workdir}/ring_${version_to_download}~dfsg1.orig.tar.gz ring-project
cd ${tmpdir} && tar -czf ${workdir}/jami_${version_to_download}~dfsg1.orig.tar.gz ring-project
# Clear the temp dir
rm -rf ${tmpdir}
version=3
opts=dversionmangle=s/\~dfsg\d*$// \
https://dl.jami.net/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz
https://dl.jami.net/release/tarballs/ jami_(\d\S*)\.tar\.gz
# Differences and compatibility with official debian.org package
This source package also provides binary package ring-all. ring-all is an
This source package also provides binary package jami-all. jami-all is an
all-in-one package that is it ships both the Jami Daemon and the GNOME
client. This package is not available in the debian.org repositories (not
needed in the Debian case).
ring-all allows easy installation of Jami as a single package from jami.net.
jami-all allows easy installation of Jami as a single package from jami.net.
The reason is that one cannot register a repository in source.list.d and
directly use it to fetch the dependencies. As a consequence it is not
possible to have a one-click installation with two binary packages. That's
why we build ring-all.
why we build jami-all.
ring-all conflicts with ring and ring-daemon since they are distributing the
jami-all conflicts with jami and jami-daemon since they are distributing the
same files.
# Notes
......@@ -20,7 +20,7 @@ same files.
1- Prepare the new changelog entry mentioning the new version.
(the version on the changelog will be used to determine what to download).
Releases are available here: https://dl.jami.net/ring-release/tarballs/
Releases are available here: https://dl.jami.net/release/tarballs/
2- Run debian/rules get-orig-source
......
Source: ring
Source: jami
Section: comm
Priority: optional
Maintainer: Alexandre Viau <aviau@debian.org>
......@@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 9),
libayatana-appindicator3-dev | libappindicator3-dev,
libnm-dev,
libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# ring-daemon
# jami-daemon
libdbus-1-dev,
libdbus-c++-dev,
libupnp-dev,
......@@ -59,16 +59,24 @@ Homepage: https://jami.net
Vcs-Git: https://git.jami.net/savoirfairelinux/ring-project.git
Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project
Package: ring-all
Package: jami-all
Architecture: any
Depends: libqt5sql5-sqlite,
gnupg,
${shlibs:Depends},
${misc:Depends}
Replaces: ring,
Replaces: jami,
jami-daemon,
jami-gnome,
ring,
ring-all,
ring-gnome,
ring-daemon
Conflicts: ring,
Conflicts: jami,
jami-daemon,
jami-gnome,
ring,
ring-all,
ring-gnome,
ring-daemon
Description: Secure and distributed voice, video and chat platform - all in one package
......@@ -78,14 +86,22 @@ Description: Secure and distributed voice, video and chat platform - all in one
.
This package contains the GNOME desktop client and dring, the Jami daemon.
Package: ring
Package: ring-all
Depends: jami-all, ${misc:Depends}
Architecture: all
Description: transitional package for jami-all
This is a transitional package. It can safely be removed.
Package: jami
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libqt5sql5-sqlite,
ring-daemon (=${binary:Version})
Replaces: ring-gnome
Conflicts: ring-gnome
jami-daemon (=${binary:Version})
Replaces: jami-genome,
ring-gnome
Conflicts: jami-gnome,
ring-gnome
Description: Secure and distributed voice, video and chat platform - desktop client
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
......@@ -93,13 +109,27 @@ Description: Secure and distributed voice, video and chat platform - desktop cli
.
This package contains the desktop client: jami-gnome.
Package: ring-daemon
Package: ring
Depends: jami, ${misc:Depends}
Architecture: all
Description: transitional package for jami
This is a transitional package. It can safely be removed.
Package: jami-daemon
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Replaces: ring-daemon
Conflicts: ring-daemon
Description: Secure and distributed voice, video and chat platform - daemon
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the Jami daemon: dring.
Package: ring-daemon
Depends: jami-daemon, ${misc:Depends}
Architecture: all
Description: transitional package for jami-daemon
This is a transitional package. It can safely be removed.
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ring
Upstream-Name: jami
Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
Source: https://dl.jami.net/ring-release/tarballs/
Source: https://dl.jami.net/release/tarballs/
Files-Excluded: client-electron/*
client-uwp/*
client-windows/*
......@@ -21,18 +21,18 @@ Copyright: 2004-2019 Savoir-faire Linux Inc.
2012-2013 LOTES TM LLC
2011-2014 lolilolicon <lolilolicon@gmail.com>
License: GPL-3+
Comment: Upstream embeds everything that is needed to build ring inside the release tarball.
Comment: Upstream embeds everything that is needed to build Jami inside the release tarball.
Everything that is already in Debian has been removed.
.
OpenDHT was kept and not packaged independently. OpenDHT was written for Ring and is a moving
OpenDHT was kept and not packaged independently. OpenDHT was written for Jami and is a moving
target. It is best to wait until it is more mature before packaging it separately.
.
Msgpack was kept because the version available in Debian is currently too old for Ring to build.
Msgpack was kept because the version available in Debian is currently too old for Jami to build.
The Debian version of Msgpack cannot be updated at the moment because of reverse dependencies which
are not ready.
.
Pjproject was kept because it is heavily patched by Ring developers. None of the patches were merged
upstream and Ring developers are still waiting for a reaction from Pjproject developers.
Pjproject was kept because it is heavily patched by Jami developers. None of the patches were merged
upstream and Jami developers are still waiting for a reaction from Pjproject developers.
See the relevant threads:
- http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2014-October/017905.html
- http://lists.pjsip.org/pipermail/pjsip_lists.pjsip.org/2015-January/018072.html
......
......@@ -13,9 +13,9 @@ NO_CPUS=1
endif
# Binary package names
RING_ALL_IN_ONE_PKG_NAME="ring-all"
RING_CLIENT_PKG_NAME="ring"
RING_DAEMON_PKG_NAME="ring-daemon"
RING_ALL_IN_ONE_PKG_NAME="jami-all"
RING_CLIENT_PKG_NAME="jami"
RING_DAEMON_PKG_NAME="jami-daemon"
%:
dh $@
......@@ -146,7 +146,7 @@ override_dh_auto_install:
rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.la
#########################
## Ring client install ##
## Jami client install ##
#########################
## LibRingClient
......@@ -161,10 +161,10 @@ override_dh_auto_install:
## GNOME client
cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/ring/usr/bin/ring.cx
ln -sf /usr/bin/jami $(CURDIR)/debian/jami/usr/bin/ring.cx
######################
## Ring AiO install ##
## Jami AiO install ##
######################
## daemon
......@@ -185,7 +185,7 @@ override_dh_auto_install:
## GNOME client
cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/ring-all/usr/bin/ring.cx
ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx
tmpdir:= $(shell mktemp -d)
workdir:= $(shell pwd)
......@@ -194,22 +194,22 @@ version_to_download := $(shell dpkg-parsechangelog -ldebian/changelog | perl -ne
# Repacks the tarball with contrib tarballs unpacked.
get-orig-source:
# Download ring tarball
# Download jami tarball
if [ -n "$$GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL" ]; then \
mv $$GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL ${tmpdir}; \
else \
uscan --rename --destdir=${tmpdir} --download-version ${version_to_download} ;\
fi
# Unpack ring tarball
# Unpack jami tarball
tar -C ${tmpdir} -xf ${tmpdir}/*.tar.gz
# Remove original tarball
rm ${tmpdir}/*.tar.gz
# Unpack all of the orig tarballs into tarballs-unpacked
if [ -d "${tmpdir}/ring/" ]; then \
mv ${tmpdir}/ring/ ${tmpdir}/ring-project/; \
if [ -d "${tmpdir}/jami/" ]; then \
mv ${tmpdir}/jami/ ${tmpdir}/ring-project/; \
fi
mkdir ${tmpdir}/ring-project/daemon/contrib/tarballs-unpacked
for i in `find ${tmpdir}/ring-project/daemon/contrib/tarballs/ -name "*.tar.*"`; do \
......@@ -243,7 +243,7 @@ get-orig-source:
rm -rf ${tmpdir}/ring-project/daemon/contrib/tarballs
# Create the new tarball
cd ${tmpdir} && tar -czf ${workdir}/ring_${version_to_download}~dfsg1.orig.tar.gz ring-project
cd ${tmpdir} && tar -czf ${workdir}/jami_${version_to_download}~dfsg1.orig.tar.gz ring-project
# Clear the temp dir
rm -rf ${tmpdir}
version=3
opts=dversionmangle=s/\~dfsg\d*$// \
https://dl.jami.net/ring-release/tarballs/ ring_(\d\S*)\.tar\.gz
https://dl.jami.net/release/tarballs/ jami_(\d\S*)\.tar\.gz
%define name ring
%define name jami
%define version RELEASE_VERSION
%define release 0
......@@ -9,9 +9,11 @@ Summary: Free software for distributed and secured communication.
Group: Applications/Internet
License: GPLv3+
URL: https://jami.net/
Source: ring_%{version}.tar.gz
Requires: ring-daemon = %{version}
Obsoletes: ring-gnome
Source: jami_%{version}.tar.gz
Requires: jami-daemon = %{version}
Obsoletes: ring ring-daemon
Provides: ring
Conflicts: ring ring-daemon
BuildRequires: make
BuildRequires: autoconf
......@@ -67,7 +69,7 @@ BuildRequires: cryptopp-devel
BuildRequires: libvdpau-devel
%description
Ring is free software for universal communication which respects freedoms
Jami is free software for universal communication which respects freedoms
and privacy of its users.
.
This package contains the desktop client: jami-gnome.
......@@ -76,10 +78,10 @@ This package contains the desktop client: jami-gnome.
Summary: Free software for distributed and secured communication - daemon
%description daemon
Ring is free software for universal communication which respects freedoms
Jami is free software for universal communication which respects freedoms
and privacy of its users.
.
This package contains the Ring daemon: dring.
This package contains the Jami daemon: dring.
%prep
%setup -n ring-project
......
......@@ -48,24 +48,24 @@ apt-get upgrade -o Acquire::Retires=10 -y
mk-build-deps --remove --install debian/control -t "apt-get -y --no-install-recommends"
# create changelog file
DEBEMAIL="The Ring project <ring@gnu.org>" dch --create --package ring --newversion ${DEBIAN_VERSION} "Automatic nightly release"
DEBEMAIL="The Ring project <ring@gnu.org>" dch --release --distribution "unstable" debian/changelog
DEBEMAIL="The Jami project <jami@gnu.org>" dch --create --package jami --newversion ${DEBIAN_VERSION} "Automatic nightly release"
DEBEMAIL="The Jami project <jami@gnu.org>" dch --release --distribution "unstable" debian/changelog
# create orig tarball
mk-origtargz --compression gzip ${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 ../jami_*.orig.tar.gz) debian/rules get-orig-source
# move the tarball to the work directory
mkdir -p /opt/ring-packaging
mv ring_*.orig.tar.gz /opt/ring-packaging
mkdir -p /opt/jami-packaging
mv jami_*.orig.tar.gz /opt/jami-packaging
# move to work directory
cd /opt/ring-packaging
cd /opt/jami-packaging
# unpack the orig tarball
tar -xvf /opt/ring-packaging/ring_*.orig.tar.gz
tar -xvf /opt/jami-packaging/jami_*.orig.tar.gz
# move to ring-project dir
cd ring-project
......
......@@ -26,21 +26,21 @@ set -e
# import the spec file
mkdir -p /opt/ring-project
cd /opt/ring-project
cp /opt/ring-project-ro/packaging/rules/fedora/ring.spec .
cp /opt/ring-project-ro/packaging/rules/fedora/jami.spec .
# Set the version
sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" ring.spec
rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" ring.spec
sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" jami.spec
rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" jami.spec
# install build deps
dnf builddep -y ring.spec || echo "ignoring dnf builddep failure"
dnf builddep -y jami.spec || echo "ignoring dnf builddep failure"
# place the source
mkdir -p /root/rpmbuild/SOURCES
cp /opt/ring-project-ro/ring_*.tar.gz /root/rpmbuild/SOURCES
cp /opt/ring-project-ro/jami_*.tar.gz /root/rpmbuild/SOURCES
# build the package
rpmbuild -ba ring.spec
rpmbuild -ba jami.spec
# move to output
mv /root/rpmbuild/RPMS/*/* /opt/output
......
......@@ -95,8 +95,7 @@ EOF
mkdir -p ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
ls packages/${DISTRIBUTION}
# packages with dfsg1-0 contains the postinstall script that adds the repository
# FIXME as soon as we rename the package from ring to jami change the name here.
cp packages/${DISTRIBUTION}*/ring-all_????????.?.*\~dfsg1-0_*.deb ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
cp packages/${DISTRIBUTION}*/jami-all_????????.?.*\~dfsg1-0_*.deb ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
for package in ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}/*; do
package_name=$(dpkg -I ${package} | grep -m 1 Package: | awk '{print $2}')
package_arch=$(dpkg -I ${package} | grep -m 1 Architecture: | awk '{print $2}')
......
......@@ -28,14 +28,14 @@ target_template = """\
## Distro: %(distribution)s
##
# We don't simply use ring-packaging-distro as the docker image name because
# We don't simply use jami-packaging-distro as the docker image name because
# we want to be able to build multiple versions of the same distro at the
# same time and it could result in race conditions on the machine as we would
# overwrite the docker image of other builds.
#
# This does not impact caching as the docker daemon does not care about the image
# names, just about the contents of the Dockerfile.
PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME:=ring-packaging-%(distribution)s$(RING_PACKAGING_IMAGE_SUFFIX)
PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME:=jami-packaging-%(distribution)s$(RING_PACKAGING_IMAGE_SUFFIX)
PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE:=.docker-image-$(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
DOCKER_EXTRA_ARGS =
......
Markdown is supported
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