Skip to content
Snippets Groups Projects
Commit a6159081 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents ee07da61 2b996eba
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile.packaging
+ 2
− 0
View file @ a6159081
......@@ -114,6 +114,8 @@ package-all: package-debian_9 \
package-fedora_32_i386 \
package-rhel_8 \
package-opensuse-leap_15.1 \
package-opensuse-leap_15.2 \
package-opensuse-tumbleweed \
package-gentoo
# Append the output of make-packaging-target to this Makefile
......
client-gnome @ f8a418df
Subproject commit 89615abfd1ad7de7c548704ce1ddaa7a1825b40d
Subproject commit f8a418dff602ccc4e8f460b190fe6575fa95d94a
daemon @ 3b2334fc
Subproject commit 00330fd841f0cef6d178d5c12c7a7ffa0edf2a78
Subproject commit 3b2334fc77b8e58dfafcc7717b5d38a6e0a82845
docker/Dockerfile_opensuse-leap_15.1
+ 6
− 1
View file @ a6159081
FROM opensuse/leap
FROM opensuse/leap:15.2
RUN zypper --non-interactive install dnf
RUN dnf clean all
RUN zypper --non-interactive lr
......@@ -12,6 +12,8 @@ RUN zypper --non-interactive up -y && \
zypper --non-interactive install -y libinput-devel && \
zypper --non-interactive install -y \
git \
gcc8 \
gcc8-c++ \
rpm-build \
tar \
make \
......@@ -78,6 +80,9 @@ RUN zypper --non-interactive up -y && \
libsndfile-devel \
evolution-devel
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
ADD scripts/build-package-opensuse-leap.sh /opt/build-package-opensuse-leap.sh
CMD /opt/build-package-opensuse-leap.sh
docker/Dockerfile_opensuse-leap_15.2 0 → 100644
+ 88
− 0
View file @ a6159081
FROM opensuse/leap:15.2
RUN zypper --non-interactive install dnf
RUN dnf clean all
RUN zypper --non-interactive lr
RUN zypper --non-interactive --gpg-auto-import-keys refresh
RUN zypper --non-interactive lr
RUN zypper --non-interactive install -y dnf-command\(builddep\) rpmdevtools
RUN zypper --non-interactive clean
RUN zypper --non-interactive up -y && \
zypper --non-interactive install -y Mesa-dri-devel Mesa-dri && \
zypper --non-interactive install -y libinput-devel && \
zypper --non-interactive install -y \
git \
gcc8 \
gcc8-c++ \
rpm-build \
tar \
make \
autoconf \
automake \
cmake \
nasm \
speexdsp-devel \
libpulse-devel \
libcanberra-devel \
libcurl-devel \
libtool \
libQt5DBus-devel \
pcre-devel \
yaml-cpp-devel \
boost-devel \
libdbus-c++-devel \
libQt5DBus-devel \
libXext-devel \
libXfixes-devel \
yasm \
speex-devel \
libgsm-devel \
chrpath \
check \
astyle \
uuid-devel \
gettext-devel \
gcc-c++ \
which \
alsa-lib-devel \
systemd-devel \
libuuid-devel \
uuid-devel \
gnutls-devel \
libopus-devel \
patch \
jsoncpp-devel \
webkit2gtk3-devel \
libcryptopp-devel \
libva-devel \
libvdpau-devel \
msgpack-devel \
clutter-devel \
openssl-devel \
clutter-gtk-devel \
libnma-devel \
libcryptopp-devel \
libdbus-c++-devel \
libQt5DBus-devel \
libexpat-devel \
gnome-icon-theme-symbolic \
libgsm-devel \
gtk3-devel \
libappindicator-devel \
sqlite-devel \
libQt5Sql-devel \
libQt5Gui-devel \
ffmpeg-4-libavutil-devel \
gtk3-devel\
qrencode-devel \
python3-python-dateutil \
libqt5-linguist-devel \
libsndfile-devel \
evolution-devel
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
ADD scripts/build-package-opensuse-leap.sh /opt/build-package-opensuse-leap.sh
CMD /opt/build-package-opensuse-leap.sh
docker/Dockerfile_opensuse-tumbleweed 0 → 100644
+ 83
− 0
View file @ a6159081
FROM opensuse/tumbleweed
RUN zypper --non-interactive install dnf
RUN dnf clean all
RUN zypper --non-interactive lr
RUN zypper --non-interactive --gpg-auto-import-keys refresh
RUN zypper --non-interactive lr
RUN zypper --non-interactive install -y dnf-command\(builddep\) rpmdevtools
RUN zypper --non-interactive clean
RUN zypper --non-interactive up -y && \
zypper --non-interactive install -y Mesa-dri-devel Mesa-dri && \
zypper --non-interactive install -y libinput-devel && \
zypper --non-interactive install -y \
git \
rpm-build \
tar \
make \
autoconf \
automake \
cmake \
nasm \
speexdsp-devel \
libpulse-devel \
libcanberra-devel \
libcurl-devel \
libtool \
libQt5DBus-devel \
pcre-devel \
yaml-cpp-devel \
boost-devel \
libdbus-c++-devel \
libQt5DBus-devel \
libXext-devel \
libXfixes-devel \
yasm \
speex-devel \
libgsm-devel \
chrpath \
check \
astyle \
uuid-devel \
gettext-devel \
gcc-c++ \
which \
alsa-lib-devel \
systemd-devel \
libuuid-devel \
uuid-devel \
gnutls-devel \
libopus-devel \
patch \
jsoncpp-devel \
webkit2gtk3-devel \
libcryptopp-devel \
libva-devel \
libvdpau-devel \
msgpack-devel \
clutter-devel \
openssl-devel \
clutter-gtk-devel \
libnma-devel \
libcryptopp-devel \
libdbus-c++-devel \
libQt5DBus-devel \
libexpat-devel \
gnome-icon-theme-symbolic \
libgsm-devel \
gtk3-devel \
libappindicator-devel \
sqlite-devel \
libQt5Sql-devel \
libQt5Gui-devel \
ffmpeg-4-libavutil-devel \
gtk3-devel\
qrencode-devel \
python3-python-dateutil \
libqt5-linguist-devel \
libsndfile-devel \
evolution-devel
ADD scripts/build-package-opensuse-leap.sh /opt/build-package-opensuse-leap.sh
CMD /opt/build-package-opensuse-leap.sh
scripts/deploy-packages.sh
+ 1
− 1
View file @ a6159081
......@@ -218,7 +218,7 @@ function package()
if [[ "${DISTRIBUTION:0:6}" == "debian" || "${DISTRIBUTION:0:6}" == "ubuntu" || "${DISTRIBUTION:0:8}" == "raspbian" ]];
then
package_deb
elif [[ "${DISTRIBUTION:0:6}" == "fedora" || "${DISTRIBUTION:0:4}" == "rhel" || "${DISTRIBUTION:0:13}" == "opensuse-leap" ]];
elif [[ "${DISTRIBUTION:0:6}" == "fedora" || "${DISTRIBUTION:0:4}" == "rhel" || "${DISTRIBUTION:0:13}" == "opensuse-leap" || "${DISTRIBUTION:0:19}" == "opensuse-tumbleweed" ]];
then
package_rpm
else
......
scripts/install.sh
+ 14
− 2
View file @ a6159081
......@@ -142,8 +142,20 @@ if [ "${client}" = "client-qt" ]; then
if ! command -v qmake &> /dev/null; then
eval ${qt5path}/bin/qmake PREFIX="${INSTALL}/${client}" ..
else
qmake -qt=${qt5ver} PREFIX="${INSTALL}/${client}" ..
fi
# Extract installed Qt version and compare with minimum required
sys_qt5ver=$(qmake -v)
sys_qt5ver=${sys_qt5ver#*Qt version}
sys_qt5ver=${sys_qt5ver%\ in\ *}
installed_qt5ver=$(echo $sys_qt5ver| cut -d'.' -f 2)
required_qt5ver=$(echo $qt5ver| cut -d'.' -f 2)
if [[ $installed_qt5ver -ge $required_qt5ver ]] ; then
qmake PREFIX="${INSTALL}/${client}" ..
else
eval ${qt5path}/bin/qmake PREFIX="${INSTALL}/${client}" ..
fi
fi
else
if [ "${global}" = "true" ]; then
if [ "${prefix+set}" ]; then
......
scripts/make-packaging-target.py
+ 12
− 0
View file @ a6159081
......@@ -370,6 +370,18 @@ def run_generate_all(parsed_args):
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged"
},
{
"distribution": "opensuse-leap_15.2",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged"
},
{
"distribution": "opensuse-tumbleweed",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged"
},
# Gentoo
{
"distribution": "gentoo",
......
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