Support for Fedora
Fedora uses the same CentOS yum repository but does not actually
uses yum at all but relies on dnf.
Removing the hard dependency from yum enables the use of the same
repository for Fedora as well.
Additionally the import of GerritForge public key into the list
of imported RPM keys is not reliable across Fedora and CentOS.
Better to remove it altogether and let the user to accept the
key interactively.
Change-Id: I156b3944fc80fa3f3116e8d041825a8e6f6a0ea9
diff --git a/yum-repo/Makefile b/yum-repo/Makefile
index 523ac7b..6910be3 100644
--- a/yum-repo/Makefile
+++ b/yum-repo/Makefile
@@ -2,7 +2,7 @@
# to produce a yum.repo for a VENDOR distribution
# Default values are pointing to GerritForge (www.gerritforge.com)
VERSION=1
-RELEASE=2
+RELEASE=3
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
WEB_URL=http://$(VENDOR_LC).com
@@ -33,23 +33,20 @@
all: client server
-client: $(RPM_OUT)
+client: $(RPM_OUT)
prepare:
- -mkdir -p client etc/yum.repos.d etc/pki/rpm-gpg scripts server
+ -mkdir -p client etc/yum.repos.d etc/pki/rpm-gpg server
echo "$$YUM_REPO" > etc/yum.repos.d/$(VENDOR).repo
gpg --yes --armor --output etc/pki/rpm-gpg/RPM-GPG-KEY-$(VENDOR) --export $(PGP_USER)
- echo "rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-$(VENDOR)" > scripts/after-install.sh
clean:
- -rm -Rf client etc scripts server
+ -rm -Rf client etc server
$(RPM_OUT): $(SRCS) prepare
fpm -t rpm -p $@ -s dir \
-f -n $(NAME) -v $(VERSION) --iteration $(RELEASE) --category $(CATEGORY) \
--description "$(SUMMARY)" --url $(WEB_URL) --license "$(LICENSE)" --vendor "$(VENDOR)" \
- --depends yum \
- --after-install scripts/after-install.sh \
--rpm-user root --rpm-group root \
--verbose etc
