diff --git a/build/megacmd/debian.rules b/build/megacmd/debian.rules index 65854af2..ad233f4a 100644 --- a/build/megacmd/debian.rules +++ b/build/megacmd/debian.rules @@ -3,7 +3,7 @@ NJOBS := $(shell echo ${DEB_BUILD_OPTIONS} | sed -rn 's/.*parallel=([0-9]*).*/\1 VCPKG_ROOT := $(shell [ -f /opt/vcpkg.tar.gz ] && echo "-DVCPKG_ROOT=vcpkg" || echo "") #TODO: pass deprecation to cmake (probably better not via ccpflags) EXTRADEFINES := $(shell cat /etc/issue | grep "Ubuntu 1[2345789]\|Ubuntu 20.10\|Ubuntu 21\|Ubuntu 22.10\|Ubuntu 23\|Debian.* [789]" >/dev/null && echo "$$CPPFLAGS -DMEGACMD_DEPRECATED_OS" || echo "") -DPKGXZ := $(shell cat /etc/issue | grep "Ubuntu 24\|Oracular Oriole\|Noble Numbat\|Ubuntu 23\|Mantic Minotaur\|Lunar Lobster\|Ubuntu 22\|Jammy Jellyfish\|Ubuntu 21.10" >/dev/null && echo "-- -Zxz" || echo "") +DPKGXZ := $(shell cat /etc/issue | grep "Ubuntu 25\|Plucky Puffin\|Ubuntu 24\|Oracular Oriole\|Noble Numbat\|Ubuntu 23\|Mantic Minotaur\|Lunar Lobster\|Ubuntu 22\|Jammy Jellyfish\|Ubuntu 21.10" >/dev/null && echo "-- -Zxz" || echo "") #LDFLAGS := $(shell dpkg --print-architecture | grep -i "i386\|arm" >/dev/null && echo "" || echo "$$LDFLAGS -Wl,-rpath,/opt/megacmd/lib") EXPORT_VCPKG_FORCE_SYSTEM_BINARIES := $(shell uname -m | grep "armv7l" >/dev/null && echo "VCPKG_FORCE_SYSTEM_BINARIES=1" || echo "") DEB_TESTING := $(shell cat /etc/issue | grep "Debian" > /dev/null && cat /etc/apt/sources.list.d/debian.sources | grep -v "^\#" | grep testing > /dev/null && echo "testing") diff --git a/jenkinsfile/Branch_status/Jenkinsfile_linux_packages b/jenkinsfile/Branch_status/Jenkinsfile_linux_packages index 2e68a28e..a8cf1209 100644 --- a/jenkinsfile/Branch_status/Jenkinsfile_linux_packages +++ b/jenkinsfile/Branch_status/Jenkinsfile_linux_packages @@ -107,7 +107,7 @@ pipeline { } axis { name 'DISTRO'; - values 'xUbuntu_24.10','xUbuntu_24.04', 'xUbuntu_22.04', 'xUbuntu_20.04', + values 'xUbuntu_25.04','xUbuntu_24.10','xUbuntu_24.04', 'xUbuntu_22.04', 'xUbuntu_20.04', 'Debian_11','Debian_12','Debian_testing', 'DEB_Arch_Extra', 'Raspbian_11', 'Raspbian_12', @@ -123,7 +123,7 @@ pipeline { } axis { name 'DISTRO'; - values 'xUbuntu_24.10','xUbuntu_24.04', 'xUbuntu_22.04', 'xUbuntu_20.04', + values 'xUbuntu_25.04','xUbuntu_24.10','xUbuntu_24.04', 'xUbuntu_22.04', 'xUbuntu_20.04', 'Debian_11','Debian_12','Debian_testing', 'DEB_Arch_Extra', 'Fedora_40', 'Fedora_41',