mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-11-02 20:30:26 -06:00
Make the Azure template work with both dnf4 and dnf5
Add a version test to call dnf builddep differently based on release. Remove --skip-broken when calling dnf builddep. This was an old workaround from 2019. The option is no longer supported with dnf5. First seen in F41. Drop in all calls. dnf5 doesn't take a --spec option. It has to be passed a spec file. So in that case copy freeipa.spec.in to freeipa.spec and call. Signed-off-by: Rob Crittenden <rcritten@redhat.com> Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
This commit is contained in:
1 parent
7e254aee3d
commit
d271fc1938
1 file changed
+9
-1
@@ -26,5 +26,13 @@ steps:
|
||||
|
||||
echo "Installing FreeIPA development dependencies"
|
||||
sudo dnf builddep -y freeipa
|
||||
sudo dnf builddep -y --skip-broken -D "with_wheels 1" -D "with_lint 1" -D "with_doc 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False
|
||||
version=$(grep VERSION_ID /etc/os-release |cut -d= -f2)
|
||||
if [ $version -ge 41 ]; then
|
||||
cp freeipa.spec.in freeipa.spec
|
||||
sudo dnf builddep -y -D "with_wheels 1" -D "with_lint 1" -D "with_doc 1" --best --allowerasing --setopt=install_weak_deps=False freeipa.spec
|
||||
rm -f freeipa.spec
|
||||
else
|
||||
sudo dnf builddep -y -D "with_wheels 1" -D "with_lint 1" -D "with_doc 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False
|
||||
fi
|
||||
|
||||
displayName: Prepare build environment
|
||||
Reference in new issue
Block a user