Skip to content
Snippets Groups Projects
Unverified Commit b8f1e345 authored by Sébastien Blin's avatar Sébastien Blin Committed by Maxim Cournoyer
Browse files

packaging: Update the repositories to use 'jami' instead of 'ring'. 

For apt-based systems, a 'ring' distribution is kept along the new
'jami' one to keep supporting existing users until April 2024.

GitLab: jami-packaging#3
Change-Id: Ie589175e6abff8e4b1b252dff7eade4729d46a62
parent 8d2885f6
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
packaging/rules/debian-one-click-install/jami-all.postinst
+ 4
− 6
View file @ b8f1e345
......@@ -22,12 +22,11 @@ set -e
# Ubuntu 18.04:
# $JAMI_REPO = $JAMI_REPO_BASE/ubuntu_18.04/
#
# Debian 9:
# Debian 10:
# $JAMI_REPO = $JAMI_REPO_BASE/debian_10
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
JAMI_REPO_BASE="https://dl.jami.net/nightly"
# Jami release key.
JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
......@@ -135,9 +134,8 @@ 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 ${JAMI_REPO} ring main
deb ${JAMI_REPO} jami main
EOF
# Additionally, if update manager is installed we inform it about
......@@ -150,7 +148,7 @@ EOF
# Added by Jami to prevent disabling of Jami repository sources on
# distribution release upgrade.
[ThirdPartyMirrors]
ring/${JAMI_UPDATE_MANAGER_ID}=${JAMI_REPO}
jami/${JAMI_UPDATE_MANAGER_ID}=${JAMI_REPO}
EOF
fi
fi
......
packaging/rules/fedora/jami-all.postinst
+ 2
− 4
View file @ b8f1e345
......@@ -19,8 +19,7 @@
# depending on the system the postinst script is run on.
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
JAMI_REPO_BASE="https://dl.jami.net/nightly"
# Jami release key.
JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
......@@ -89,7 +88,7 @@ JAMI_REPO='
name='"${NAME}"' $releasever - $basearch - Jami
baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
gpgcheck=1
gpgkey=https://dl.jami.net/ring.pub.key
gpgkey=https://dl.jami.net/jami.pub.key
enabled=1'
# Set-up Jami repository end tag
......@@ -127,7 +126,6 @@ EOF
/usr/bin/rpm --import $GPG_FILE > /dev/null 2>&1
# Add an entry for the package repository to the trusted package
# FIXME As soon as we rename the repo use ring instead of jami
cat > $YUM_FILE <<EOF
$JAMI_REPO
EOF
......
packaging/rules/opensuse-leap/jami-all.postinst
+ 17
− 6
View file @ b8f1e345
......@@ -19,8 +19,7 @@
# depending on the system the postinst script is run on.
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
JAMI_REPO_BASE="https://dl.jami.net/nightly"
# Jami release key.
JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
......@@ -89,7 +88,7 @@ JAMI_REPO='
name='"${NAME}"' $releasever - $basearch - Jami
baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
gpgcheck=1
gpgkey=https://dl.jami.net/ring.pub.key
gpgkey=https://dl.jami.net/jami.pub.key
enabled=1'
# Set-up Jami repository end tag
......@@ -97,6 +96,18 @@ enabled=1'
ENDTAG="opensuse-leap_15.2"
REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
GPG_FILE="/tmp/RPM-GPG-KEY-JAMI"
elif [ "${PLATFORM_ID}" = "opensuse-tumbleweed" ]; then
ENDTAG="opensuse-tumbleweed"
REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
GPG_FILE="/tmp/RPM-GPG-KEY-JAMI"
# Remove releasever for tumbleweed as it's a rolling release
JAMI_REPO='
[jami]
name='"${NAME}"' $basearch - Jami
baseurl='"${JAMI_REPO_BASE}"/"${ID}"'
gpgcheck=1
gpgkey=https://dl.jami.net/jami.pub.key
enabled=1'
else
# Distribution is not supported. Don't provide automatic updates.
CAN_ADD_YUM_SOURCE=false
......@@ -123,7 +134,7 @@ $JAMI_KEY
EOF
/usr/bin/rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
/usr/bin/rpm --import $GPG_FILE > /dev/null 2>&1
if [ "${ENDTAG}" = "opensuse-leap_15.2" ]; then
if [ "${ENDTAG}" = "opensuse-leap_15.2" ] || [ "${ENDTAG}" = "opensuse-tumbleweed" ]; then
rm -f $GPG_FILE
fi
# Add an entry for the package repository to the trusted package
......
packaging/rules/rhel/jami-all.postinst
+ 2
− 3
View file @ b8f1e345
......@@ -19,8 +19,7 @@
# depending on the system the postinst script is run on.
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
JAMI_REPO_BASE="https://dl.jami.net/nightly"
# Jami release key.
JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
......@@ -89,7 +88,7 @@ JAMI_REPO='
name=Jami $releasever - $basearch - jami
baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
gpgcheck=1
gpgkey=https://dl.jami.net/ring.pub.key
gpgkey=https://dl.jami.net/jami.pub.key
enabled=1'
# Set-up Jami repository end tag
......
scripts/deploy-packages.sh
+ 23
− 6
View file @ b8f1e345
......@@ -45,6 +45,15 @@ function package_deb()
# Distributions file
cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf/distributions
Origin: jami
Label: Jami ${DISTRIBUTION} Repository
Codename: jami
Architectures: i386 amd64 armhf arm64
Components: main
Description: This repository contains Jami ${DISTRIBUTION} packages
SignWith: ${KEYID}
# TODO: Remove when April 2024 comes.
Origin: ring
Label: Ring ${DISTRIBUTION} Repository
Codename: ring
......@@ -69,15 +78,23 @@ EOF
if [ ${package_arch} = "all" ]; then
# Removing to avoid the error of adding the same deb twice.
# This happens with arch all packages, which are generated in amd64 and i386.
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} remove jami ${package_name}
# TODO: Remove when April 2024 comes.
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} remove ring ${package_name}
fi
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} includedeb jami ${package}
# TODO: Remove when April 2024 comes.
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} includedeb ring ${package}
done
# Rebuild the index
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} export jami
# TODO: Remove when April 2024 comes.
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} export ring
# Show the contents
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} list jami
# TODO: Remove when April 2024 comes.
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} list ring
#######################################
......@@ -122,19 +139,19 @@ function package_rpm()
# .repo file
if [ "${DISTRIBUTION:0:19}" == "opensuse-tumbleweed" ]; then
name="Ring \$basearch - ring"
baseurl="https://dl.jami.net/ring-nightly/${DISTRIBUTION%_*}"
name="Jami \$basearch - jami"
baseurl="https://dl.jami.net/nightly/${DISTRIBUTION%_*}"
else
name="Ring \$releasever - \$basearch - ring"
baseurl="https://dl.jami.net/ring-nightly/${DISTRIBUTION%_*}_\$releasever"
name="Jami \$releasever - \$basearch - jami"
baseurl="https://dl.jami.net/nightly/${DISTRIBUTION%_*}_\$releasever"
fi
cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/ring-nightly.repo
cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/jami-nightly.repo
[jami]
name=$name
baseurl=$baseurl
gpgcheck=1
gpgkey=https://dl.jami.net/ring.pub.key
gpgkey=https://dl.jami.net/jami.pub.key
enabled=1
EOF
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment