Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1010 from JulianGro/fedora-40

Browse source 
Add Fedora 40 servers
This commit is contained in:
Julian Groß 2024-06-08 13:05:36 +02:00 committed by GitHub
commit 32944d48ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
.github/workflows/linux_server_build.yml vendored
View file

@ -75,26 +75,25 @@ jobs:
arch: aarch64
runner: linux_aarch64
- os: fedora-38
image: docker.io/overte/overte-server-build:0.1.3-fedora-38-amd64
- os: fedora-39
image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
arch: amd64
runner: linux_amd64
- os: fedora-38
image: docker.io/overte/overte-server-build:0.1.3-fedora-38-aarch64
- os: fedora-39
image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
arch: aarch64
runner: linux_aarch64
# Packaging broken; See: https://github.com/overte-org/overte/issues/968
#~ - os: fedora-39
#~ image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
#~ arch: amd64
#~ runner: linux_amd64
- os: fedora-40
image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
arch: amd64
runner: linux_amd64
#~ - os: fedora-39
#~ image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
#~ arch: aarch64
#~ runner: linux_aarch64
- os: fedora-40
image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
arch: aarch64
runner: linux_aarch64
- os: rockylinux-9
image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64

6
pkg-scripts/make-rpm-server
View file

@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2020-2021 Vircadia contributors.
# Copyright 2022-2023 Overte e.V.
# Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0
if [ "$OVERTE" = "" ]; then
@ -55,7 +55,7 @@ DEPENDS=mesa-libGL,`ls \
| xargs -I {} sh -c 'objdump -p {} | grep NEEDED' \
| awk '{print $2}' \
| sort | uniq \
| egrep -v "^($SOFILES)$" \
| grep -E -v "^($SOFILES)$" \
| grep -v ^libGL \
| xargs -I {} sh -c "ldconfig -p | grep {} | tr ' ' '\n' | grep /" \
| xargs rpm -qf --queryformat "%{NAME}\n" \
@ -73,7 +73,7 @@ DEPENDS=mesa-libGL,`ls \
| xargs -I {} sh -c 'objdump -p {} | grep NEEDED' \
| awk '{print $2}' \
| sort | uniq \
| egrep -v "^($SOFILES)$" \
| grep -E -v "^($SOFILES)$" \
| grep -v ^libGL \
| xargs -I {} sh -c "ldconfig -p | grep {} | tr ' ' '\n' | grep /" \
| xargs rpm -qf --queryformat "%{NAME}\n" \

5
pkg-scripts/overte-server.spec
View file

@ -1,5 +1,5 @@
# Copyright 2020-2021 Vircadia contributors.
# Copyright 2022 Overte e.V.
# Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0
#OVERTE=~/Overte rpmbuild --target x86_64 -bb overte-server.spec
@ -75,11 +75,12 @@ chrpath -d $RPM_BUILD_ROOT/opt/overte/plugins/*.so
chrpath -d $RPM_BUILD_ROOT/opt/overte/plugins/*/*.so
strip --strip-all $RPM_BUILD_ROOT/opt/overte/plugins/*.so
strip --strip-all $RPM_BUILD_ROOT/opt/overte/plugins/*/*.so
cp $OVERTE/LICENSE $RPM_BUILD_ROOT/usr/share/licenses/overte-server/LICENSE
find $RPM_BUILD_ROOT/opt/overte/resources -name ".gitignore" -delete
%files
%license $OVERTE/LICENSE
%license /usr/share/licenses/overte-server/LICENSE
/opt/overte
/usr/lib/systemd/system

8
tools/ci-scripts/rpm_package/Dockerfile_build_fedora-38 → tools/ci-scripts/rpm_package/Dockerfile_build_fedora-40
View file

@ -1,14 +1,14 @@
# Copyright 2022-2023 Overte e.V.
# Copyright 2022-2024 Overte e.V.
# SPDX-License-Identifier: Apache-2.0
# Docker file for building Overte Server
# Example build: docker build -t overte/overte-server-build:0.1.3-fedora-38 -f Dockerfile_build_fedora-38 .
FROM fedora:38
# Example build: docker build -t overte/overte-server-build:0.1.4-fedora-40 -f Dockerfile_build_fedora-40 .
FROM fedora:40
LABEL maintainer="Julian Groß (julian.gro@overte.org)"
LABEL description="Development image for Overte Domain server and assignment clients."
# Install Overte domain-server and assignment-client build dependencies
RUN dnf -y install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel
RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3
# Install additional build tools
RUN dnf -y install zip unzip