URL: https://github.com/freeipa/freeipa/pull/5139
Author: tiran
Title: #5139: [Backport][ipa-4-8] Make git a build requirement
Action: opened
PR body:
"""
This PR was opened automatically because PR #5126 was pushed to master and
backport to ipa-4-8 is required.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/5139/head:pr5139
git checkout pr5139
From 1272d221f0e5e93d1312eeca90fa9f2199fc7bac Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Tue, 22 Sep 2020 14:52:31 +0200
Subject: [PATCH] Make git a build requirement
FreeIPA uses git in its build process. In the past git was automatically
pulled in. On Fedora 33 builds are failing because git is missing.
Signed-off-by: Christian Heimes <chei...@redhat.com>
---
freeipa.spec.in | 1 +
ipatests/azure/Dockerfiles/Dockerfile.build.fedora | 1 +
ipatests/azure/Dockerfiles/Dockerfile.build.rawhide | 1 +
ipatests/azure/templates/prepare-build-fedora.yml | 1 +
ipatests/azure/templates/prepare-tox-fedora.yml | 2 +-
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index af7ec1130f..1db7d64572 100755
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -243,6 +243,7 @@ BuildRequires: python3-wheel
# Build dependencies for lint and fastcheck
#
%if 0%{?with_lint}
+BuildRequires: git
BuildRequires: jsl
BuildRequires: nss-tools
BuildRequires: rpmlint
diff --git a/ipatests/azure/Dockerfiles/Dockerfile.build.fedora b/ipatests/azure/Dockerfiles/Dockerfile.build.fedora
index 674bf60ed7..523aedf0ba 100644
--- a/ipatests/azure/Dockerfiles/Dockerfile.build.fedora
+++ b/ipatests/azure/Dockerfiles/Dockerfile.build.fedora
@@ -9,6 +9,7 @@ RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \
&& dnf install -y systemd \
&& dnf install -y \
firewalld \
+ git \
glibc-langpack-fr \
glibc-langpack-en \
iptables \
diff --git a/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide b/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide
index 3318c33fd1..47cb81e864 100644
--- a/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide
+++ b/ipatests/azure/Dockerfiles/Dockerfile.build.rawhide
@@ -11,6 +11,7 @@ RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \
&& dnf install -y systemd \
&& dnf install -y \
firewalld \
+ git \
glibc-langpack-fr \
glibc-langpack-en \
iptables \
diff --git a/ipatests/azure/templates/prepare-build-fedora.yml b/ipatests/azure/templates/prepare-build-fedora.yml
index c1d33b36ff..4dea53de22 100644
--- a/ipatests/azure/templates/prepare-build-fedora.yml
+++ b/ipatests/azure/templates/prepare-build-fedora.yml
@@ -11,6 +11,7 @@ steps:
autoconf \
rpm-build \
gettext-devel \
+ git \
automake \
libtool \
docker \
diff --git a/ipatests/azure/templates/prepare-tox-fedora.yml b/ipatests/azure/templates/prepare-tox-fedora.yml
index 4e27ac7557..3386e60383 100644
--- a/ipatests/azure/templates/prepare-tox-fedora.yml
+++ b/ipatests/azure/templates/prepare-tox-fedora.yml
@@ -1,6 +1,6 @@
steps:
- script: |
set -e
- sudo dnf -y install nss-tools python3-pip
+ sudo dnf -y install nss-tools python3-pip git
python3 -m pip install --user --upgrade pip setuptools pycodestyle
displayName: Install Tox prerequisites
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
